diff -Nru kmail-19.04.3/agents/archivemailagent/akonadi_archivemail_agent.notifyrc kmail-19.12.3/agents/archivemailagent/akonadi_archivemail_agent.notifyrc
--- kmail-19.04.3/agents/archivemailagent/akonadi_archivemail_agent.notifyrc	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/akonadi_archivemail_agent.notifyrc	2020-03-02 07:34:49.000000000 +0000
@@ -12,6 +12,7 @@
 Comment[en_GB]=Archive Mail Agent
 Comment[es]=Agente de archivado de correo
 Comment[et]=Kirjade arhiveerimise agent
+Comment[eu]=Posta artxibatzeko agentea
 Comment[fi]=Postin arkistointiagentti
 Comment[fr]=Agent d'archivage de courriel
 Comment[gl]=Axente Arquivar o correo
@@ -43,7 +44,7 @@
 Comment[wa]=Adjint d' årtchivaedje d' emiles
 Comment[x-test]=xxArchive Mail Agentxx
 Comment[zh_CN]=邮件归档代理
-Comment[zh_TW]=歸檔郵件代理程式
+Comment[zh_TW]=封存郵件代理程式
 Name=Archive Mail Agent
 Name[ar]=وكيل أرشفة البريد
 Name[bs]=Arhiva poštanskih agenata
@@ -56,6 +57,7 @@
 Name[en_GB]=Archive Mail Agent
 Name[es]=Agente de archivado de correo
 Name[et]=Kirjade arhiveerimise agent
+Name[eu]=Posta artxibatzeko agentea
 Name[fi]=Postin arkistointiagentti
 Name[fr]=Agent d'archivage de courriel
 Name[gl]=Axente Arquivar o correo
@@ -87,7 +89,7 @@
 Name[wa]=Adjint d' årtchivaedje d' emiles
 Name[x-test]=xxArchive Mail Agentxx
 Name[zh_CN]=邮件归档代理
-Name[zh_TW]=歸檔郵件代理程式
+Name[zh_TW]=封存郵件代理程式
 
 [Event/archivemailfinished]
 Name=Archive Mail finished
@@ -101,6 +103,7 @@
 Name[en_GB]=Archive Mail finished
 Name[es]=Archivado de correo terminado
 Name[et]=Kirjad on arhiveeritud
+Name[eu]=Posta artxibatzea amaitu da
 Name[fi]=Postin arkistointi valmis
 Name[fr]=Archivage du courriel terminé
 Name[gl]=Rematou Arquivar o correo
@@ -132,7 +135,7 @@
 Name[wa]=Årtchivaedje des emiles tot fwait
 Name[x-test]=xxArchive Mail finishedxx
 Name[zh_CN]=邮件归档完成
-Name[zh_TW]=歸檔郵件已完成
+Name[zh_TW]=封存郵件已完成
 Action=Popup
 
 [Event/archivemailstarted]
@@ -147,6 +150,7 @@
 Name[en_GB]=Archive Mail started
 Name[es]=Archivado de correo iniciado
 Name[et]=Kirjade arhiveerimine algas
+Name[eu]=Posta artxibatzea abiatu da
 Name[fi]=Postin arkistointi käynnistetty
 Name[fr]=Archivage du courriel démarré
 Name[gl]=Iniciouse Arquivar o correo
@@ -178,7 +182,7 @@
 Name[wa]=Årtchivaedje des emiles ataké
 Name[x-test]=xxArchive Mail startedxx
 Name[zh_CN]=邮件归档开始
-Name[zh_TW]=歸檔郵件已開始
+Name[zh_TW]=封存郵件已開始
 Action=Popup
 
 [Event/archivemailfolderdoesntexist]
@@ -192,6 +196,7 @@
 Name[en_GB]=Directory does not exist
 Name[es]=El directorio no existe
 Name[et]=Kataloogi ei ole olemas
+Name[eu]=Direktorio ez dago
 Name[fi]=Kansiota ei ole olemassa
 Name[fr]=Le dossier n'existe pas
 Name[gl]=O directorio non existe
@@ -233,6 +238,7 @@
 Name[en_GB]=Archive Mail Error
 Name[es]=Error de archivado de correo
 Name[et]=Kirjade arhiveerimise tõrge
+Name[eu]=Posta artxibatzeko errorea
 Name[fi]=Postin arkistointivirhe
 Name[fr]=Erreur d'archivage du courriel
 Name[gl]=Erro de Arquivar o correo
@@ -264,6 +270,6 @@
 Name[wa]=Åk n' a nén stî come dj' årtchivéve les emiles
 Name[x-test]=xxArchive Mail Errorxx
 Name[zh_CN]=邮件归档发生错误
-Name[zh_TW]=歸檔郵件發生錯誤
+Name[zh_TW]=封存郵件發生錯誤
 Action=Popup
 
diff -Nru kmail-19.04.3/agents/archivemailagent/archivemailagent.cpp kmail-19.12.3/agents/archivemailagent/archivemailagent.cpp
--- kmail-19.04.3/agents/archivemailagent/archivemailagent.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/archivemailagent.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -30,7 +30,6 @@
 #include <CollectionFetchScope>
 #include <KMime/Message>
 #include <QTimer>
-#include <QPointer>
 
 #include <kdelibs4configmigrator.h>
 
diff -Nru kmail-19.04.3/agents/archivemailagent/archivemailagent.desktop kmail-19.12.3/agents/archivemailagent/archivemailagent.desktop
--- kmail-19.04.3/agents/archivemailagent/archivemailagent.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/archivemailagent.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -11,6 +11,7 @@
 Name[en_GB]=Archive Mail Agent
 Name[es]=Agente de archivado de correo
 Name[et]=Kirjade arhiveerimise agent
+Name[eu]=Posta artxibatzeko agentea
 Name[fi]=Postin arkistointiagentti
 Name[fr]=Agent d'archivage de courriel
 Name[gl]=Axente Arquivar o correo
@@ -42,7 +43,7 @@
 Name[wa]=Adjint d' årtchivaedje d' emiles
 Name[x-test]=xxArchive Mail Agentxx
 Name[zh_CN]=邮件归档代理
-Name[zh_TW]=歸檔郵件代理程式
+Name[zh_TW]=封存郵件代理程式
 Comment=Archive Mail Agent
 Comment[ar]=وكيل أرشفة البريد
 Comment[bs]=Arhiva poštanskih agenata
@@ -55,6 +56,7 @@
 Comment[en_GB]=Archive Mail Agent
 Comment[es]=Agente de archivado de correo
 Comment[et]=Kirjade arhiveerimise agent
+Comment[eu]=Posta artxibatzeko agentea
 Comment[fi]=Postin arkistointiagentti
 Comment[fr]=Agent d'archivage de courriel
 Comment[gl]=Axente Arquivar o correo
@@ -86,7 +88,7 @@
 Comment[wa]=Adjint d' årtchivaedje d' emiles
 Comment[x-test]=xxArchive Mail Agentxx
 Comment[zh_CN]=邮件归档代理
-Comment[zh_TW]=歸檔郵件代理程式
+Comment[zh_TW]=封存郵件代理程式
 Type=AkonadiAgent
 Exec=akonadi_archivemail_agent
 Icon=kmail
diff -Nru kmail-19.04.3/agents/archivemailagent/archivemailagentutil.h kmail-19.12.3/agents/archivemailagent/archivemailagentutil.h
--- kmail-19.04.3/agents/archivemailagent/archivemailagentutil.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/archivemailagentutil.h	2020-03-02 07:34:49.000000000 +0000
@@ -25,8 +25,8 @@
 
 namespace ArchiveMailAgentUtil {
 static QString archivePattern = QStringLiteral("ArchiveMailCollection %1");
-QDate diffDate(ArchiveMailInfo *info);
-bool needToArchive(ArchiveMailInfo *info);
+Q_REQUIRED_RESULT QDate diffDate(ArchiveMailInfo *info);
+Q_REQUIRED_RESULT bool needToArchive(ArchiveMailInfo *info);
 }
 
 #endif // ARCHIVEMAILAGENTUTIL_H
diff -Nru kmail-19.04.3/agents/archivemailagent/archivemailinfo.h kmail-19.12.3/agents/archivemailagent/archivemailinfo.h
--- kmail-19.04.3/agents/archivemailagent/archivemailinfo.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/archivemailinfo.h	2020-03-02 07:34:49.000000000 +0000
@@ -42,43 +42,43 @@
         ArchiveYears
     };
 
-    QUrl realUrl(const QString &folderName, bool &dirExist) const;
+    Q_REQUIRED_RESULT QUrl realUrl(const QString &folderName, bool &dirExist) const;
 
-    bool isValid() const;
+    Q_REQUIRED_RESULT bool isValid() const;
 
-    Akonadi::Collection::Id saveCollectionId() const;
+    Q_REQUIRED_RESULT Akonadi::Collection::Id saveCollectionId() const;
     void setSaveCollectionId(Akonadi::Collection::Id collectionId);
 
     void setSaveSubCollection(bool b);
-    bool saveSubCollection() const;
+    Q_REQUIRED_RESULT bool saveSubCollection() const;
 
     void setUrl(const QUrl &url);
-    QUrl url() const;
+    Q_REQUIRED_RESULT QUrl url() const;
 
     void readConfig(const KConfigGroup &config);
     void writeConfig(KConfigGroup &config);
 
     void setArchiveType(MailCommon::BackupJob::ArchiveType type);
-    MailCommon::BackupJob::ArchiveType archiveType() const;
+    Q_REQUIRED_RESULT MailCommon::BackupJob::ArchiveType archiveType() const;
 
     void setArchiveUnit(ArchiveMailInfo::ArchiveUnit unit);
-    ArchiveMailInfo::ArchiveUnit archiveUnit() const;
+    Q_REQUIRED_RESULT ArchiveMailInfo::ArchiveUnit archiveUnit() const;
 
     void setArchiveAge(int age);
-    int archiveAge() const;
+    Q_REQUIRED_RESULT int archiveAge() const;
 
     void setLastDateSaved(const QDate &date);
-    QDate lastDateSaved() const;
+    Q_REQUIRED_RESULT QDate lastDateSaved() const;
 
-    int maximumArchiveCount() const;
+    Q_REQUIRED_RESULT int maximumArchiveCount() const;
     void setMaximumArchiveCount(int max);
 
-    QStringList listOfArchive(const QString &foldername, bool &dirExist) const;
+    Q_REQUIRED_RESULT QStringList listOfArchive(const QString &foldername, bool &dirExist) const;
 
-    bool isEnabled() const;
+    Q_REQUIRED_RESULT bool isEnabled() const;
     void setEnabled(bool b);
 
-    bool operator ==(const ArchiveMailInfo &other) const;
+    Q_REQUIRED_RESULT bool operator ==(const ArchiveMailInfo &other) const;
 
 private:
     QString dirArchive(bool &dirExit) const;
diff -Nru kmail-19.04.3/agents/archivemailagent/archivemailkernel.h kmail-19.12.3/agents/archivemailagent/archivemailkernel.h
--- kmail-19.04.3/agents/archivemailagent/archivemailkernel.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/archivemailkernel.h	2020-03-02 07:34:49.000000000 +0000
@@ -48,12 +48,12 @@
     Akonadi::ChangeRecorder *folderCollectionMonitor() const override;
     void updateSystemTray() override;
 
-    qreal closeToQuotaThreshold() override;
-    bool excludeImportantMailFromExpiry() override;
-    QStringList customTemplates() override;
-    Akonadi::Collection::Id lastSelectedFolder() override;
+    Q_REQUIRED_RESULT qreal closeToQuotaThreshold() override;
+    Q_REQUIRED_RESULT bool excludeImportantMailFromExpiry() override;
+    Q_REQUIRED_RESULT QStringList customTemplates() override;
+    Q_REQUIRED_RESULT Akonadi::Collection::Id lastSelectedFolder() override;
     void setLastSelectedFolder(Akonadi::Collection::Id col) override;
-    bool showPopupAfterDnD() override;
+    Q_REQUIRED_RESULT bool showPopupAfterDnD() override;
     void expunge(Akonadi::Collection::Id col, bool sync) override;
 
 private:
diff -Nru kmail-19.04.3/agents/archivemailagent/archivemailmanager.h kmail-19.12.3/agents/archivemailagent/archivemailmanager.h
--- kmail-19.04.3/agents/archivemailagent/archivemailmanager.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/archivemailmanager.h	2020-03-02 07:34:49.000000000 +0000
@@ -39,10 +39,10 @@
     void pause();
     void resume();
 
-    QString printArchiveListInfo() const;
+    Q_REQUIRED_RESULT QString printArchiveListInfo() const;
     void collectionDoesntExist(ArchiveMailInfo *info);
 
-    QString printCurrentListInfo() const;
+    Q_REQUIRED_RESULT QString printCurrentListInfo() const;
 
     void archiveFolder(const QString &path, Akonadi::Collection::Id collectionId);
 
@@ -62,7 +62,7 @@
     QString infoToStr(ArchiveMailInfo *info) const;
     void removeCollectionId(Akonadi::Collection::Id id);
     KSharedConfig::Ptr mConfig;
-    QList<ArchiveMailInfo *> mListArchiveInfo;
+    QVector<ArchiveMailInfo *> mListArchiveInfo;
     ArchiveMailKernel *mArchiveMailKernel = nullptr;
 };
 
diff -Nru kmail-19.04.3/agents/archivemailagent/archivemailwidget.h kmail-19.12.3/agents/archivemailagent/archivemailwidget.h
--- kmail-19.04.3/agents/archivemailagent/archivemailwidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/archivemailwidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -53,7 +53,7 @@
         StorageDirectory
     };
 
-    bool save() const override;
+    Q_REQUIRED_RESULT bool save() const override;
     void load() override;
 
     void needReloadConfig();
@@ -61,7 +61,6 @@
     QSize restoreDialogSize() const override;
     void saveDialogSize(const QSize &size) override;
 
-
 private:
     void createOrUpdateItem(ArchiveMailInfo *info, ArchiveMailItem *item = nullptr);
     bool verifyExistingArchive(ArchiveMailInfo *info) const;
diff -Nru kmail-19.04.3/agents/archivemailagent/CMakeLists.txt kmail-19.12.3/agents/archivemailagent/CMakeLists.txt
--- kmail-19.04.3/agents/archivemailagent/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -24,7 +24,6 @@
     KF5::MailCommon
     KF5::I18n
     KF5::Notifications
-    KF5::IconThemes
     KF5::KIOWidgets
 )
 
@@ -44,7 +43,6 @@
     KF5::Notifications
     KF5::MailCommon
     KF5::Libkdepim
-    KF5::IconThemes
     KF5::I18n
     )
 
diff -Nru kmail-19.04.3/agents/archivemailagent/job/archivejob.cpp kmail-19.12.3/agents/archivemailagent/job/archivejob.cpp
--- kmail-19.04.3/agents/archivemailagent/job/archivejob.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/job/archivejob.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -30,8 +30,6 @@
 
 #include <KNotification>
 #include <KLocalizedString>
-#include <QIcon>
-#include <KIconLoader>
 
 ArchiveJob::ArchiveJob(ArchiveMailManager *manager, ArchiveMailInfo *info, const Akonadi::Collection &folder, bool immediate)
     : MailCommon::ScheduledJob(folder, immediate)
diff -Nru kmail-19.04.3/agents/archivemailagent/job/archivejob.h kmail-19.12.3/agents/archivemailagent/job/archivejob.h
--- kmail-19.04.3/agents/archivemailagent/job/archivejob.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/archivemailagent/job/archivejob.h	2020-03-02 07:34:49.000000000 +0000
@@ -22,7 +22,6 @@
 
 #include <MailCommon/JobScheduler>
 #include <Collection>
-#include <QPixmap>
 class ArchiveMailInfo;
 class ArchiveMailManager;
 
diff -Nru kmail-19.04.3/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc kmail-19.12.3/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc
--- kmail-19.04.3/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc	2020-03-02 07:34:49.000000000 +0000
@@ -11,6 +11,7 @@
 Comment[en_GB]=Followup reminder agent
 Comment[es]=Seguimiento de agente de recordatorio
 Comment[et]=Vastamise meeldetuletuse agent
+Comment[eu]=Jarraipen ohartarazpenen agentea
 Comment[fi]=Vastaamisen seurannasta muistuttaja
 Comment[fr]=Agent de rappel des messages suivis
 Comment[gl]=Axente de lembranzas de seguimento
@@ -22,7 +23,7 @@
 Comment[nb]=Agent for påminnelse om oppfølging
 Comment[nds]=Antwoortnaricht-Anstoothölper
 Comment[nl]=Agent voor herinneren aan vervolgactie
-Comment[pl]=Usługa ponaglającego przypominania
+Comment[pl]=Usługa przypominania
 Comment[pt]=Agente de recordação de seguimentos
 Comment[pt_BR]=Agente para acompanhar os lembretes
 Comment[ru]=Агент напоминания о продолжении
@@ -49,6 +50,7 @@
 Name[en_GB]=Mail Follow Up Received
 Name[es]=Recibido seguimiento de correo
 Name[et]=Saadi vastuskiri
+Name[eu]=Jarraipen posta jaso da
 Name[fi]=Vastausposti vastaanotettu
 Name[fr]=Un message suivis a été reçu
 Name[gl]=Recibiuse un seguimento de correo
diff -Nru kmail-19.04.3/agents/followupreminderagent/autotests/CMakeLists.txt kmail-19.12.3/agents/followupreminderagent/autotests/CMakeLists.txt
--- kmail-19.04.3/agents/followupreminderagent/autotests/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/autotests/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -1,7 +1,10 @@
+set(followupreminderagent_test_SRCS)
+qt5_add_dbus_interface(followupreminderagent_test_SRCS ../org.freedesktop.Notifications.xml notifications_interface)
+qt5_add_dbus_interface(followupreminderagent_test_SRCS ../org.freedesktop.DBus.Properties.xml dbusproperties)
 
 # Convenience macro to add unit tests.
 macro( followupreminder_agent _source )
-    set( _test ${_source} ../followupreminderinfowidget.cpp ../jobs/followupremindershowmessagejob.cpp ../followupremindernoanswerdialog.cpp)
+    set( _test ${_source} ../followupreminderinfowidget.cpp ../jobs/followupremindershowmessagejob.cpp ../followupremindernoanswerdialog.cpp ${followupreminderagent_test_SRCS})
     ecm_qt_declare_logging_category(_test HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent)
     get_filename_component( _name ${_source} NAME_WE )
     ecm_add_test(${_test}
diff -Nru kmail-19.04.3/agents/followupreminderagent/CMakeLists.txt kmail-19.12.3/agents/followupreminderagent/CMakeLists.txt
--- kmail-19.04.3/agents/followupreminderagent/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -16,6 +16,10 @@
 ecm_qt_declare_logging_category(followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent)
 qt5_add_dbus_adaptor(followupreminderagent_SRCS org.freedesktop.Akonadi.FollowUpReminder.xml followupreminderagent.h FollowUpReminderAgent)
 
+qt5_add_dbus_interface(followupreminderagent_SRCS org.freedesktop.Notifications.xml notifications_interface)
+qt5_add_dbus_interface(followupreminderagent_SRCS org.freedesktop.DBus.Properties.xml dbusproperties)
+
+
 add_library(followupreminderagent STATIC ${followupreminderagent_SRCS})
 target_link_libraries(followupreminderagent
     KF5::AkonadiCore
@@ -28,7 +32,6 @@
     KF5::Notifications
     KF5::MailCommon
     KF5::Libkdepim
-    KF5::IconThemes
     KF5::I18n
     KF5::CalendarCore
 )
@@ -52,7 +55,6 @@
     Qt5::Widgets
     KF5::Notifications
     KF5::I18n
-    KF5::IconThemes
     KF5::XmlGui
     KF5::Service
     )
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupreminderagent.cpp kmail-19.12.3/agents/followupreminderagent/followupreminderagent.cpp
--- kmail-19.04.3/agents/followupreminderagent/followupreminderagent.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupreminderagent.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -33,7 +33,6 @@
 #include <AkonadiCore/CollectionFetchScope>
 #include <AkonadiCore/ServerManager>
 
-#include <QPointer>
 #include "followupreminderagent_debug.h"
 #include <QTimer>
 
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupreminder.desktop kmail-19.12.3/agents/followupreminderagent/followupreminder.desktop
--- kmail-19.04.3/agents/followupreminderagent/followupreminder.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupreminder.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -10,6 +10,7 @@
 Name[en_GB]=Followup Reminder Agent
 Name[es]=Seguimiento de agente de recordatorio
 Name[et]=Vastamise meeldetuletuse agent
+Name[eu]=Jarraipen ohartarazpenen agentea
 Name[fi]=Vastaamisen seurannasta muistuttaja
 Name[fr]=Agent de rappel des messages suivis
 Name[gl]=Axente de lembranzas de seguimento
@@ -21,7 +22,7 @@
 Name[nb]=Agent for påminnelse om oppfølging
 Name[nds]=Antwoortnaricht-Anstoothölper
 Name[nl]=Agent voor herinneren aan vervolgactie
-Name[pl]=Usługa ponaglającego przypominania
+Name[pl]=Usługa przypominania
 Name[pt]=Agente de Recordação de Seguimentos
 Name[pt_BR]=Agente de Lembretes de Acompanhamento
 Name[ru]=Агент напоминания о продолжении
@@ -48,6 +49,7 @@
 Comment[en_GB]=Followup Reminder Agent allows to remind you when an email was not answered.
 Comment[es]=El seguimiento de agente de recordatorio le permite recordar cuando no se ha respondido a un correo.
 Comment[et]=Vastamise meeldetuletuse agent laseb meelde tuletada, kui sa pole kirjale vastust saanud.
+Comment[eu]=Jarraipen ohartarazpenen agenteak e-posta bat erantzun gabe dagoela gogoratzen laguntzen dizu.
 Comment[fi]=Vastaamisen seurannasta muistuttaja voi muistuttaa sinua, kun sähköpostiin ei ole vastattu.
 Comment[fr]=L'agent de rappel des messages suivis permet de se rappeler lorsqu'il n'y a pas eu de réponse à un courriel.
 Comment[gl]=O Axente de lembranzas de seguimento permite lembrarlle cando non se respondeu a unha mensaxe de correo.
@@ -60,7 +62,7 @@
 Comment[nds]=De Antwoortnaricht-Anstoothölper stööt Di an, wenn Du op en Nettbreef noch nich antert hest.
 Comment[nl]=Agent voor herinneren aan vervolgactie stelt u in staat om u te herinneren aan een nog niet beantwoord e-mailbericht.
 Comment[nn]=Agenten for oppfølgingspåminning kan minna deg på å svara.
-Comment[pl]=Usługa ponaglającego przypominania przypomina ci gdy nie odpowiedziano na wiadomość.
+Comment[pl]=Usługa przypominania przypomina ci gdy nie odpowiedziano na wiadomość.
 Comment[pt]=O Agente de Recordação de Seguimentos permite-lhe lembrar que um dado e-mail não foi respondido.
 Comment[pt_BR]=O Agende de Lembretes de Acompanhamento permite lembrar-lhe quando um e-mail não foi respondido.
 Comment[ru]=Агент напоминания о продолжении будет напоминать вам о письмах, на которые вам не ответили.
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupreminderinfoconfigwidget.cpp kmail-19.12.3/agents/followupreminderagent/followupreminderinfoconfigwidget.cpp
--- kmail-19.04.3/agents/followupreminderagent/followupreminderinfoconfigwidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupreminderinfoconfigwidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -19,15 +19,10 @@
 #include "followupreminderinfoconfigwidget.h"
 #include "followupreminderinfowidget.h"
 #include "kmail-version.h"
-
-#include <QHBoxLayout>
-#include <QHeaderView>
+#include <QLayout>
 #include <KAboutData>
-#include <QLocale>
-#include <QIcon>
 #include <KLocalizedString>
 #include <KSharedConfig>
-#include <KMessageBox>
 namespace {
 static const char myConfigGroupName[] = "FollowUpReminderInfoDialog";
 }
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupreminderinfoconfigwidget.h kmail-19.12.3/agents/followupreminderagent/followupreminderinfoconfigwidget.h
--- kmail-19.04.3/agents/followupreminderagent/followupreminderinfoconfigwidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupreminderinfoconfigwidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -21,8 +21,6 @@
 #define FOLLOWUPREMINDERINFOCONFIGWIDGET_H
 
 #include <QWidget>
-#include <KConfigGroup>
-#include <QTreeWidgetItem>
 #include <QVariantList>
 #include <AkonadiCore/Item>
 #include <AkonadiCore/AgentConfigurationBase>
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupreminderinfowidget.cpp kmail-19.12.3/agents/followupreminderagent/followupreminderinfowidget.cpp
--- kmail-19.04.3/agents/followupreminderagent/followupreminderinfowidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupreminderinfowidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -25,7 +25,6 @@
 #include <QTreeWidget>
 #include <QHBoxLayout>
 #include <QHeaderView>
-#include <KAboutData>
 #include <QLocale>
 #include <QIcon>
 #include <QMenu>
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupreminderinfowidget.h kmail-19.12.3/agents/followupreminderagent/followupreminderinfowidget.h
--- kmail-19.04.3/agents/followupreminderagent/followupreminderinfowidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupreminderinfowidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -23,7 +23,6 @@
 #include <QWidget>
 #include <KConfigGroup>
 #include <QTreeWidgetItem>
-#include <QVariantList>
 #include <AkonadiCore/Item>
 class QTreeWidget;
 namespace FollowUpReminder {
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupremindermanager.cpp kmail-19.12.3/agents/followupreminderagent/followupremindermanager.cpp
--- kmail-19.04.3/agents/followupreminderagent/followupremindermanager.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupremindermanager.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -26,14 +26,11 @@
 #include "jobs/followupreminderfinishtaskjob.h"
 #include <Akonadi/KMime/SpecialMailCollections>
 
-#include <QIcon>
-
 #include <KConfigGroup>
 #include <KConfig>
 #include <KSharedConfig>
 #include <knotification.h>
 #include <KLocalizedString>
-#include <KIconLoader>
 #include <QRegularExpression>
 using namespace FollowUpReminder;
 
@@ -84,7 +81,7 @@
             connect(mNoAnswerDialog.data(), &FollowUpReminderNoAnswerDialog::needToReparseConfiguration, this, &FollowUpReminderManager::slotReparseConfiguration);
         }
         mNoAnswerDialog->setInfo(noAnswerList);
-        mNoAnswerDialog->show();
+        mNoAnswerDialog->wakeUp();
     }
 }
 
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupremindernoanswerdialog.cpp kmail-19.12.3/agents/followupreminderagent/followupremindernoanswerdialog.cpp
--- kmail-19.04.3/agents/followupreminderagent/followupremindernoanswerdialog.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupremindernoanswerdialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -18,8 +18,10 @@
 */
 
 #include "followupremindernoanswerdialog.h"
-#include "FollowupReminder/FollowUpReminderInfo"
 #include "followupreminderinfowidget.h"
+#include "followupreminderagent_debug.h"
+
+#include <FollowupReminder/FollowUpReminderInfo>
 
 #include <KLocalizedString>
 #include <KSharedConfig>
@@ -30,6 +32,13 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 
+#include "notifications_interface.h" // DBUS-generated
+#include "dbusproperties.h" // DBUS-generated
+
+static const char s_fdo_notifications_service[] = "org.freedesktop.Notifications";
+static const char s_fdo_notifications_path[] = "/org/freedesktop/Notifications";
+
+
 FollowUpReminderNoAnswerDialog::FollowUpReminderNoAnswerDialog(QWidget *parent)
     : QDialog(parent)
 {
@@ -55,6 +64,15 @@
     mainLayout->addWidget(buttonBox);
 
     readConfig();
+    QDBusConnection dbusConn = QDBusConnection::sessionBus();
+    if (dbusConn.interface()->isServiceRegistered(QString::fromLatin1(s_fdo_notifications_service))) {
+        OrgFreedesktopDBusPropertiesInterface *propsIface = new OrgFreedesktopDBusPropertiesInterface(
+                    QString::fromLatin1(s_fdo_notifications_service),
+                    QString::fromLatin1(s_fdo_notifications_path),
+                    dbusConn, this);
+        connect(propsIface, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
+                this, &FollowUpReminderNoAnswerDialog::slotDBusNotificationsPropertiesChanged);
+    }
 }
 
 FollowUpReminderNoAnswerDialog::~FollowUpReminderNoAnswerDialog()
@@ -62,6 +80,40 @@
     writeConfig();
 }
 
+void FollowUpReminderNoAnswerDialog::wakeUp()
+{
+    // Check if notifications are inhibited (e.x. plasma "do not disturb" mode.
+    // In that case, we'll wait until they are allowed again (see slotDBusNotificationsPropertiesChanged)
+    QDBusConnection dbusConn = QDBusConnection::sessionBus();
+    if (dbusConn.interface()->isServiceRegistered(QString::fromLatin1(s_fdo_notifications_service))) {
+        OrgFreedesktopNotificationsInterface iface(
+                    QString::fromLatin1(s_fdo_notifications_service),
+                    QString::fromLatin1(s_fdo_notifications_path),
+                    dbusConn);
+        if (iface.inhibited()) {
+            return;
+        }
+    }
+    show();
+}
+
+void FollowUpReminderNoAnswerDialog::slotDBusNotificationsPropertiesChanged(
+        const QString &interface,
+        const QVariantMap &changedProperties,
+        const QStringList &invalidatedProperties)
+{
+    Q_UNUSED(interface); // always "org.freedesktop.Notifications"
+    Q_UNUSED(invalidatedProperties);
+    const auto it = changedProperties.find(QStringLiteral("Inhibited"));
+    if (it != changedProperties.end()) {
+        const bool inhibited = it.value().toBool();
+        qCDebug(FOLLOWUPREMINDERAGENT_LOG) << "Notifications inhibited:" << inhibited;
+        if (!inhibited) {
+            wakeUp();
+        }
+    }
+}
+
 void FollowUpReminderNoAnswerDialog::setInfo(const QList<FollowUpReminder::FollowUpReminderInfo *> &info)
 {
     mWidget->setInfo(info);
diff -Nru kmail-19.04.3/agents/followupreminderagent/followupremindernoanswerdialog.h kmail-19.12.3/agents/followupreminderagent/followupremindernoanswerdialog.h
--- kmail-19.04.3/agents/followupreminderagent/followupremindernoanswerdialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/followupremindernoanswerdialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -34,10 +34,12 @@
 
     void setInfo(const QList<FollowUpReminder::FollowUpReminderInfo *> &info);
 
+    void wakeUp();
 Q_SIGNALS:
     void needToReparseConfiguration();
 
 private:
+    void slotDBusNotificationsPropertiesChanged(const QString &interface, const QVariantMap &changedProperties, const QStringList &invalidatedProperties);
     void slotSave();
     void readConfig();
     void writeConfig();
diff -Nru kmail-19.04.3/agents/followupreminderagent/jobs/followupreminderfinishtaskjob.cpp kmail-19.12.3/agents/followupreminderagent/jobs/followupreminderfinishtaskjob.cpp
--- kmail-19.04.3/agents/followupreminderagent/jobs/followupreminderfinishtaskjob.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/jobs/followupreminderfinishtaskjob.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -23,7 +23,7 @@
 #include <AkonadiCore/ItemFetchJob>
 #include <AkonadiCore/ItemModifyJob>
 #include "followupreminderagent_debug.h"
-#include <KCalCore/Todo>
+#include <KCalendarCore/Todo>
 
 FollowUpReminderFinishTaskJob::FollowUpReminderFinishTaskJob(Akonadi::Item::Id id, QObject *parent)
     : QObject(parent)
@@ -65,16 +65,16 @@
     const Akonadi::Item::List lst = qobject_cast<Akonadi::ItemFetchJob *>(job)->items();
     if (lst.count() == 1) {
         const Akonadi::Item item = lst.first();
-        if (!item.hasPayload<KCalCore::Todo::Ptr>()) {
+        if (!item.hasPayload<KCalendarCore::Todo::Ptr>()) {
             qCDebug(FOLLOWUPREMINDERAGENT_LOG) << "FollowUpReminderFinishTaskJob::slotItemFetchJobDone: item is not a todo.";
             Q_EMIT finishTaskFailed();
             deleteLater();
             return;
         }
-        KCalCore::Todo::Ptr todo = item.payload<KCalCore::Todo::Ptr>();
+        KCalendarCore::Todo::Ptr todo = item.payload<KCalendarCore::Todo::Ptr>();
         todo->setCompleted(true);
         Akonadi::Item updateItem = item;
-        updateItem.setPayload<KCalCore::Todo::Ptr>(todo);
+        updateItem.setPayload<KCalendarCore::Todo::Ptr>(todo);
 
         Akonadi::ItemModifyJob *job = new Akonadi::ItemModifyJob(updateItem);
         connect(job, &Akonadi::ItemModifyJob::result, this, &FollowUpReminderFinishTaskJob::slotItemModifiedResult);
diff -Nru kmail-19.04.3/agents/followupreminderagent/org.freedesktop.DBus.Properties.xml kmail-19.12.3/agents/followupreminderagent/org.freedesktop.DBus.Properties.xml
--- kmail-19.04.3/agents/followupreminderagent/org.freedesktop.DBus.Properties.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/org.freedesktop.DBus.Properties.xml	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<!-- GDBus 2.32.4 -->
+<node>
+  <interface name="org.freedesktop.DBus.Properties">
+    <method name="Get">
+      <arg type="s" name="interface_name" direction="in"/>
+      <arg type="s" name="property_name" direction="in"/>
+      <arg type="v" name="value" direction="out"/>
+    </method>
+    <method name="GetAll">
+      <arg type="s" name="interface_name" direction="in"/>
+      <arg type="a{sv}" name="properties" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap" />
+    </method>
+    <method name="Set">
+      <arg type="s" name="interface_name" direction="in"/>
+      <arg type="s" name="property_name" direction="in"/>
+      <arg type="v" name="value" direction="in"/>
+    </method>
+    <signal name="PropertiesChanged">
+      <arg type="s" name="interface_name"/>
+      <arg type="a{sv}" name="changed_properties"/>
+      <arg type="as" name="invalidated_properties"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap" />
+    </signal>
+  </interface>
+</node>
diff -Nru kmail-19.04.3/agents/followupreminderagent/org.freedesktop.Notifications.xml kmail-19.12.3/agents/followupreminderagent/org.freedesktop.Notifications.xml
--- kmail-19.04.3/agents/followupreminderagent/org.freedesktop.Notifications.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/agents/followupreminderagent/org.freedesktop.Notifications.xml	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,60 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.Notifications">
+    <signal name="NotificationClosed">
+      <arg name="id" type="u" direction="out"/>
+      <arg name="reason" type="u" direction="out"/>
+    </signal>
+    <signal name="ActionInvoked">
+      <arg name="id" type="u" direction="out"/>
+      <arg name="action_key" type="s" direction="out"/>
+    </signal>
+    <method name="Notify">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
+      <arg type="u" direction="out"/>
+      <arg name="app_name" type="s" direction="in"/>
+      <arg name="replaces_id" type="u" direction="in"/>
+      <arg name="app_icon" type="s" direction="in"/>
+      <arg name="summary" type="s" direction="in"/>
+      <arg name="body" type="s" direction="in"/>
+      <arg name="actions" type="as" direction="in"/>
+      <arg name="hints" type="a{sv}" direction="in"/>
+      <arg name="timeout" type="i" direction="in"/>
+    </method>
+    <method name="CloseNotification">
+      <arg name="id" type="u" direction="in"/>
+    </method>
+    <method name="GetCapabilities">
+      <arg type="as" name="caps" direction="out"/>
+    </method>
+    <method name="GetServerInformation">
+      <arg type="s" name="name" direction="out"/>
+      <arg type="s" name="vendor" direction="out"/>
+      <arg type="s" name="version" direction="out"/>
+      <arg type="s" name="spec_version" direction="out"/>
+    </method>
+
+    <!-- Inhibitions -->
+    <method name="Inhibit">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QVariantMap"/>
+      <arg type="u" direction="out"/>
+      <arg name="desktop_entry" type="s" direction="in"/>
+      <arg name="reason" type="s" direction="in"/>
+      <arg name="hints" type="a{sv}" direction="in"/>
+    </method>
+
+    <method name="UnInhibit">
+      <arg type="u" direction="in"/>
+    </method>
+
+    <property name="Inhibited" type="b" access="read">
+      <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
+    </property>
+
+    <!--<method name="ListInhibitors">
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;Inhibition&gt;"/>
+      <arg name="inhibitors" type="a(ssa{sv})" direction="out"/>
+    </method>-->
+
+  </interface>
+</node>
diff -Nru kmail-19.04.3/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc kmail-19.12.3/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc
--- kmail-19.04.3/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/akonadi_mailfilter_agent.notifyrc	2020-03-02 07:34:49.000000000 +0000
@@ -12,6 +12,7 @@
 Comment[en_GB]=Mail Filter Agent
 Comment[es]=Agente de filtro de correo
 Comment[et]=Kirjade filtreerimise agent
+Comment[eu]=Posta iragazteko agentea
 Comment[fi]=Sähköpostisuodatin
 Comment[fr]=Agent de filtrage de messages
 Comment[gl]=Axente de filtrado do correo
@@ -56,6 +57,7 @@
 Name[en_GB]=Mail Filter Agent
 Name[es]=Agente de filtro de correo
 Name[et]=Kirjade filtreerimise agent
+Name[eu]=Posta iragazteko agentea
 Name[fi]=Sähköpostisuodatin
 Name[fr]=Agent de filtrage de messages
 Name[gl]=Axente de filtrado de correo
@@ -102,6 +104,7 @@
 Name[en_GB]=Mail filter log enabled
 Name[es]=Registro de filtro de correo activado
 Name[et]=Kirjade filtreerimise logi on lubatud
+Name[eu]=Posta iragazte egunkaria gaituta dago
 Name[fi]=Sähköpostisuodatinloki käytössä
 Name[fr]=Journal de l'agent de filtrage activé
 Name[gl]=Activouse o rexistro do filtrado do correo
@@ -146,6 +149,7 @@
 Name[en_GB]=An error occurred during filtering
 Name[es]=Ocurrió un error durante el filtrado
 Name[et]=Filtreerimise käigus tekkis tõrge
+Name[eu]=Errore bat gertatu da iragaztean
 Name[fi]=Suodattamisen aikana tapahtui virhe
 Name[fr]=Une erreur s'est produite lors du filtrage
 Name[gl]=Produciuse un erro ao filtrar
diff -Nru kmail-19.04.3/agents/mailfilteragent/autotests/CMakeLists.txt kmail-19.12.3/agents/mailfilteragent/autotests/CMakeLists.txt
--- kmail-19.04.3/agents/mailfilteragent/autotests/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/autotests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-# Convenience macro to add unit tests.
-macro(add_mailfilter_agent_test _source _extrasource)
-    set(_test ${_source} ${_extrasource})
-    get_filename_component(_name ${_source} NAME_WE)
-    ecm_add_test(${_test}
-        TEST_NAME ${_name}
-        NAME_PREFIX "mailfilteragent-"
-        LINK_LIBRARIES Qt5::Test Qt5::Widgets KF5::I18n KF5::ConfigCore
-        )
-endmacro()
-
-add_mailfilter_agent_test(configurewidgettest.cpp "../config/configurewidget.cpp")
diff -Nru kmail-19.04.3/agents/mailfilteragent/autotests/configurewidgettest.cpp kmail-19.12.3/agents/mailfilteragent/autotests/configurewidgettest.cpp
--- kmail-19.04.3/agents/mailfilteragent/autotests/configurewidgettest.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/autotests/configurewidgettest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/*
-   Copyright (C) 2015-2019 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 "configurewidgettest.h"
-#include <QTest>
-
-ConfigureWidgetTest::ConfigureWidgetTest(QObject *parent)
-    : QObject(parent)
-{
-}
-
-ConfigureWidgetTest::~ConfigureWidgetTest()
-{
-}
-
-QTEST_MAIN(ConfigureWidgetTest)
diff -Nru kmail-19.04.3/agents/mailfilteragent/autotests/configurewidgettest.h kmail-19.12.3/agents/mailfilteragent/autotests/configurewidgettest.h
--- kmail-19.04.3/agents/mailfilteragent/autotests/configurewidgettest.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/autotests/configurewidgettest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
-   Copyright (C) 2015-2019 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 CONFIGUREWIDGETTEST_H
-#define CONFIGUREWIDGETTEST_H
-
-#include <QObject>
-
-class ConfigureWidgetTest : public QObject
-{
-    Q_OBJECT
-public:
-    explicit ConfigureWidgetTest(QObject *parent = nullptr);
-    ~ConfigureWidgetTest();
-};
-
-#endif // CONFIGUREWIDGETTEST_H
diff -Nru kmail-19.04.3/agents/mailfilteragent/CMakeLists.txt kmail-19.12.3/agents/mailfilteragent/CMakeLists.txt
--- kmail-19.04.3/agents/mailfilteragent/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -8,7 +8,6 @@
     filterlogdialog.cpp
     filtermanager.cpp
     mailfilteragent.cpp
-    config/configurewidget.cpp
     mailfilterpurposemenuwidget.cpp
     )
 
@@ -37,7 +36,6 @@
     KF5::DBusAddons
     KF5::Notifications
     KF5::WindowSystem
-    KF5::IconThemes
     KF5::Libkdepim
     KF5::I18n
     )
@@ -46,7 +44,3 @@
 install(FILES mailfilteragent.desktop DESTINATION "${KDE_INSTALL_DATAROOTDIR}/akonadi/agents")
 install(FILES akonadi_mailfilter_agent.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
 
-if(BUILD_TESTING)
-    add_subdirectory(autotests)
-endif()
-
diff -Nru kmail-19.04.3/agents/mailfilteragent/config/configurewidget.cpp kmail-19.12.3/agents/mailfilteragent/config/configurewidget.cpp
--- kmail-19.04.3/agents/mailfilteragent/config/configurewidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/config/configurewidget.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/*
-   Copyright (C) 2015-2019 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 "configurewidget.h"
-
-ConfigureWidget::ConfigureWidget(QWidget *parent)
-    : QWidget(parent)
-{
-}
-
-ConfigureWidget::~ConfigureWidget()
-{
-}
diff -Nru kmail-19.04.3/agents/mailfilteragent/config/configurewidget.h kmail-19.12.3/agents/mailfilteragent/config/configurewidget.h
--- kmail-19.04.3/agents/mailfilteragent/config/configurewidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/config/configurewidget.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
-   Copyright (C) 2015-2019 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 CONFIGUREWIDGET_H
-#define CONFIGUREWIDGET_H
-
-#include <QWidget>
-
-class ConfigureWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit ConfigureWidget(QWidget *parent = nullptr);
-    ~ConfigureWidget();
-};
-
-#endif // CONFIGUREWIDGET_H
diff -Nru kmail-19.04.3/agents/mailfilteragent/filterlogdialog.cpp kmail-19.12.3/agents/mailfilteragent/filterlogdialog.cpp
--- kmail-19.04.3/agents/mailfilteragent/filterlogdialog.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/filterlogdialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -98,15 +98,11 @@
     }
 
     MailfilterPurposeMenuWidget *purposeMenu = new MailfilterPurposeMenuWidget(this, this);
-    if (purposeMenu->menu()) {
-        QPushButton *mShareButton = new QPushButton(i18n("Share..."), this);
-        mShareButton->setMenu(purposeMenu->menu());
-        mShareButton->setIcon(QIcon::fromTheme(QStringLiteral("document-share")));
-        purposeMenu->setEditorWidget(mTextEdit->editor());
-        buttonBox->addButton(mShareButton, QDialogButtonBox::ActionRole);
-    } else {
-        delete purposeMenu;
-    }
+    QPushButton *mShareButton = new QPushButton(i18n("Share..."), this);
+    mShareButton->setMenu(purposeMenu->menu());
+    mShareButton->setIcon(QIcon::fromTheme(QStringLiteral("document-share")));
+    purposeMenu->setEditorWidget(mTextEdit->editor());
+    buttonBox->addButton(mShareButton, QDialogButtonBox::ActionRole);
 
     mLogActiveBox = new QCheckBox(i18n("&Log filter activities"), page);
     pageVBoxLayout->addWidget(mLogActiveBox);
@@ -180,7 +176,7 @@
     mLogMemLimitSpin->setSuffix(i18n(" KB"));
     mLogMemLimitSpin->setSpecialValueText(
         i18nc("@label:spinbox Set the size of the logfile to unlimited.", "unlimited"));
-    connect(mLogMemLimitSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, &FilterLogDialog::slotChangeLogMemLimit);
+    connect(mLogMemLimitSpin, qOverload<int>(&QSpinBox::valueChanged), this, &FilterLogDialog::slotChangeLogMemLimit);
     mLogMemLimitSpin->setWhatsThis(
         i18n("Collecting log data uses memory to temporarily store the "
              "log data; here you can limit the maximum amount of memory "
diff -Nru kmail-19.04.3/agents/mailfilteragent/filtermanager.cpp kmail-19.12.3/agents/mailfilteragent/filtermanager.cpp
--- kmail-19.04.3/agents/mailfilteragent/filtermanager.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/filtermanager.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -37,7 +37,6 @@
 #include <KLocalizedString>
 #include <KNotification>
 #include <QIcon>
-#include <KIconLoader>
 #include <kmime/kmime_message.h>
 #include <MailCommon/FilterImporterExporter>
 #include <MailCommon/FilterLog>
@@ -62,7 +61,6 @@
         , mCurrentProgressCount(0)
         , mInboundFiltersExist(false)
     {
-        pixmapNotification = QIcon::fromTheme(QStringLiteral("view-filter")).pixmap(KIconLoader::SizeSmall, KIconLoader::SizeSmall);
     }
 
     void itemsFetchJobForFilterDone(KJob *job);
@@ -79,9 +77,8 @@
     bool atLeastOneFilterAppliesTo(const QString &accountId) const;
     bool atLeastOneIncomingFilterAppliesTo(const QString &accountId) const;
     FilterManager *q;
-    QList<MailCommon::MailFilter *> mFilters;
+    QVector<MailCommon::MailFilter *> mFilters;
     QMap<QString, SearchRule::RequiredPart> mRequiredParts;
-    QPixmap pixmapNotification;
     SearchRule::RequiredPart mRequiredPartsBasedOnAll;
     int mTotalProgressCount = 0;
     int mCurrentProgressCount = 0;
@@ -96,7 +93,7 @@
         filterSet = static_cast<FilterManager::FilterSet>(q->sender()->property("filterSet").toInt());
     }
 
-    QList<MailFilter *> listMailFilters;
+    QVector<MailFilter *> listMailFilters;
     if (q->sender()->property("listFilters").isValid()) {
         const QStringList listFilters = q->sender()->property("listFilters").toStringList();
         //TODO improve it
@@ -232,7 +229,7 @@
 {
     KNotification *notify = new KNotification(QStringLiteral("mailfilterjoberror"));
     notify->setComponentName(QStringLiteral("akonadi_mailfilter_agent"));
-    notify->setPixmap(pixmapNotification);
+    notify->setIconName(QStringLiteral("view-filter"));
     notify->setText(errorMsg + QLatin1Char('\n') + jobErrorString);
     notify->sendEvent();
 }
@@ -363,8 +360,8 @@
 
 void FilterManager::mailCollectionRemoved(const Akonadi::Collection &collection)
 {
-    QList<MailCommon::MailFilter *>::const_iterator end(d->mFilters.constEnd());
-    for (QList<MailCommon::MailFilter *>::const_iterator it = d->mFilters.constBegin();
+    QVector<MailCommon::MailFilter *>::const_iterator end(d->mFilters.constEnd());
+    for (QVector<MailCommon::MailFilter *>::const_iterator it = d->mFilters.constBegin();
          it != end; ++it) {
         (*it)->folderRemoved(collection, Akonadi::Collection());
     }
@@ -372,8 +369,8 @@
 
 void FilterManager::agentRemoved(const QString &identifier)
 {
-    QList<MailCommon::MailFilter *>::const_iterator end(d->mFilters.constEnd());
-    for (QList<MailCommon::MailFilter *>::const_iterator it = d->mFilters.constBegin();
+    QVector<MailCommon::MailFilter *>::const_iterator end(d->mFilters.constEnd());
+    for (QVector<MailCommon::MailFilter *>::const_iterator it = d->mFilters.constBegin();
          it != end; ++it) {
         (*it)->agentRemoved(identifier);
     }
@@ -506,7 +503,7 @@
     return true;
 }
 
-bool FilterManager::process(const QList< MailFilter * > &mailFilters, const Akonadi::Item &item, bool needsFullPayload, FilterManager::FilterSet set, bool account, const QString &accountId)
+bool FilterManager::process(const QVector< MailFilter * > &mailFilters, const Akonadi::Item &item, bool needsFullPayload, FilterManager::FilterSet set, bool account, const QString &accountId)
 {
     if (set == NoSet) {
         qCDebug(MAILFILTERAGENT_LOG) << "FilterManager: process() called with not filter set selected";
@@ -523,11 +520,11 @@
     d->beginFiltering(item);
 
     ItemContext context(item, needsFullPayload);
-    QList<MailCommon::MailFilter *>::const_iterator end(mailFilters.constEnd());
+    QVector<MailCommon::MailFilter *>::const_iterator end(mailFilters.constEnd());
 
     const bool applyOnOutbound = ((set & Outbound) || (set & BeforeOutbound));
 
-    for (QList<MailCommon::MailFilter *>::const_iterator it = mailFilters.constBegin();
+    for (QVector<MailCommon::MailFilter *>::const_iterator it = mailFilters.constBegin();
          !stopIt && it != end; ++it) {
         if ((*it)->isEnabled()) {
             const bool inboundOk = ((set & Inbound) && (*it)->applyOnInbound());
diff -Nru kmail-19.04.3/agents/mailfilteragent/filtermanager.h kmail-19.12.3/agents/mailfilteragent/filtermanager.h
--- kmail-19.04.3/agents/mailfilteragent/filtermanager.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/filtermanager.h	2020-03-02 07:34:49.000000000 +0000
@@ -80,7 +80,7 @@
      * Checks for existing filters with the @p name and extend the
      * "name" to "name (i)" until no match is found for i=1..n
      */
-    QString createUniqueName(const QString &name) const;
+    Q_REQUIRED_RESULT QString createUniqueName(const QString &name) const;
 
     /**
      * Process given message item by applying the filter rules one by
@@ -94,9 +94,9 @@
      *
      *  @return true if the filtering was successful, false in case of any error
      */
-    bool process(const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false, const QString &accountId = QString());
+    Q_REQUIRED_RESULT bool process(const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false, const QString &accountId = QString());
 
-    bool process(const QList<MailCommon::MailFilter *> &mailFilters, const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false, const QString &accountId = QString());
+    Q_REQUIRED_RESULT bool process(const QVector<MailCommon::MailFilter *> &mailFilters, const Akonadi::Item &item, bool needsFullPayload, FilterSet set = Inbound, bool account = false, const QString &accountId = QString());
 
     /**
      * For ad-hoc filters.
@@ -104,7 +104,7 @@
      * Applies @p filter to message @p item.
      * Return codes are as with the above method.
      */
-    bool process(const Akonadi::Item &item, bool needsFullPayload, const MailCommon::MailFilter *filter);
+    Q_REQUIRED_RESULT bool process(const Akonadi::Item &item, bool needsFullPayload, const MailCommon::MailFilter *filter);
 
     void filter(const Akonadi::Item &item, FilterManager::FilterSet set, const QString &resourceId);
     void filter(const Akonadi::Item &item, const QString &filterId, const QString &resourceId);
@@ -119,12 +119,12 @@
     /**
      * Returns whether the configured filters need the full mail content.
      */
-    MailCommon::SearchRule::RequiredPart requiredPart(const QString &id) const;
+    Q_REQUIRED_RESULT MailCommon::SearchRule::RequiredPart requiredPart(const QString &id) const;
 
     void mailCollectionRemoved(const Akonadi::Collection &collection);
     void agentRemoved(const QString &identifier);
 
-    bool hasAllFoldersFilter() const;
+    Q_REQUIRED_RESULT bool hasAllFoldersFilter() const;
 
     /**
      * Outputs all filter rules to console. Used for debugging.
@@ -132,7 +132,7 @@
     void dump() const;
 
 protected:
-    bool processContextItem(MailCommon::ItemContext context);
+    Q_REQUIRED_RESULT bool processContextItem(MailCommon::ItemContext context);
 
 Q_SIGNALS:
     /**
diff -Nru kmail-19.04.3/agents/mailfilteragent/mailfilteragent.cpp kmail-19.12.3/agents/mailfilteragent/mailfilteragent.cpp
--- kmail-19.04.3/agents/mailfilteragent/mailfilteragent.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/mailfilteragent.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -39,7 +39,6 @@
 #include <KLocalizedString>
 #include <QIcon>
 #include "mailfilteragent_debug.h"
-#include <KIconLoader>
 #include <KMime/Message>
 #include <KNotification>
 #include <KWindowSystem>
@@ -90,7 +89,7 @@
     collectionMonitor->setMimeTypeMonitored(KMime::Message::mimeType());
 
     connect(collectionMonitor, &Akonadi::Monitor::collectionAdded, this, &MailFilterAgent::mailCollectionAdded);
-    connect(collectionMonitor, QOverload<const Akonadi::Collection &>::of(&Akonadi::Monitor::collectionChanged),
+    connect(collectionMonitor, qOverload<const Akonadi::Collection &>(&Akonadi::Monitor::collectionChanged),
             this, &MailFilterAgent::mailCollectionChanged);
 
     connect(collectionMonitor, &Akonadi::Monitor::collectionRemoved, this, &MailFilterAgent::mailCollectionRemoved);
@@ -112,10 +111,9 @@
     if (config->hasGroup("FilterLog")) {
         KConfigGroup group(config, "FilterLog");
         if (group.readEntry("Enabled", false)) {
-            const QPixmap pixmap = QIcon::fromTheme(QStringLiteral("view-filter")).pixmap(KIconLoader::SizeSmall, KIconLoader::SizeSmall);
             KNotification *notify = new KNotification(QStringLiteral("mailfilterlogenabled"));
             notify->setComponentName(QApplication::applicationDisplayName());
-            notify->setPixmap(pixmap);
+            notify->setIconName(QStringLiteral("view-filter"));
             notify->setText(i18nc("Notification when the filter log was enabled", "Mail Filter Log Enabled"));
             notify->sendEvent();
         }
@@ -273,7 +271,9 @@
     }
 
     emitProgressMessage(i18n("Filtering in %1", Akonadi::AgentManager::self()->instance(resource).name()));
-    m_filterManager->process(item, m_filterManager->requiredPart(resource), FilterManager::Inbound, true, resource);
+    if (!m_filterManager->process(item, m_filterManager->requiredPart(resource), FilterManager::Inbound, true, resource)) {
+        qCWarning(MAILFILTERAGENT_LOG) << "Impossible to process mails";
+    }
 
     emitProgress(++mProgressCounter);
 
@@ -383,8 +383,9 @@
 {
     if (!m_filterLogDialog) {
         m_filterLogDialog = new FilterLogDialog(nullptr);
+        m_filterLogDialog->setAttribute(Qt::WA_NativeWindow, true);
     }
-    KWindowSystem::setMainWindow(m_filterLogDialog, windowId);
+    KWindowSystem::setMainWindow(m_filterLogDialog->windowHandle(), windowId);
     m_filterLogDialog->show();
     m_filterLogDialog->raise();
     m_filterLogDialog->activateWindow();
@@ -406,7 +407,7 @@
     Q_EMIT status(AgentBase::Running, message);
 }
 
-QString MailFilterAgent::printCollectionMonitored()
+QString MailFilterAgent::printCollectionMonitored() const
 {
     QString printDebugCollection;
     const Akonadi::Collection::List collections = changeRecorder()->collectionsMonitored();
@@ -424,12 +425,6 @@
     return printDebugCollection;
 }
 
-void MailFilterAgent::showConfigureDialog(qlonglong windowId)
-{
-    Q_UNUSED(windowId);
-    //TODO
-}
-
 void MailFilterAgent::expunge(qint64 collectionId)
 {
     mMailFilterKernel->expunge(collectionId, false);
diff -Nru kmail-19.04.3/agents/mailfilteragent/mailfilteragent.desktop kmail-19.12.3/agents/mailfilteragent/mailfilteragent.desktop
--- kmail-19.04.3/agents/mailfilteragent/mailfilteragent.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/mailfilteragent.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -11,6 +11,7 @@
 Name[en_GB]=Mail Filter Agent
 Name[es]=Agente de filtro de correo
 Name[et]=Kirjade filtreerimise agent
+Name[eu]=Posta iragazteko agentea
 Name[fi]=Sähköpostisuodatin
 Name[fr]=Agent de filtrage de messages
 Name[gl]=Axente de filtrado de correo
@@ -54,6 +55,7 @@
 Comment[en_GB]=Extension to filter emails
 Comment[es]=Extensión para filtrar correos
 Comment[et]=Laiendus e-kirjade filtreerimiseks
+Comment[eu]=E-posta iragazteko luzapena
 Comment[fi]=Sähköpostien suodatuslaajennus
 Comment[fr]=Extension pour filtrer les courriels
 Comment[gl]=Extensión para filtrar correos
diff -Nru kmail-19.04.3/agents/mailfilteragent/mailfilteragent.h kmail-19.12.3/agents/mailfilteragent/mailfilteragent.h
--- kmail-19.04.3/agents/mailfilteragent/mailfilteragent.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/mailfilteragent.h	2020-03-02 07:34:49.000000000 +0000
@@ -45,7 +45,7 @@
     explicit MailFilterAgent(const QString &id);
     ~MailFilterAgent() override;
 
-    QString createUniqueName(const QString &nameTemplate);
+    Q_REQUIRED_RESULT QString createUniqueName(const QString &nameTemplate);
     void filterItems(const QList< qint64 > &itemIds, int filterSet);
 
     void filterItem(qint64 item, int filterSet, const QString &resourceId);
@@ -57,9 +57,7 @@
     void reload();
 
     void showFilterLogDialog(qlonglong windowId = 0);
-    QString printCollectionMonitored();
-
-    void showConfigureDialog(qlonglong windowId = 0);
+    Q_REQUIRED_RESULT QString printCollectionMonitored() const;
 
     void expunge(qint64 collectionId);
 protected:
diff -Nru kmail-19.04.3/agents/mailfilteragent/mailfilterpurposemenuwidget.h kmail-19.12.3/agents/mailfilteragent/mailfilterpurposemenuwidget.h
--- kmail-19.04.3/agents/mailfilteragent/mailfilterpurposemenuwidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/mailfilteragent/mailfilterpurposemenuwidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -31,7 +31,7 @@
     explicit MailfilterPurposeMenuWidget(QWidget *parentWidget, QObject *parent = nullptr);
     ~MailfilterPurposeMenuWidget() override;
 
-    QByteArray text() override;
+    Q_REQUIRED_RESULT QByteArray text() override;
     void setEditorWidget(KPIMTextEdit::PlainTextEditor *editor);
 private:
     KPIMTextEdit::PlainTextEditor *mEditor = nullptr;
diff -Nru kmail-19.04.3/agents/sendlateragent/akonadi_sendlater_agent.notifyrc kmail-19.12.3/agents/sendlateragent/akonadi_sendlater_agent.notifyrc
--- kmail-19.04.3/agents/sendlateragent/akonadi_sendlater_agent.notifyrc	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/akonadi_sendlater_agent.notifyrc	2020-03-02 07:34:49.000000000 +0000
@@ -5,12 +5,14 @@
 Comment[bs]=Agent za slanje kasnije
 Comment[ca]=Agent per enviar més tard
 Comment[ca@valencia]=Agent per enviar més tard
+Comment[cs]=Agent pro odeslání později
 Comment[da]=Agent til send senere
 Comment[de]=Agent zum späteren Senden
 Comment[el]=Πράκτορας ετεροχρονισμένης αποστολής
 Comment[en_GB]=Send Later Agent
 Comment[es]=Agente de enviar más tarde
 Comment[et]=Hilisema saatmise agent
+Comment[eu]=Beranduago bidaltzeko agentea
 Comment[fi]=Lähetä myöhemmin -agentti
 Comment[fr]=Agent d'envoi différé
 Comment[gl]=Axente para enviar máis tarde
@@ -54,6 +56,7 @@
 Name[en_GB]=Mail is sent
 Name[es]=Correo enviado
 Name[et]=Kiri on saadetud
+Name[eu]=Posta bidali da
 Name[fi]=Posti on lähetetty
 Name[fr]=Courriel envoyé
 Name[gl]=Enviouse o correo
@@ -98,6 +101,7 @@
 Name[en_GB]=Send mail failed
 Name[es]=Falló el envío del correo
 Name[et]=Kirja saatmine nurjus
+Name[eu]=Posta bidaltzea huts egin du
 Name[fi]=Postin lähetys epäonnistui
 Name[fr]=Erreur lors de l'envoi du courriel
 Name[gl]=O envío de correo fallou
diff -Nru kmail-19.04.3/agents/sendlateragent/CMakeLists.txt kmail-19.12.3/agents/sendlateragent/CMakeLists.txt
--- kmail-19.04.3/agents/sendlateragent/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -43,7 +43,6 @@
     KF5::WindowSystem
     KF5::XmlGui
     KF5::Notifications
-    KF5::IconThemes
     KF5::I18n
     )
 
diff -Nru kmail-19.04.3/agents/sendlateragent/org.freedesktop.Akonadi.SendLaterAgent.xml kmail-19.12.3/agents/sendlateragent/org.freedesktop.Akonadi.SendLaterAgent.xml
--- kmail-19.04.3/agents/sendlateragent/org.freedesktop.Akonadi.SendLaterAgent.xml	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/org.freedesktop.Akonadi.SendLaterAgent.xml	2020-03-02 07:34:49.000000000 +0000
@@ -11,5 +11,8 @@
        <arg type="s" direction="out"/>
     </method>
     <method name="reload" />
+    <method name="removeItem" >
+       <arg name="item" type="x" direction="in"/>
+    </method>
   </interface>
 </node>
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlateragent.cpp kmail-19.12.3/agents/sendlateragent/sendlateragent.cpp
--- kmail-19.04.3/agents/sendlateragent/sendlateragent.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlateragent.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -138,13 +138,14 @@
 {
     QPointer<SendLaterConfigureDialog> dialog = new SendLaterConfigureDialog();
     if (windowId) {
-        KWindowSystem::setMainWindow(dialog, windowId);
+        dialog->setAttribute(Qt::WA_NativeWindow, true);
+        KWindowSystem::setMainWindow(dialog->windowHandle(), windowId);
     }
     connect(this, &SendLaterAgent::needUpdateConfigDialogBox, dialog.data(), &SendLaterConfigureDialog::slotNeedToReloadConfig);
     connect(dialog.data(), &SendLaterConfigureDialog::sendNow, this, &SendLaterAgent::slotSendNow);
     if (dialog->exec()) {
         mManager->load();
-        QList<Akonadi::Item::Id> listMessage = dialog->messagesToRemove();
+        const QVector<Akonadi::Item::Id> listMessage = dialog->messagesToRemove();
         if (!listMessage.isEmpty()) {
             //Will delete in specific job when done.
             SendLaterRemoveMessageJob *sendlaterremovejob = new SendLaterRemoveMessageJob(listMessage, this);
@@ -154,6 +155,13 @@
     delete dialog;
 }
 
+void SendLaterAgent::removeItem(qint64 item)
+{
+    if (mManager->itemRemoved(item)) {
+        reload();
+    }
+}
+
 void SendLaterAgent::slotSendNow(Akonadi::Item::Id id)
 {
     mManager->sendNow(id);
@@ -161,8 +169,14 @@
 
 void SendLaterAgent::itemsRemoved(const Akonadi::Item::List &items)
 {
+    bool needToReload = false;
     for (const Akonadi::Item &item : items) {
-        mManager->itemRemoved(item.id());
+        if (mManager->itemRemoved(item.id())) {
+            needToReload = true;
+        }
+    }
+    if (needToReload) {
+        reload();
     }
 }
 
@@ -174,7 +188,7 @@
     itemsRemoved(items);
 }
 
-QString SendLaterAgent::printDebugInfo()
+QString SendLaterAgent::printDebugInfo() const
 {
     return mManager->printDebugInfo();
 }
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlateragent.desktop kmail-19.12.3/agents/sendlateragent/sendlateragent.desktop
--- kmail-19.04.3/agents/sendlateragent/sendlateragent.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlateragent.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -4,12 +4,14 @@
 Name[bs]=Agent za kasnije slanje
 Name[ca]=Agent per enviar més tard
 Name[ca@valencia]=Agent per enviar més tard
+Name[cs]=Agent pro odeslání později
 Name[da]=Agent til send senere
 Name[de]=Agent zum späteren Senden
 Name[el]=Πράκτορας ετεροχρονισμένης αποστολής
 Name[en_GB]=Send Later Agent
 Name[es]=Agente de enviar después
 Name[et]=Hilisema saatmise agent
+Name[eu]=Beranduago bidaltzeko agentea
 Name[fi]=Lähetä myöhemmin -agentti
 Name[fr]=Agent d'envoi différé
 Name[gl]=Axente para enviar máis tarde
@@ -44,12 +46,14 @@
 Comment[bs]=Agent za slanje kasnije
 Comment[ca]=Agent per enviar més tard
 Comment[ca@valencia]=Agent per enviar més tard
+Comment[cs]=Agent pro odeslání později
 Comment[da]=Agent til send senere
 Comment[de]=Agent zum späteren Senden
 Comment[el]=Πράκτορας ετεροχρονισμένης αποστολής
 Comment[en_GB]=Send Later Agent
 Comment[es]=Agente de enviar más tarde
 Comment[et]=Hilisema saatmise agent
+Comment[eu]=Beranduago bidaltzeko agentea
 Comment[fi]=Lähetä myöhemmin -agentti
 Comment[fr]=Agent d'envoi différé
 Comment[gl]=Axente para enviar máis tarde
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlateragent.h kmail-19.12.3/agents/sendlateragent/sendlateragent.h
--- kmail-19.04.3/agents/sendlateragent/sendlateragent.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlateragent.h	2020-03-02 07:34:49.000000000 +0000
@@ -32,10 +32,10 @@
     explicit SendLaterAgent(const QString &id);
     ~SendLaterAgent() override;
 
-    QString printDebugInfo();
+    Q_REQUIRED_RESULT QString printDebugInfo() const;
 
     void setEnableAgent(bool b);
-    bool enabledAgent() const;
+    Q_REQUIRED_RESULT bool enabledAgent() const;
 
 Q_SIGNALS:
     void needUpdateConfigDialogBox();
@@ -43,6 +43,7 @@
 public Q_SLOTS:
     void reload();
     void configure(WId windowId) override;
+    void removeItem(qint64 item);
 
 protected:
     void itemsRemoved(const Akonadi::Item::List &item) override;
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlaterconfiguredialog.cpp kmail-19.12.3/agents/sendlateragent/sendlaterconfiguredialog.cpp
--- kmail-19.04.3/agents/sendlateragent/sendlaterconfiguredialog.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlaterconfiguredialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -79,7 +79,7 @@
     writeConfig();
 }
 
-QList<Akonadi::Item::Id> SendLaterConfigureDialog::messagesToRemove() const
+QVector<Akonadi::Item::Id> SendLaterConfigureDialog::messagesToRemove() const
 {
     return mWidget->messagesToRemove();
 }
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlaterconfiguredialog.h kmail-19.12.3/agents/sendlateragent/sendlaterconfiguredialog.h
--- kmail-19.04.3/agents/sendlateragent/sendlaterconfiguredialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlaterconfiguredialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -30,7 +30,7 @@
     explicit SendLaterConfigureDialog(QWidget *parent = nullptr);
     ~SendLaterConfigureDialog();
 
-    QList<Akonadi::Item::Id> messagesToRemove() const;
+    Q_REQUIRED_RESULT QVector<Akonadi::Item::Id> messagesToRemove() const;
 
 public Q_SLOTS:
     void slotNeedToReloadConfig();
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlaterconfigurewidget.cpp kmail-19.12.3/agents/sendlateragent/sendlaterconfigurewidget.cpp
--- kmail-19.04.3/agents/sendlateragent/sendlaterconfigurewidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlaterconfigurewidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -40,7 +40,6 @@
 
 SendLaterItem::SendLaterItem(QTreeWidget *parent)
     : QTreeWidgetItem(parent)
-    , mInfo(nullptr)
 {
 }
 
@@ -61,7 +60,6 @@
 
 SendLaterWidget::SendLaterWidget(QWidget *parent)
     : QWidget(parent)
-    , mChanged(false)
 {
     mWidget = new Ui::SendLaterConfigureWidget;
     mWidget->setupUi(this);
@@ -268,7 +266,7 @@
     load();
 }
 
-QList<Akonadi::Item::Id> SendLaterWidget::messagesToRemove() const
+QVector<Akonadi::Item::Id> SendLaterWidget::messagesToRemove() const
 {
     return mListMessagesToRemove;
 }
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlaterconfigurewidget.h kmail-19.12.3/agents/sendlateragent/sendlaterconfigurewidget.h
--- kmail-19.04.3/agents/sendlateragent/sendlaterconfigurewidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlaterconfigurewidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -62,7 +62,7 @@
     void saveTreeWidgetHeader(KConfigGroup &group);
     void restoreTreeWidgetHeader(const QByteArray &group);
     void needToReload();
-    QList<Akonadi::Item::Id> messagesToRemove() const;
+    QVector<Akonadi::Item::Id> messagesToRemove() const;
 
 Q_SIGNALS:
     void sendNow(Akonadi::Item::Id);
@@ -75,8 +75,8 @@
     void slotSendNow();
     void createOrUpdateItem(SendLater::SendLaterInfo *info, SendLaterItem *item = nullptr);
     void load();
-    QList<Akonadi::Item::Id> mListMessagesToRemove;
-    bool mChanged;
+    QVector<Akonadi::Item::Id> mListMessagesToRemove;
+    bool mChanged = false;
     Ui::SendLaterConfigureWidget *mWidget = nullptr;
 };
 
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlaterjob.cpp kmail-19.12.3/agents/sendlateragent/sendlaterjob.cpp
--- kmail-19.04.3/agents/sendlateragent/sendlaterjob.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlaterjob.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -34,8 +34,6 @@
 
 #include <KNotification>
 #include <KLocalizedString>
-#include <QIcon>
-#include <KIconLoader>
 #include "sendlateragent_debug.h"
 
 SendLaterJob::SendLaterJob(SendLaterManager *manager, SendLater::SendLaterInfo *info, QObject *parent)
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlatermanager.cpp kmail-19.12.3/agents/sendlateragent/sendlatermanager.cpp
--- kmail-19.04.3/agents/sendlateragent/sendlatermanager.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlatermanager.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -37,8 +37,6 @@
 
 SendLaterManager::SendLaterManager(QObject *parent)
     : QObject(parent)
-    , mCurrentInfo(nullptr)
-    , mCurrentJob(nullptr)
     , mSender(new MessageComposer::AkonadiSender)
 {
     mConfig = KSharedConfig::openConfig();
@@ -58,6 +56,7 @@
     qDeleteAll(mListSendLaterInfo);
     mListSendLaterInfo.clear();
     mCurrentJob = nullptr;
+    mCurrentInfo = nullptr;
 }
 
 void SendLaterManager::load(bool forcereload)
@@ -140,7 +139,9 @@
             slotCreateJob();
         } else {
             qCDebug(SENDLATERAGENT_LOG) << " can't find info about current id: " << id;
-            itemRemoved(id);
+            if (!itemRemoved(id)) {
+                qCWarning(SENDLATERAGENT_LOG) << "Impossible to remove id" << id;
+            }
         }
     } else {
         //Add to QQueue
@@ -158,13 +159,15 @@
     mCurrentJob->start();
 }
 
-void SendLaterManager::itemRemoved(Akonadi::Item::Id id)
+bool SendLaterManager::itemRemoved(Akonadi::Item::Id id)
 {
     if (mConfig->hasGroup(SendLater::SendLaterUtil::sendLaterPattern().arg(id))) {
         removeInfo(id);
         mConfig->reparseConfiguration();
         Q_EMIT needUpdateConfigDialogBox();
+        return true;
     }
+    return false;
 }
 
 void SendLaterManager::removeInfo(Akonadi::Item::Id id)
@@ -176,6 +179,7 @@
 
 void SendLaterManager::sendError(SendLater::SendLaterInfo *info, ErrorType type)
 {
+    mCurrentJob = nullptr;
     if (info) {
         switch (type) {
         case UnknownError:
@@ -186,13 +190,17 @@
         case MailDispatchDoesntWork:
             //Force to make online maildispatcher
             //Don't remove it.
-            MessageComposer::Util::sendMailDispatcherIsOnline(nullptr);
+            if (!MessageComposer::Util::sendMailDispatcherIsOnline(nullptr)) {
+                qCWarning(SENDLATERAGENT_LOG) << " Impossible to make online send dispatcher";
+            }
             //Remove item which create error ?
             if (!info->isRecurrence()) {
                 removeLaterInfo(info);
             }
             break;
-        default:
+        case TooManyItemFound:
+        case CanNotFetchItem:
+        case CanNotCreateTransport:
             if (KMessageBox::No == KMessageBox::questionYesNo(nullptr, i18n("An error was found. Do you want to resend it?"), i18n("Error found"))) {
                 removeLaterInfo(info);
             }
@@ -206,7 +214,7 @@
 {
     mCurrentJob = nullptr;
     Q_EMIT needUpdateConfigDialogBox();
-    QTimer::singleShot(1000 * 60, this, &SendLaterManager::createSendInfoList);
+    QTimer::singleShot(0, this, &SendLaterManager::createSendInfoList);
 }
 
 void SendLaterManager::sendDone(SendLater::SendLaterInfo *info)
@@ -224,10 +232,11 @@
 void SendLaterManager::removeLaterInfo(SendLater::SendLaterInfo *info)
 {
     mListSendLaterInfo.removeAll(mCurrentInfo);
+    mCurrentInfo = nullptr;
     removeInfo(info->itemId());
 }
 
-QString SendLaterManager::printDebugInfo()
+QString SendLaterManager::printDebugInfo() const
 {
     QString infoStr;
     if (mListSendLaterInfo.isEmpty()) {
@@ -243,7 +252,7 @@
     return infoStr;
 }
 
-QString SendLaterManager::infoToStr(SendLater::SendLaterInfo *info)
+QString SendLaterManager::infoToStr(SendLater::SendLaterInfo *info) const
 {
     QString infoStr = QLatin1String("Recusive ") + (info->isRecurrence() ? QStringLiteral("true") : QStringLiteral("false"));
     infoStr += QLatin1String("Item id :") + QString::number(info->itemId());
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlatermanager.h kmail-19.12.3/agents/sendlateragent/sendlatermanager.h
--- kmail-19.04.3/agents/sendlateragent/sendlatermanager.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlatermanager.h	2020-03-02 07:34:49.000000000 +0000
@@ -55,10 +55,10 @@
 
     void sendDone(SendLater::SendLaterInfo *info);
     void sendError(SendLater::SendLaterInfo *info, ErrorType type);
-    QString printDebugInfo();
+    Q_REQUIRED_RESULT QString printDebugInfo() const;
 
     void stopAll();
-    void itemRemoved(Akonadi::Item::Id id);
+    Q_REQUIRED_RESULT bool itemRemoved(Akonadi::Item::Id id);
 
     MessageComposer::AkonadiSender *sender() const;
 
@@ -74,7 +74,7 @@
     Q_DISABLE_COPY(SendLaterManager)
     void slotCreateJob();
     void createSendInfoList();
-    QString infoToStr(SendLater::SendLaterInfo *info);
+    QString infoToStr(SendLater::SendLaterInfo *info) const;
     void removeLaterInfo(SendLater::SendLaterInfo *info);
     SendLater::SendLaterInfo *searchInfo(Akonadi::Item::Id id);
     void recreateSendList();
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlaterremovemessagejob.cpp kmail-19.12.3/agents/sendlateragent/sendlaterremovemessagejob.cpp
--- kmail-19.04.3/agents/sendlateragent/sendlaterremovemessagejob.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlaterremovemessagejob.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -21,7 +21,7 @@
 #include <ItemDeleteJob>
 #include "sendlateragent_debug.h"
 
-SendLaterRemoveMessageJob::SendLaterRemoveMessageJob(const QList<Akonadi::Item::Id> &listItem, QObject *parent)
+SendLaterRemoveMessageJob::SendLaterRemoveMessageJob(const QVector<Akonadi::Item::Id> &listItem, QObject *parent)
     : QObject(parent)
     , mListItems(listItem)
     , mIndex(0)
diff -Nru kmail-19.04.3/agents/sendlateragent/sendlaterremovemessagejob.h kmail-19.12.3/agents/sendlateragent/sendlaterremovemessagejob.h
--- kmail-19.04.3/agents/sendlateragent/sendlaterremovemessagejob.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/sendlateragent/sendlaterremovemessagejob.h	2020-03-02 07:34:49.000000000 +0000
@@ -29,7 +29,7 @@
 {
     Q_OBJECT
 public:
-    explicit SendLaterRemoveMessageJob(const QList<Akonadi::Item::Id> &listItem, QObject *parent = nullptr);
+    explicit SendLaterRemoveMessageJob(const QVector<Akonadi::Item::Id> &listItem, QObject *parent = nullptr);
     ~SendLaterRemoveMessageJob();
 
     void start();
@@ -38,7 +38,7 @@
     Q_DISABLE_COPY(SendLaterRemoveMessageJob)
     void slotItemDeleteDone(KJob *job);
     void deleteItem();
-    QList<Akonadi::Item::Id> mListItems;
+    QVector<Akonadi::Item::Id> mListItems;
     int mIndex;
 };
 
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/autotests/CMakeLists.txt kmail-19.12.3/agents/unifiedmailboxagent/autotests/CMakeLists.txt
--- kmail-19.04.3/agents/unifiedmailboxagent/autotests/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/autotests/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -7,8 +7,9 @@
 kconfig_add_kcfg_files(unifiedmailbox_agent_autotest_SRCS
     ../settings.kcfgc
 )
-
+if (KDEPIM_RUN_AKONADI_TEST)
 add_akonadi_isolated_test(SOURCE unifiedmailboxmanagertest.cpp
     ADDITIONAL_SOURCES ${common_SRCS} ../unifiedmailboxmanager.cpp ../unifiedmailbox.cpp ${unifiedmailbox_agent_autotest_SRCS}
     LINK_LIBRARIES KF5::I18n KF5::AkonadiMime KF5::ConfigGui
 )
+endif()
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp kmail-19.12.3/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp
--- kmail-19.04.3/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/autotests/unifiedmailboxmanagertest.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -224,7 +224,7 @@
         auto mailbox = createUnifiedMailbox(QStringLiteral("Test1"), QStringLiteral("Test 1"),
                                             { QStringLiteral("res1_inbox") });
         QVERIFY(mailbox);
-        const auto sourceCol = mailbox->sourceCollections().toList().first();
+        const auto sourceCol = mailbox->sourceCollections().values().first();
         manager.insertBox(std::move(mailbox));
 
         // Now manager should have one unified mailbox and monitor all of its
@@ -270,7 +270,7 @@
         // Now the box should be loaded and its source collections monitored
         QCOMPARE(std::distance(manager.begin(), manager.end()), 1l);
         QCOMPARE(recorder.collectionsMonitored().count(), 2);
-        const auto srcCols = mailbox->sourceCollections().toList();
+        const auto srcCols = mailbox->sourceCollections().values();
         QCOMPARE(srcCols.count(), 2);
         QVERIFY(recorder.collectionsMonitored().contains(Akonadi::Collection(srcCols[0])));
         QVERIFY(recorder.collectionsMonitored().contains(Akonadi::Collection(srcCols[1])));
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/CMakeLists.txt kmail-19.12.3/agents/unifiedmailboxagent/CMakeLists.txt
--- kmail-19.04.3/agents/unifiedmailboxagent/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -1,7 +1,5 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_unifiedmailbox_agent\")
 
-set(CMAKE_CXX_STANDARD 14)
-
 if(BUILD_TESTING)
     add_subdirectory(autotests)
 endif()
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailboxagent.desktop kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailboxagent.desktop
--- kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailboxagent.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailboxagent.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -2,18 +2,22 @@
 Name=Unified Mailbox Agent
 Name[ca]=Agent de la bústia unificada
 Name[ca@valencia]=Agent de la bústia unificada
+Name[cs]=Agent sjednocené schránky
 Name[de]=Agent für einheitliches Postfach
 Name[en_GB]=Unified Mailbox Agent
 Name[es]=Agente de bandeja de correo unificada
+Name[eu]=Postontzi bateratuaren agentea
 Name[fi]=Yhdistetty postiagentti
 Name[fr]=Agent de boîte aux lettres unifiée
 Name[gl]=Axente de caixa de correo unificada
+Name[ia]=Agente de cassa de posta unificate
 Name[it]=Agente per la casella di posta unificata
 Name[ko]=통합 받은 편지함 에이전트
 Name[nl]=Geünificeerde e-mailboxagent
 Name[pl]=Usługa połączonej skrzynki pocztowej
 Name[pt]=Agente de Caixas de Correio Unificadas
 Name[pt_BR]=Agente de Caixas de Mensagens Unificadas
+Name[sk]=Agent zlúčenej poštovej schránky
 Name[sv]=Förenad brevlådemodul
 Name[uk]=Агент уніфікованої поштової скриньки
 Name[x-test]=xxUnified Mailbox Agentxx
@@ -22,18 +26,22 @@
 Comment=Unified Mailbox Agent
 Comment[ca]=Agent de la bústia unificada
 Comment[ca@valencia]=Agent de la bústia unificada
+Comment[cs]=Agent sjednocené schránky
 Comment[de]=Agent für einheitliches Postfach
 Comment[en_GB]=Unified Mailbox Agent
 Comment[es]=Agente de bandeja de correo unificada
+Comment[eu]=Postontzi bateratuaren agentea
 Comment[fi]=Yhdistetty postiagentti
 Comment[fr]=Agent de boîte aux lettres unifiée
 Comment[gl]=Axente de caixa de correo unificada
+Comment[ia]=Agente de cassa de posta unificate
 Comment[it]=Agente per la casella di posta unificata
 Comment[ko]=통합 받은 편지함 에이전트
 Comment[nl]=Geünificeerde e-mailboxagent
 Comment[pl]=Usługa połączonej skrzynki pocztowej
 Comment[pt]=Agente de Caixas de Correio Unificadas
 Comment[pt_BR]=Agente de Caixas de Mensagens Unificadas
+Comment[sk]=Agent zlúčenej poštovej schránky
 Comment[sv]=Förenad brevlådemodul
 Comment[uk]=Агент уніфікованої поштової скриньки
 Comment[x-test]=xxUnified Mailbox Agentxx
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailboxagent.h kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailboxagent.h
--- kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailboxagent.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailboxagent.h	2020-03-02 07:34:49.000000000 +0000
@@ -26,7 +26,6 @@
 #include "unifiedmailboxmanager.h"
 
 #include <QHash>
-#include <QVector>
 
 /* Despite its name, this is actually a Resource, but it acts as an Agent: it
  * listens to notifications about Items that belong to other resources and acts
@@ -46,11 +45,11 @@
     void configure(WId windowId) override;
 
     void setEnableAgent(bool enable);
-    bool enabledAgent() const;
+    Q_REQUIRED_RESULT bool enabledAgent() const;
 
     void retrieveCollections() override;
     void retrieveItems(const Akonadi::Collection &collection) override;
-    bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
+    Q_REQUIRED_RESULT bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) override;
 private:
     void delayedInit();
 
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailbox.cpp kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailbox.cpp
--- kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailbox.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailbox.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -138,7 +138,7 @@
                 manager->mSourceToBoxMap.insert({ source, this });
             }
         } else {
-            for (const auto source : qAsConst(mSources)) {
+            for (const auto &source : qAsConst(mSources)) {
                 mManager->mMonitor.setCollectionMonitored(Akonadi::Collection{source}, false);
                 mManager->mSourceToBoxMap.erase(source);
             }
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailboxeditor.cpp kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailboxeditor.cpp
--- kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailboxeditor.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailboxeditor.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -27,7 +27,6 @@
 #include <QPushButton>
 #include <QDialogButtonBox>
 #include <QSortFilterProxyModel>
-#include <QLabel>
 
 #include <KIconDialog>
 #include <KLocalizedString>
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailbox.h kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailbox.h
--- kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailbox.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailbox.h	2020-03-02 07:34:49.000000000 +0000
@@ -46,22 +46,22 @@
 
     bool isSpecial() const;
 
-    qint64 collectionId() const;
+    Q_REQUIRED_RESULT qint64 collectionId() const;
     void setCollectionId(qint64 id);
 
-    QString id() const;
+    Q_REQUIRED_RESULT QString id() const;
     void setId(const QString &id);
 
-    QString name() const;
+    Q_REQUIRED_RESULT QString name() const;
     void setName(const QString &name);
 
-    QString icon() const;
+    Q_REQUIRED_RESULT QString icon() const;
     void setIcon(const QString &icon);
 
     void addSourceCollection(qint64 source);
     void removeSourceCollection(qint64 source);
     void setSourceCollections(const QSet<qint64> &sources);
-    QSet<qint64> sourceCollections() const;
+    Q_REQUIRED_RESULT QSet<qint64> sourceCollections() const;
 
 private:
     void attachManager(UnifiedMailboxManager *manager);
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailboxmanager.cpp kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailboxmanager.cpp
--- kmail-19.04.3/agents/unifiedmailboxagent/unifiedmailboxmanager.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/unifiedmailboxmanager.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -25,7 +25,6 @@
 #include "settings.h"
 
 #include <KSharedConfig>
-#include <KConfigGroup>
 #include <KLocalizedString>
 
 #include <AkonadiCore/SpecialCollectionAttribute>
@@ -36,7 +35,6 @@
 #include <AkonadiCore/ItemFetchScope>
 #include <Akonadi/KMime/SpecialMailCollections>
 
-#include <QList>
 #include <QTimer>
 
 namespace {
diff -Nru kmail-19.04.3/agents/unifiedmailboxagent/utils.h kmail-19.12.3/agents/unifiedmailboxagent/utils.h
--- kmail-19.04.3/agents/unifiedmailboxagent/utils.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/agents/unifiedmailboxagent/utils.h	2020-03-02 07:34:49.000000000 +0000
@@ -53,6 +53,7 @@
     return rv;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 namespace std {
 template<>
 struct hash<QString> {
@@ -62,5 +63,6 @@
     }
 };
 }
+#endif
 
 #endif
diff -Nru kmail-19.04.3/CMakeLists.txt kmail-19.12.3/CMakeLists.txt
--- kmail-19.04.3/CMakeLists.txt	2019-07-09 00:20:33.000000000 +0000
+++ kmail-19.12.3/CMakeLists.txt	2020-03-03 00:34:22.000000000 +0000
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-set(KDEPIM_VERSION_NUMBER "5.11.3")
+set(KDEPIM_VERSION_NUMBER "5.13.3")
 
 project(kmail VERSION ${KDEPIM_VERSION_NUMBER})
 
@@ -9,7 +9,7 @@
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif()
-set(KF5_MIN_VERSION "5.56.0")
+set(KF5_MIN_VERSION "5.63.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -32,52 +32,53 @@
 include(ECMQtDeclareLoggingCategory)
 
 # Do NOT add quote
-set(KDEPIM_DEV_VERSION )
+set(KDEPIM_DEV_VERSION)
+set(KDE_APPLICATIONS_VERSION "19.12.3")
 
 # add an extra space
 if(DEFINED KDEPIM_DEV_VERSION)
     set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
 endif()
 
-set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
+set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION} (${KDE_APPLICATIONS_VERSION})")
 
 
-set(AKONADI_MIMELIB_VERSION "5.11.3")
-set(AKONADI_CONTACT_VERSION "5.11.3")
-set(KCONTACTS_LIB_VERSION "5.11.3")
-set(KCALENDARCORE_LIB_VERSION "5.11.3")
-set(CALENDARUTILS_LIB_VERSION "5.11.3")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.11.3")
-set(KLDAP_LIB_VERSION "5.11.3")
-set(KMAILTRANSPORT_LIB_VERSION "5.11.3")
-set(KONTACTINTERFACE_LIB_VERSION "5.11.3")
-set(KMIME_LIB_VERSION "5.11.3")
-set(KPIMTEXTEDIT_LIB_VERSION "5.11.3")
-set(AKONADI_VERSION "5.11.3")
-set(KTNEF_LIB_VERSION "5.11.3")
+set(AKONADI_MIMELIB_VERSION "5.13.3")
+set(AKONADI_CONTACT_VERSION "5.13.3")
+set(CALENDARUTILS_LIB_VERSION "5.13.3")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.13.3")
+set(KLDAP_LIB_VERSION "5.13.3")
+set(KMAILTRANSPORT_LIB_VERSION "5.13.3")
+set(KONTACTINTERFACE_LIB_VERSION "5.13.3")
+set(KMIME_LIB_VERSION "5.13.3")
+set(KPIMTEXTEDIT_LIB_VERSION "5.13.3")
+set(AKONADI_VERSION "5.13.3")
+set(KTNEF_LIB_VERSION "5.13.3")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
 
-set(QT_REQUIRED_VERSION "5.10.0")
+set(QT_REQUIRED_VERSION "5.11.0")
 option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
 
+option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
+
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
-set(LIBGRAVATAR_VERSION_LIB "5.11.3")
-set(MAILCOMMON_LIB_VERSION_LIB "5.11.3")
-set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.3")
-set(MESSAGELIB_LIB_VERSION_LIB "5.11.3")
-set(LIBKLEO_LIB_VERSION_LIB "5.11.3")
-set(PIMCOMMON_LIB_VERSION_LIB "5.11.3")
-set(LIBKDEPIM_LIB_VERSION_LIB "5.11.3")
-set(LIBKSIEVE_LIB_VERSION_LIB "5.11.3")
+set(LIBGRAVATAR_VERSION_LIB "5.13.3")
+set(MAILCOMMON_LIB_VERSION_LIB "5.13.3")
+set(KDEPIM_APPS_LIB_VERSION_LIB "5.13.3")
+set(MESSAGELIB_LIB_VERSION_LIB "5.13.3")
+set(LIBKLEO_LIB_VERSION_LIB "5.13.3")
+set(PIMCOMMON_LIB_VERSION_LIB "5.13.3")
+set(LIBKDEPIM_LIB_VERSION_LIB "5.13.3")
+set(LIBKSIEVE_LIB_VERSION_LIB "5.13.3")
 
 find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
 
-find_package(KF5AkonadiSearch "5.11.3" CONFIG REQUIRED)
+find_package(KF5AkonadiSearch "5.13.3" CONFIG REQUIRED)
 set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
 
-set(GPGMEPP_LIB_VERSION "1.8.0")
+set(GPGMEPP_LIB_VERSION "1.11.1")
 find_package(Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
 
 # Find KF5 package
@@ -104,13 +105,13 @@
 find_package(KF5WindowSystem ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED)
+find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED)
+find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
 # Find KdepimLibs Package
 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
-find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
-find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
@@ -141,22 +142,23 @@
 
 include_directories(${kmail_SOURCE_DIR} ${kmail_BINARY_DIR})
 configure_file(kmail-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kmail-version.h @ONLY)
-
-# workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it)
-if (${Qt5Widgets_VERSION} STRGREATER "5.13")
-   MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile without deprecated methods. bug QTBUG-74665")
-else()
-   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
+if(BUILD_TESTING)
+   add_definitions(-DBUILD_TESTING)
 endif()
-if (${KF5Config_VERSION} STRGREATER "5.56.0")
-        add_definitions(-DQT_NO_FOREACH)
-        MESSAGE(STATUS "compile without foreach")
+
+if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+   add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
+   #add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) #Need to find a convert method for KPluginInfo::fromServices
 endif()
+add_definitions(-DQT_NO_FOREACH)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 add_subdirectory(src)
 add_subdirectory(agents)
 add_subdirectory(ktnef)
-
-install( FILES kmail.renamecategories kmail.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+add_subdirectory(kmail-refresh-settings)
+install(FILES kmail.renamecategories kmail.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 
 add_subdirectory(doc)
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -Nru kmail-19.04.3/debian/changelog kmail-19.12.3/debian/changelog
--- kmail-19.04.3/debian/changelog	2020-03-06 20:26:37.000000000 +0000
+++ kmail-19.12.3/debian/changelog	2020-04-11 12:58:25.000000000 +0000
@@ -1,3 +1,12 @@
+kmail (4:19.12.3-0ubuntu1) focal; urgency=medium
+
+  * Move qdebug categories files to new location.
+  * Update install files.
+  * Drop upstream_fix_missing_includes.diff now in source.
+  * New upstream release (19.12.3)
+
+ -- Rik Mills <rikmills@kde.org>  Sat, 11 Apr 2020 13:58:25 +0100
+
 kmail (4:19.04.3-0ubuntu3) focal; urgency=medium
 
   * Add kmailtransport-akonadi to Recommends. (LP: #1866397)
diff -Nru kmail-19.04.3/debian/control kmail-19.12.3/debian/control
--- kmail-19.04.3/debian/control	2020-03-06 20:26:37.000000000 +0000
+++ kmail-19.12.3/debian/control	2020-04-11 12:58:25.000000000 +0000
@@ -8,7 +8,7 @@
            Michael Meskes <meskes@debian.org>,
            George Kiagiadakis <kiagiadakis.george@gmail.com>,
            Eshat Cakar <info@eshat.de>,
-           Maximiliano Curia <maxy@debian.org>
+           Maximiliano Curia <maxy@debian.org>,
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.31.0~),
@@ -19,84 +19,84 @@
                libgpgme-dev,
                libgpgmepp-dev,
                libgrantlee5-dev (>= 5.0.0~),
-               libkf5akonadi-dev (>= 4:19.04.3~),
-               libkf5akonadicalendar-dev (>= 4:19.04.3~),
-               libkf5akonadicontact-dev (>= 4:19.04.3~),
-               libkf5akonadimime-dev (>= 4:19.04.3~),
-               libkf5akonadinotes-dev (>= 4:19.04.3~),
-               libkf5akonadisearch-dev (>= 4:19.04.3~),
-               libkf5akonadiserver-dev (>= 4:19.04.3~),
-               libkf5alarmcalendar-dev (>= 4:19.04.3~),
+               libkf5akonadi-dev (>= 4:19.12.3~),
+               libkf5akonadicalendar-dev (>= 4:19.12.3~),
+               libkf5akonadicontact-dev (>= 4:19.12.3~),
+               libkf5akonadimime-dev (>= 4:19.12.3~),
+               libkf5akonadinotes-dev (>= 4:19.12.3~),
+               libkf5akonadisearch-dev (>= 4:19.12.3~),
+               libkf5akonadiserver-dev (>= 4:19.12.3~),
+               libkf5alarmcalendar-dev (>= 4:19.12.3~),
                libkf5archive-dev (>= 5.31.0~),
                libkf5auth-dev (>= 5.31.0~),
-               libkf5blog-dev (>= 4:19.04.3~),
-               libkf5calendarcore-dev (>= 4:19.04.3~),
-               libkf5calendarsupport-dev (>= 4:19.04.3~),
-               libkf5calendarutils-dev (>= 4:19.04.3~),
+               libkf5blog-dev (>= 4:19.12.3~),
+               libkf5calendarcore-dev (>= 4:19.08.3~),
+               libkf5calendarsupport-dev (>= 4:19.12.3~),
+               libkf5calendarutils-dev (>= 4:19.12.3~),
                libkf5codecs-dev (>= 5.31.0~),
                libkf5completion-dev (>= 5.31.0~),
                libkf5config-dev (>= 5.31.0~),
-               libkf5contacteditor-dev (>= 4:19.04.3~),
-               libkf5contacts-dev (>= 4:19.04.3~),
+               libkf5contacteditor-dev (>= 4:19.12.3~),
+               libkf5contacts-dev (>= 4:19.08.3~),
                libkf5coreaddons-dev (>= 5.31.0~),
                libkf5crash-dev (>= 5.31.0~),
                libkf5dbusaddons-dev (>= 5.31.0~),
                libkf5dnssd-dev (>= 5.31.0~),
                libkf5doctools-dev (>= 5.31.0~),
-               libkf5eventviews-dev (>= 4:19.04.3~),
-               libkf5followupreminder-dev (>= 4:19.04.3~),
+               libkf5eventviews-dev (>= 4:19.12.3~),
+               libkf5followupreminder-dev (>= 4:19.12.3~),
                libkf5globalaccel-dev (>= 5.31.0~),
-               libkf5grantleetheme-dev (>= 19.04.3~),
-               libkf5gravatar-dev (>= 4:19.04.3~),
+               libkf5grantleetheme-dev (>= 19.12.3~),
+               libkf5gravatar-dev (>= 4:19.12.3~),
                libkf5holidays-dev (>= 1:5.31.0~),
                libkf5i18n-dev (>= 5.31.0~),
                libkf5iconthemes-dev (>= 5.31.0~),
-               libkf5identitymanagement-dev (>= 19.04.3~),
-               libkf5imap-dev (>= 19.04.3~),
-               libkf5incidenceeditor-dev (>= 19.04.3~),
+               libkf5identitymanagement-dev (>= 19.12.3~),
+               libkf5imap-dev (>= 19.12.3~),
+               libkf5incidenceeditor-dev (>= 19.12.3~),
                libkf5itemviews-dev (>= 5.31.0~),
-               libkf5kaddressbookgrantlee-dev (>= 4:19.04.3~),
+               libkf5kaddressbookgrantlee-dev (>= 4:19.12.3~),
                libkf5kcmutils-dev (>= 5.31.0~),
                libkf5kdelibs4support-dev (>= 5.31.0~),
-               libkf5kdepimdbusinterfaces-dev (>= 4:19.04.3~),
+               libkf5kdepimdbusinterfaces-dev (>= 4:19.12.3~),
                libkf5khtml-dev (>= 5.31.0~),
-               libkf5kontactinterface-dev (>= 19.04.3~),
-               libkf5ksieve-dev (>= 4:19.04.3~),
-               libkf5ldap-dev (>= 19.04.3~),
-               libkf5libkdepim-dev (>= 4:19.04.3~),
-               libkf5libkleo-dev (>= 4:19.04.3~),
-               libkf5mailcommon-dev (>= 4:19.04.3~),
-               libkf5mailimporter-dev (>= 4:19.04.3~),
-               libkf5mailtransport-dev (>= 19.04.3~),
-               libkf5mbox-dev (>= 19.04.3~),
-               libkf5messagecomposer-dev (>= 4:19.04.3~),
-               libkf5messagecore-dev (>= 4:19.04.3~),
-               libkf5messagelist-dev (>= 4:19.04.3~),
-               libkf5messageviewer-dev (>= 4:19.04.3~),
-               libkf5mime-dev (>= 19.04.3~),
-               libkf5mimetreeparser-dev (>= 4:19.04.3~),
+               libkf5kontactinterface-dev (>= 19.12.3~),
+               libkf5ksieve-dev (>= 4:19.12.3~),
+               libkf5ldap-dev (>= 19.12.3~),
+               libkf5libkdepim-dev (>= 4:19.12.3~),
+               libkf5libkleo-dev (>= 4:19.12.3~),
+               libkf5mailcommon-dev (>= 4:19.12.3~),
+               libkf5mailimporter-dev (>= 4:19.12.3~),
+               libkf5mailtransport-dev (>= 19.12.3~),
+               libkf5mbox-dev (>= 19.12.3~),
+               libkf5messagecomposer-dev (>= 4:19.12.3~),
+               libkf5messagecore-dev (>= 4:19.12.3~),
+               libkf5messagelist-dev (>= 4:19.12.3~),
+               libkf5messageviewer-dev (>= 4:19.12.3~),
+               libkf5mime-dev (>= 19.12.3~),
+               libkf5mimetreeparser-dev (>= 4:19.12.3~),
                libkf5newstuff-dev (>= 5.31.0~),
                libkf5notifyconfig-dev (>= 5.31.0~),
-               libkf5pimcommon-dev (>= 4:19.04.3~),
-               libkf5pimtextedit-dev (>= 19.04.3~),
+               libkf5pimcommon-dev (>= 4:19.12.3~),
+               libkf5pimtextedit-dev (>= 19.12.3~),
                libkf5prison-dev (>= 5.31.0~),
-               libkf5sendlater-dev (>= 4:19.04.3~),
+               libkf5sendlater-dev (>= 4:19.12.3~),
                libkf5service-dev (>= 5.31.0~),
                libkf5sonnet-dev (>= 5.31.0~),
                libkf5syndication-dev (>= 18.08.3~),
                libkf5syntaxhighlighting-dev,
-               libkf5templateparser-dev (>= 4:19.04.3~),
+               libkf5templateparser-dev (>= 4:19.12.3~),
                libkf5texteditor-dev (>= 5.31.0~),
                libkf5textwidgets-dev (>= 5.31.0~),
-               libkf5tnef-dev (>= 4:19.04.3~),
+               libkf5tnef-dev (>= 4:19.12.3~),
                libkf5wallet-dev (>= 5.31.0~),
-               libkf5webengineviewer-dev (>= 4:19.04.3~),
+               libkf5webengineviewer-dev (>= 4:19.12.3~),
                libkf5webkit-dev (>= 5.31.0~),
                libkf5widgetsaddons-dev (>= 5.31.0~),
                libkf5windowsystem-dev (>= 5.31.0~),
                libkf5xmlgui-dev (>= 5.31.0~),
                libkf5xmlrpcclient-dev (>= 5.31.0~),
-               libkpimgapi-dev (>= 19.04.3~),
+               libkpimgapi-dev (>= 19.12.3~),
                libphonon4qt5-dev,
                libphonon4qt5experimental-dev,
                libqt5opengl5-dev (>= 5.6.1~),
@@ -129,7 +129,7 @@
          libkf5grantleetheme-plugins,
          ${misc:Depends},
          ${perl:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Recommends: accountwizard,
             gnupg-agent,
             gnupg2,
@@ -140,12 +140,12 @@
             mbox-importer,
             pim-data-exporter,
             pim-sieve-editor,
-            pinentry-qt | pinentry-x11
+            pinentry-qt | pinentry-x11,
 Suggests: clamav,
           kaddressbook,
           kleopatra,
           procmail,
-          spamassassin | bogofilter | spambayes (>= 1.0.4-6) | bsfilter | crm114
+          spamassassin | bogofilter | spambayes (>= 1.0.4-6) | bsfilter | crm114,
 Provides: imap-client, mail-reader
 Homepage: http://kontact.kde.org/kmail/
 Description: full featured graphical email client
diff -Nru kmail-19.04.3/debian/kmail.install kmail-19.12.3/debian/kmail.install
--- kmail-19.04.3/debian/kmail.install	2020-03-06 20:26:37.000000000 +0000
+++ kmail-19.12.3/debian/kmail.install	2020-04-11 12:58:25.000000000 +0000
@@ -1,11 +1,10 @@
-etc/xdg/kmail.categories
-etc/xdg/kmail.renamecategories
 usr/bin/akonadi_archivemail_agent
 usr/bin/akonadi_followupreminder_agent
 usr/bin/akonadi_mailfilter_agent
 usr/bin/akonadi_sendlater_agent
 usr/bin/akonadi_unifiedmailbox_agent
 usr/bin/kmail
+usr/bin/kmail-refresh-settings
 usr/lib/*/libkmailprivate.so.5*
 usr/lib/*/qt5/plugins/akonadi/config/archivemailagentconfig.so
 usr/lib/*/qt5/plugins/akonadi/config/followupreminderagentconfig.so
@@ -17,9 +16,11 @@
 usr/lib/*/qt5/plugins/kontact_summaryplugin.so
 usr/share/akonadi/agents/
 usr/share/applications/kmail_view.desktop
+usr/share/applications/org.kde.kmail-refresh-settings.desktop
 usr/share/applications/org.kde.kmail2.desktop
 usr/share/config.kcfg/
 usr/share/dbus-1/interfaces/org.kde.kmail.kmail*.xml
+usr/share/dbus-1/services/org.kde.kmail.service
 usr/share/doc/HTML/*/akonadi_archivemail_agent/
 usr/share/doc/HTML/*/akonadi_followupreminder_agent/
 usr/share/doc/HTML/*/akonadi_sendlater_agent/
@@ -40,7 +41,8 @@
 usr/share/kservices5/kcmkontactsummary.desktop
 usr/share/kservices5/kmail_*.desktop
 usr/share/kservices5/kontact/
-usr/share/kservicetypes5/dbusmail.desktop
 usr/share/kxmlgui5/kontactsummary/kontactsummary_part.rc
 usr/share/locale/
 usr/share/metainfo/org.kde.kmail2.appdata.xml
+usr/share/qlogging-categories5/kmail.categories
+usr/share/qlogging-categories5/kmail.renamecategories
diff -Nru kmail-19.04.3/debian/kmail.maintscript kmail-19.12.3/debian/kmail.maintscript
--- kmail-19.04.3/debian/kmail.maintscript	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/debian/kmail.maintscript	2020-04-11 12:58:25.000000000 +0000
@@ -0,0 +1,2 @@
+rm_conffile /etc/xdg/kmail.categories
+rm_conffile /etc/xdg/kmail.renamecategories
diff -Nru kmail-19.04.3/debian/ktnef.install kmail-19.12.3/debian/ktnef.install
--- kmail-19.04.3/debian/ktnef.install	2020-03-06 20:26:37.000000000 +0000
+++ kmail-19.12.3/debian/ktnef.install	2020-04-11 12:58:25.000000000 +0000
@@ -1,5 +1,3 @@
-etc/xdg/ktnefapps.categories
-etc/xdg/ktnefapps.renamecategories
 usr/bin/ktnef
 usr/share/applications/org.kde.ktnef.desktop
 usr/share/doc/HTML/*/ktnef/*
@@ -7,3 +5,5 @@
 usr/share/icons/*/*/actions/ktnef_extract_all_to.png
 usr/share/icons/*/*/actions/ktnef_extract_to.png
 usr/share/icons/*/*/apps/ktnef.png
+usr/share/qlogging-categories5/ktnefapps.categories
+usr/share/qlogging-categories5/ktnefapps.renamecategories
diff -Nru kmail-19.04.3/debian/ktnef.maintscript kmail-19.12.3/debian/ktnef.maintscript
--- kmail-19.04.3/debian/ktnef.maintscript	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/debian/ktnef.maintscript	2020-04-11 12:58:25.000000000 +0000
@@ -0,0 +1,2 @@
+rm_conffile /etc/xdg/ktnefapps.categories
+rm_conffile /etc/xdg/ktnefapps.renamecategories
diff -Nru kmail-19.04.3/debian/patches/series kmail-19.12.3/debian/patches/series
--- kmail-19.04.3/debian/patches/series	2020-03-06 20:26:37.000000000 +0000
+++ kmail-19.12.3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-upstream_fix_missing_includes.diff
diff -Nru kmail-19.04.3/debian/patches/upstream_fix_missing_includes.diff kmail-19.12.3/debian/patches/upstream_fix_missing_includes.diff
--- kmail-19.04.3/debian/patches/upstream_fix_missing_includes.diff	2020-03-06 20:26:37.000000000 +0000
+++ kmail-19.12.3/debian/patches/upstream_fix_missing_includes.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-From 28a8cf907b3cd903aef0b963314df219afc6b66a Mon Sep 17 00:00:00 2001
-From: Allen Winter <winter@kde.org>
-Date: Thu, 18 Jul 2019 15:35:24 -0400
-Subject: summaryview_part.h - fix build by including QMap
-
----
- src/kontactplugin/summary/summaryview_part.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'src/kontactplugin/summary/summaryview_part.h')
-
-diff --git a/src/kontactplugin/summary/summaryview_part.h b/src/kontactplugin/summary/summaryview_part.h
-index 542335d..b116e23 100644
---- a/src/kontactplugin/summary/summaryview_part.h
-+++ b/src/kontactplugin/summary/summaryview_part.h
-@@ -25,7 +25,7 @@
- #define SUMMARYVIEW_PART_H
- 
- #include <KParts/ReadOnlyPart>
--#include <kparts/readonlypart.h>
-+#include <QMap>
- 
- class DropWidget;
- 
--- 
-cgit v1.1
-
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/doc/akonadi_archivemail_agent/add-archive-mail.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/doc/akonadi_archivemail_agent/add-archive-mail.png differ
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/doc/akonadi_archivemail_agent/configure-archive-mail-agent.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/doc/akonadi_archivemail_agent/configure-archive-mail-agent.png differ
diff -Nru kmail-19.04.3/doc/akonadi_archivemail_agent/index.docbook kmail-19.12.3/doc/akonadi_archivemail_agent/index.docbook
--- kmail-19.04.3/doc/akonadi_archivemail_agent/index.docbook	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/doc/akonadi_archivemail_agent/index.docbook	2020-03-02 07:34:49.000000000 +0000
@@ -30,8 +30,8 @@
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2013-08-30</date>
-<releaseinfo>&kde; 4.11</releaseinfo>
+<date>2019-09-21</date>
+<releaseinfo>Applications 19.12</releaseinfo>
 </articleinfo>
 
 <sect1 id="introduction">
@@ -45,7 +45,7 @@
 <title>Using &i18n-archivemailagent;</title>
 
 <!-- keep in sync with kmail/menus.docbook reader-tools-configure-automatic-archiving"-->
-<para>Use <menuchoice><guimenu>Tools</guimenu><guimenuitem>Configure Automatic Archiving...</guimenuitem>
+<para>Use <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Automatic Archiving...</guimenuitem>
 </menuchoice><action> in &kmail;'s reader window to open a dialog to set up automatic archiving of mail folders.</action>
 </para>
 
@@ -73,7 +73,7 @@
 <listitem><para>Select the format you would like to save it in. &eg; <literal role="extension">.tar.bz2</literal>
  in the drop down list. The archive filename will consist of the prefix <userinput>Archive_</userinput>,
 the path of the selected folder in &kmail;'s folder list, the date in format <userinput>year-month-day</userinput> 
-and the selected file extension &eg; <filename>Archive_Local Folder_inbox_2013-09-03.tar.bz2</filename>.
+and the selected file extension &eg; <filename>Archive_Local Folder_inbox_2019-09-03.tar.bz2</filename>.
 </para></listitem>
 <listitem><para>By default <guilabel>Archive all subfolders</guilabel> is enabled. 
 Uncheck this if you only want the parent folder archived.</para></listitem>
@@ -107,6 +107,10 @@
 <para>You can use the checkbox at the left of each entry in the list to enable or disable 
 archiving of this job.
 </para>
+<para>It is possible to access this configurational dialog any time later using <menuchoice><guimenu>Settings</guimenu>
+<guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> then select the <guilabel>Plugins</guilabel> page in &kmail; main window and pressing
+the configuration button against the <guilabel>Archive Mail Agent</guilabel> item.
+</para>
 <para>Using the context menu launched with a &RMB; click on an archive job you can open the 
 folder containing the archives or start the archive job immediately. This will overwrite an existing 
 archive created earlier at the same day without notification.
@@ -120,10 +124,10 @@
 
 <para>&i18n-archivemailagent;</para>
 <para>
-Program copyright 2013 Laurent Montel montel@kde.org 
+Program copyright 2013-2019 Laurent Montel montel@kde.org 
 </para>
 <para>
-Documentation Copyright &copy; 2013 Laurent Montel montel@kde.org
+Documentation Copyright &copy; 2013-2019 Laurent Montel montel@kde.org
 </para>
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/doc/akonadi_followupreminder_agent/add-followup-reminder.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/doc/akonadi_followupreminder_agent/add-followup-reminder.png differ
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/doc/akonadi_followupreminder_agent/followupreminder-configure.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/doc/akonadi_followupreminder_agent/followupreminder-configure.png differ
diff -Nru kmail-19.04.3/doc/akonadi_followupreminder_agent/index.docbook kmail-19.12.3/doc/akonadi_followupreminder_agent/index.docbook
--- kmail-19.04.3/doc/akonadi_followupreminder_agent/index.docbook	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/doc/akonadi_followupreminder_agent/index.docbook	2020-03-02 07:34:49.000000000 +0000
@@ -25,8 +25,8 @@
 <holder>&Laurent.Montel;</holder>
 </copyright>
 
-<date>2014-06-10</date>
-<releaseinfo>&kde; 4.14</releaseinfo>
+<date>2019-09-21</date>
+<releaseinfo>Applications 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -37,16 +37,61 @@
 &i18n-followupreminderagent; is an akonadi agent which follow up reminder mail
 </para>
 
+<sect2 id="using-kapp">
+<title>Using &i18n-followupreminderagent;</title>
+
+<para>Use <menuchoice><guimenu>Options</guimenu><guimenuitem>Create Follow Up Reminder</guimenuitem></menuchoice>
+in &kmail;'s composer window to open a dialog which allows you to create a reminder to follow up your current email 
+at a specific date.</para>
+
+<screenshot>
+<screeninfo>&i18n-followupreminderagent; Dialog</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="add-followup-reminder.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase>&i18n-followupreminderagent; Dialog</phrase>
+    </textobject>
+    <caption>
+      <para>&i18n-followupreminderagent; Dialog</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+<para>Press the arrow-down button against the <guilabel>Date</guilabel> field to select the date from the &kde; calendar widget. It is also possible to choose your calender for the reminder using the <guilabel>Store ToDo in</guilabel> drop-down list.</para>
+<para>To remove reminders you have scheduled, use <menuchoice><guimenu>Settings</guimenu>
+<guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> then select the <guilabel>Plugins</guilabel> page in &kmail; and press
+the configuration button against the <guilabel>Followup Reminder Agent</guilabel> item. Then use the context menu launched with a &RMB; click on a reminder item to select the <guimenuitem>Delete</guimenuitem> action.
+</para>
+
+<screenshot>
+<screeninfo>Configure &i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="followupreminder-configure.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase>Configure &i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para>Configure &i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+</sect2>
+
 <sect2 id="credits">
 
 <title>Credits and License</title>
 
 <para>&i18n-followupreminderagent;</para>
 <para>
-Program copyright 2014 &Laurent.Montel; &Laurent.Montel.mail;
+Program copyright 2014-2019 &Laurent.Montel; &Laurent.Montel.mail;
 </para>
 <para>
-Documentation Copyright &copy; 2014 &Laurent.Montel; &Laurent.Montel.mail;
+Documentation Copyright &copy; 2014-2019 &Laurent.Montel; &Laurent.Montel.mail;
 </para>
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
diff -Nru kmail-19.04.3/doc/akonadi_sendlater_agent/index.docbook kmail-19.12.3/doc/akonadi_sendlater_agent/index.docbook
--- kmail-19.04.3/doc/akonadi_sendlater_agent/index.docbook	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/doc/akonadi_sendlater_agent/index.docbook	2020-03-02 07:34:49.000000000 +0000
@@ -32,8 +32,8 @@
 <holder>&Laurent.Montel;</holder>
 </copyright>
 
-<date>2013-11-30</date>
-<releaseinfo>&kde; 4.12</releaseinfo>
+<date>2019-09-21</date>
+<releaseinfo>Applications 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -82,7 +82,8 @@
 messages overdue since the last logout if necessary.
 </para>
 <para>To change the options for emails you have scheduled to send later, use <menuchoice><guimenu>Settings</guimenu>
-<guimenuitem>Configure Send Later Agent...</guimenuitem></menuchoice> in &kmail;.
+<guimenuitem>Configure &kmail;...</guimenuitem></menuchoice> then select the <guilabel>Plugins</guilabel> page in &kmail; and press
+the configuration button against the <guilabel>Send Later Agent</guilabel> item.
 </para>
 
 <screenshot>
@@ -113,10 +114,10 @@
 
 <para>&i18n-sendlateragent;</para>
 <para>
-Program copyright 2013 &Laurent.Montel; &Laurent.Montel.mail;
+Program copyright 2013-2019 &Laurent.Montel; &Laurent.Montel.mail;
 </para>
 <para>
-Documentation Copyright &copy; 2013 &Laurent.Montel; &Laurent.Montel.mail;
+Documentation Copyright &copy; 2013-2019 &Laurent.Montel; &Laurent.Montel.mail;
 </para>
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/doc/akonadi_sendlater_agent/sendlateragent-configure.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/doc/akonadi_sendlater_agent/sendlateragent-configure.png differ
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/doc/akonadi_sendlater_agent/sendlateragent-dialog.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/doc/akonadi_sendlater_agent/sendlateragent-dialog.png differ
diff -Nru kmail-19.04.3/kmail.categories kmail-19.12.3/kmail.categories
--- kmail-19.04.3/kmail.categories	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/kmail.categories	2020-03-02 07:34:49.000000000 +0000
@@ -5,3 +5,4 @@
 org.kde.pim.kmail_plugin kmail (kmail kontact plugins) IDENTIFIER [KMAILPLUGIN_LOG]
 org.kde.pim.mailfilteragent kmail (mailfilter agent) IDENTIFIER [MAILFILTERAGENT_LOG]
 org.kde.pim.unifiedmailboxagent kmail (unifiedmailboxagent) IDENTIFIER [UNIFIEDMAILBOXAGENT_LOG]
+org.kde.pim.kmail_refresh_settings kmail-refresh-settings IDENTIFIER [KMAIL_REFRESH_SETTINGS_LOG]
diff -Nru kmail-19.04.3/kmail-refresh-settings/CMakeLists.txt kmail-19.12.3/kmail-refresh-settings/CMakeLists.txt
--- kmail-19.04.3/kmail-refresh-settings/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,17 @@
+set(kmail-refresh-settings_SRCS
+    main.cpp
+    refreshsettingsassistant.cpp
+    refreshsettringsfinishpage.cpp
+    refreshsettingscleanuppage.cpp
+    refreshsettingsfirstpage.cpp
+    )
+
+ecm_qt_declare_logging_category(kmail-refresh-settings_SRCS HEADER kmail-refresh-settings_debug.h IDENTIFIER KMAIL_REFRESH_SETTINGS_LOG CATEGORY_NAME org.kde.pim.kmail_refresh_settings)
+
+add_executable(kmail-refresh-settings ${kmail-refresh-settings_SRCS})
+target_link_libraries(kmail-refresh-settings KF5::I18n KF5::AkonadiWidgets KF5::DBusAddons KF5::Crash KF5::XmlGui)
+
+
+install(TARGETS kmail-refresh-settings  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(PROGRAMS org.kde.kmail-refresh-settings.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+
diff -Nru kmail-19.04.3/kmail-refresh-settings/main.cpp kmail-19.12.3/kmail-refresh-settings/main.cpp
--- kmail-19.04.3/kmail-refresh-settings/main.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/main.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,67 @@
+/*
+   Copyright (C) 2019 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 "refreshsettingsassistant.h"
+
+#include <controlgui.h>
+
+#include <kaboutdata.h>
+#include <QApplication>
+
+#include <KDBusService>
+#include <KLocalizedString>
+
+#include <KCrash/KCrash>
+#include <QCommandLineParser>
+#include <QCommandLineOption>
+#include <QIcon>
+
+int main(int argc, char **argv)
+{
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+    QApplication app(argc, argv);
+    KLocalizedString::setApplicationDomain("kmail-refresh-settings");
+    KCrash::initialize();
+    KAboutData aboutData(QStringLiteral("kmail-refresh-settings"),
+                         i18n("KMail Assistant for refreshing settings"),
+                         QStringLiteral("0.1"),
+                         i18n("KMail Assistant for refreshing settings"),
+                         KAboutLicense::LGPL,
+                         i18n("(c) 2019 Laurent Montel <montel@kde.org>"));
+    aboutData.addAuthor(i18n("Laurent Montel"), i18n("Author"), QStringLiteral("montel@kde.org"));
+
+    app.setOrganizationDomain(QStringLiteral("kde.org"));
+    app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kontact")));
+    QCommandLineParser parser;
+    KAboutData::setApplicationData(aboutData);
+
+    aboutData.setupCommandLine(&parser);
+    parser.process(app);
+    aboutData.processCommandLine(&parser);
+
+    KDBusService service(KDBusService::Unique);
+
+    Akonadi::ControlGui::start(nullptr);
+
+    RefreshSettingsAssistant dlg(nullptr);
+    dlg.show();
+    return app.exec();
+}
diff -Nru kmail-19.04.3/kmail-refresh-settings/Messages.sh kmail-19.12.3/kmail-refresh-settings/Messages.sh
--- kmail-19.04.3/kmail-refresh-settings/Messages.sh	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/Messages.sh	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,2 @@
+#! /bin/sh
+$XGETTEXT `find . -name "*.cpp" -o -name "*.h"` -o $podir/kmail-refresh-settings.pot
diff -Nru kmail-19.04.3/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop kmail-19.12.3/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop
--- kmail-19.04.3/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,81 @@
+[Desktop Entry]
+Name=KMail Refresh Settings
+Name[ca]=Actualització dels ajustaments del KMail
+Name[ca@valencia]=Actualització dels ajustaments del KMail
+Name[cs]=Obnovení nastavení KMailu
+Name[de]=Erneuerung der Einstellungen für KMail
+Name[en_GB]=KMail Refresh Settings
+Name[es]=Preferencias de refresco de KMail
+Name[eu]=KMail freskatu ezarpenak
+Name[fi]=KMailin asetusten virkistys
+Name[fr]=Rafraîchissement des paramètres de KMail
+Name[gl]=Configuración de actualización de KMail
+Name[ia]=KMail Refresh Settings (Refresca preferentias de KMail)
+Name[it]=Rinnovo delle impostazioni di KMail
+Name[ko]=KMail 설정 초기화
+Name[nl]=Vernieuwen van instellingen van KMail
+Name[pl]=Odświeżanie ustawień KMaila
+Name[pt]=Actualização da Configuração do KMail
+Name[pt_BR]=Atualizar configurações do KMail
+Name[sk]=KMail Obnoviť Nastavenia
+Name[sv]=Kmail uppdatera inställningar
+Name[uk]=Оновлення параметрів KMail
+Name[x-test]=xxKMail Refresh Settingsxx
+Name[zh_CN]=KMail 刷新设置
+Type=Application
+Exec=kmail-refresh-settings -qwindowtitle %c %u
+Icon=kmail
+X-DocPath=kmail2/index.html
+GenericName=KMail refresh settings
+GenericName[ca]=Actualització dels ajustaments del KMail
+GenericName[ca@valencia]=Actualització dels ajustaments del KMail
+GenericName[cs]=Obnovení nastavení KMailu
+GenericName[de]=Erneuerung der Einstellungen für KMail
+GenericName[en_GB]=KMail refresh settings
+GenericName[es]=Preferencias de refresco de KMail
+GenericName[eu]=KMail freskatu ezarpenak
+GenericName[fi]=KMailin asetusten virkistys
+GenericName[fr]=Rafraîchissement des paramètres de KMail
+GenericName[gl]=Configuración de actualización de KMail
+GenericName[ia]=KMail Refresh Settings (Refresca preferentias de KMail)
+GenericName[it]=Rinnovo delle impostazioni di KMail
+GenericName[ko]=KMail 설정 초기화
+GenericName[nl]=Instellingen van vernieuwen KMail
+GenericName[pl]=Odświeżanie ustawień KMaila
+GenericName[pt]=Actualização da Configuração do KMail
+GenericName[pt_BR]=Atualizar configurações do KMail
+GenericName[sk]=KMail obnoviť nastavenia
+GenericName[sv]=Kmail uppdatera inställningar
+GenericName[uk]=Оновити параметри KMail
+GenericName[x-test]=xxKMail refresh settingsxx
+GenericName[zh_CN]=KMail 刷新设置
+Comment=Refresh KMail settings
+Comment[ca]=Actualitza els ajustaments del KMail
+Comment[ca@valencia]=Actualitza els ajustaments del KMail
+Comment[cs]=Obnovit nastavení KMailu
+Comment[de]=Erneuerung der Einstellungen für KMail
+Comment[en_GB]=Refresh KMail settings
+Comment[es]=Refrescar preferencias de KMail
+Comment[eu]=Freskatu KMail ezarpenak
+Comment[fi]=Virkistä KMail-asetukset
+Comment[fr]=Rafraîchir les paramètres de KMail
+Comment[gl]=Configuración de actualización de KMail
+Comment[ia]=Refresca Preferentias del KMail
+Comment[it]=Rinnova le impostazioni di KMail
+Comment[ko]=KMail 설정 초기화
+Comment[nl]=KMail-instellingen vernieuwen
+Comment[pl]=Ustawienia odświeżania KMaila
+Comment[pt]=Actualizar a configuração do KMail
+Comment[pt_BR]=Atualizar configurações do KMail
+Comment[sk]=Obnoviť KMail nastavenia
+Comment[sv]=Uppdatera Kmail-inställningar
+Comment[uk]=Оновлення параметрів KMail
+Comment[x-test]=xxRefresh KMail settingsxx
+Comment[zh_CN]=刷新 KMail 设置
+Terminal=false
+StartupNotify=true
+X-DBUS-StartupType=Unique
+X-DBUS-ServiceName=org.kde.kmail-refresh-settings
+Categories=Qt;KDE;Office;Network;Email;
+InitialPreference=10
+Hidden=true
diff -Nru kmail-19.04.3/kmail-refresh-settings/refreshsettingsassistant.cpp kmail-19.12.3/kmail-refresh-settings/refreshsettingsassistant.cpp
--- kmail-19.04.3/kmail-refresh-settings/refreshsettingsassistant.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/refreshsettingsassistant.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,72 @@
+/*
+   Copyright (C) 2019 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 "refreshsettingsassistant.h"
+#include "refreshsettingscleanuppage.h"
+#include "refreshsettingsfirstpage.h"
+#include "refreshsettringsfinishpage.h"
+#include <AkonadiWidgets/controlgui.h>
+#include <KHelpMenu>
+#include <KLocalizedString>
+#include <KAboutData>
+#include <QMenu>
+#include <QPushButton>
+
+RefreshSettingsAssistant::RefreshSettingsAssistant(QWidget *parent)
+    : KAssistantDialog(parent)
+{
+    setModal(true);
+    setWindowTitle(i18n("KMail Refresh Settings"));
+    setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Help);
+    resize(640, 480);
+    Akonadi::ControlGui::widgetNeedsAkonadi(this);
+    initializePages();
+    KHelpMenu *helpMenu = new KHelpMenu(this, KAboutData::applicationData(), true);
+    //Initialize menu
+    QMenu *menu = helpMenu->menu();
+    helpMenu->action(KHelpMenu::menuAboutApp)->setIcon(QIcon::fromTheme(QStringLiteral("kmail")));
+    button(QDialogButtonBox::Help)->setMenu(menu);
+}
+
+RefreshSettingsAssistant::~RefreshSettingsAssistant()
+{
+}
+
+void RefreshSettingsAssistant::initializePages()
+{
+    mFirstPage = new RefreshSettingsFirstPage(this);
+    mFirstPageItem = new KPageWidgetItem(mFirstPage, i18n("Warning"));
+    addPage(mFirstPageItem);
+
+    mCleanUpPage = new RefreshSettingsCleanupPage(this);
+    mCleanUpPageItem = new KPageWidgetItem(mCleanUpPage, i18n("Clean up Settings"));
+    addPage(mCleanUpPageItem);
+
+    mFinishPage = new RefreshSettringsFinishPage(this);
+    mFinishPageItem = new KPageWidgetItem(mFinishPage, i18n("Finish"));
+    addPage(mFinishPageItem);
+
+    connect(mCleanUpPage, &RefreshSettingsCleanupPage::cleanDoneInfo, mFinishPage, &RefreshSettringsFinishPage::cleanDoneInfo);
+    connect(mCleanUpPage, &RefreshSettingsCleanupPage::cleanUpDone, this, &RefreshSettingsAssistant::cleanUpDone);
+}
+
+void RefreshSettingsAssistant::cleanUpDone()
+{
+    next();
+}
diff -Nru kmail-19.04.3/kmail-refresh-settings/refreshsettingsassistant.h kmail-19.12.3/kmail-refresh-settings/refreshsettingsassistant.h
--- kmail-19.04.3/kmail-refresh-settings/refreshsettingsassistant.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/refreshsettingsassistant.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+   Copyright (C) 2019 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 REFRESHSETTINGSASSISTANT_H
+#define REFRESHSETTINGSASSISTANT_H
+
+#include <KAssistantDialog>
+class RefreshSettingsCleanupPage;
+class RefreshSettingsFirstPage;
+class RefreshSettringsFinishPage;
+class RefreshSettingsAssistant : public KAssistantDialog
+{
+    Q_OBJECT
+public:
+    explicit RefreshSettingsAssistant(QWidget *parent = nullptr);
+    ~RefreshSettingsAssistant();
+
+private:
+    void initializePages();
+    void cleanUpDone();
+    KPageWidgetItem *mCleanUpPageItem = nullptr;
+    RefreshSettingsCleanupPage *mCleanUpPage = nullptr;
+
+    KPageWidgetItem *mFirstPageItem = nullptr;
+    RefreshSettingsFirstPage *mFirstPage = nullptr;
+
+    KPageWidgetItem *mFinishPageItem = nullptr;
+    RefreshSettringsFinishPage *mFinishPage = nullptr;
+};
+
+#endif // REFRESHSETTINGSASSISTANT_H
diff -Nru kmail-19.04.3/kmail-refresh-settings/refreshsettingscleanuppage.cpp kmail-19.12.3/kmail-refresh-settings/refreshsettingscleanuppage.cpp
--- kmail-19.04.3/kmail-refresh-settings/refreshsettingscleanuppage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/refreshsettingscleanuppage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,156 @@
+/*
+   Copyright (C) 2019 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 "refreshsettingscleanuppage.h"
+#include <QHBoxLayout>
+#include <KLocalizedString>
+#include <KSharedConfig>
+#include <KConfigGroup>
+#include <QPushButton>
+#include <QRegularExpression>
+
+RefreshSettingsCleanupPage::RefreshSettingsCleanupPage(QWidget *parent)
+    : QWidget(parent)
+{
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->setObjectName(QStringLiteral("mainLayout"));
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+    QPushButton *button = new QPushButton(i18n("Clean"), this);
+    button->setObjectName(QStringLiteral("button"));
+    mainLayout->addWidget(button);
+    connect(button, &QPushButton::clicked, this, &RefreshSettingsCleanupPage::cleanSettings);
+}
+
+RefreshSettingsCleanupPage::~RefreshSettingsCleanupPage()
+{
+}
+
+void RefreshSettingsCleanupPage::cleanSettings()
+{
+    const QStringList configNameFiles {QStringLiteral("kmail2rc"), QStringLiteral("kontactrc")};
+    for (const QString &configName: configNameFiles) {
+        initCleanupFolderSettings(configName);
+        initCleanupFiltersSettings(configName);
+        initCleanDialogSettings(configName);
+        initCleanupDialogSettings(configName);
+        removeTipOfDay(configName);
+    }
+    Q_EMIT cleanUpDone();
+}
+
+void RefreshSettingsCleanupPage::removeTipOfDay(const QString &configName)
+{
+    KSharedConfigPtr settingsrc = KSharedConfig::openConfig(configName);
+
+    const QString tipOfDayStr = QStringLiteral("TipOfDay");
+    if (settingsrc->hasGroup(tipOfDayStr)) {
+        settingsrc->deleteGroup(tipOfDayStr);
+    }
+    settingsrc->sync();
+    Q_EMIT cleanDoneInfo(i18n("Remove obsolete \"TipOfDay\" settings: Done"));
+}
+
+void RefreshSettingsCleanupPage::initCleanDialogSettings(const QString &configName)
+{
+    KSharedConfigPtr settingsrc = KSharedConfig::openConfig(configName);
+
+    const QStringList dialogList = settingsrc->groupList().filter(QRegularExpression(QStringLiteral(".*Dialog$")));
+    for (const QString &str : dialogList) {
+        settingsrc->deleteGroup(str);
+    }
+    settingsrc->sync();
+    Q_EMIT cleanDoneInfo(i18n("Delete Dialog settings in file `%1`: Done", configName));
+}
+
+void RefreshSettingsCleanupPage::initCleanupFiltersSettings(const QString &configName)
+{
+    KSharedConfigPtr settingsrc = KSharedConfig::openConfig(configName);
+
+    const QStringList filterList = settingsrc->groupList().filter(QRegularExpression(QStringLiteral("Filter #\\d+")));
+    for (const QString &str : filterList) {
+        settingsrc->deleteGroup(str);
+    }
+    settingsrc->sync();
+    Q_EMIT cleanDoneInfo(i18n("Delete Filters settings in file `%1`: Done", configName));
+}
+
+void RefreshSettingsCleanupPage::initCleanupFolderSettings(const QString &configName)
+{
+    KSharedConfigPtr settingsrc = KSharedConfig::openConfig(configName);
+
+    const QStringList folderList = settingsrc->groupList().filter(QRegularExpression(QStringLiteral("Folder-\\d+")));
+    for (const QString &str : folderList) {
+        KConfigGroup oldGroup = settingsrc->group(str);
+        cleanupFolderSettings(oldGroup);
+    }
+    settingsrc->sync();
+    Q_EMIT cleanDoneInfo(i18n("Clean Folder Settings in setting file `%1`: Done", configName));
+}
+
+void RefreshSettingsCleanupPage::cleanupFolderSettings(KConfigGroup &oldGroup)
+{
+    const bool mailingListEnabled = oldGroup.readEntry("MailingListEnabled", false);
+    if (!mailingListEnabled) {
+        oldGroup.deleteEntry("MailingListEnabled");
+    }
+    const int mailingListFeatures = oldGroup.readEntry("MailingListFeatures", 0);
+    if (mailingListFeatures == 0) {
+        oldGroup.deleteEntry("MailingListFeatures");
+    }
+    const int mailingListHandler = oldGroup.readEntry("MailingListHandler", 0);
+    if (mailingListHandler == 0) {
+        oldGroup.deleteEntry("MailingListHandler");
+    }
+    const QString mailingListId = oldGroup.readEntry("MailingListId");
+    if (mailingListId.isEmpty()) {
+        oldGroup.deleteEntry("MailingListId");
+    }
+
+    const bool putRepliesInSameFolder = oldGroup.readEntry("PutRepliesInSameFolder", false);
+    if (!putRepliesInSameFolder) {
+        oldGroup.deleteEntry("PutRepliesInSameFolder");
+    }
+
+    const bool folderHtmlLoadExtPreference = oldGroup.readEntry("htmlLoadExternalOverride", false);
+    if (!folderHtmlLoadExtPreference) {
+        oldGroup.deleteEntry("htmlLoadExternalOverride");
+    }
+    const bool useDefaultIdentity = oldGroup.readEntry("UseDefaultIdentity", false);
+    if (useDefaultIdentity) {
+        oldGroup.deleteEntry("UseDefaultIdentity");
+    }
+}
+
+void RefreshSettingsCleanupPage::initCleanupDialogSettings(const QString &configName)
+{
+    KSharedConfigPtr settingsrc = KSharedConfig::openConfig(configName);
+
+    const QStringList dialogListName{QStringLiteral("AddHostDialog"),
+                                     QStringLiteral("AuditLogViewer"),
+                                     QStringLiteral("CollectionPropertiesDialog"),
+                                     QStringLiteral("MailSourceWebEngineViewer"),
+                                     QStringLiteral("SelectAddressBookDialog"),
+                                     QStringLiteral("VCardViewer")};
+    for (const QString &str : dialogListName) {
+        KConfigGroup oldGroup = settingsrc->group(str);
+        cleanupFolderSettings(oldGroup);
+    }
+    settingsrc->sync();
+    Q_EMIT cleanDoneInfo(i18n("Clean Dialog Size in setting file `%1`: Done", configName));
+}
diff -Nru kmail-19.04.3/kmail-refresh-settings/refreshsettingscleanuppage.h kmail-19.12.3/kmail-refresh-settings/refreshsettingscleanuppage.h
--- kmail-19.04.3/kmail-refresh-settings/refreshsettingscleanuppage.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/refreshsettingscleanuppage.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,47 @@
+/*
+   Copyright (C) 2019 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 REFRESHSETTINGSCLEANUPPAGE_H
+#define REFRESHSETTINGSCLEANUPPAGE_H
+
+#include <QWidget>
+#include <KConfigGroup>
+
+class RefreshSettingsCleanupPage : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit RefreshSettingsCleanupPage(QWidget *parent = nullptr);
+    ~RefreshSettingsCleanupPage();
+
+Q_SIGNALS:
+    void cleanDoneInfo(const QString &msg);
+    void cleanUpDone();
+
+private:
+    void cleanSettings();
+    void cleanupFolderSettings(KConfigGroup &oldGroup);
+    void initCleanupFolderSettings(const QString &configName);
+    void initCleanupFiltersSettings(const QString &configName);
+    void initCleanDialogSettings(const QString &configName);
+    void removeTipOfDay(const QString &configName);
+    void initCleanupDialogSettings(const QString &configName);
+};
+
+#endif // REFRESHSETTINGSCLEANUPPAGE_H
diff -Nru kmail-19.04.3/kmail-refresh-settings/refreshsettingsfirstpage.cpp kmail-19.12.3/kmail-refresh-settings/refreshsettingsfirstpage.cpp
--- kmail-19.04.3/kmail-refresh-settings/refreshsettingsfirstpage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/refreshsettingsfirstpage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   Copyright (C) 2019 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 "refreshsettingsfirstpage.h"
+#include <QLabel>
+#include <QHBoxLayout>
+#include <KLocalizedString>
+
+RefreshSettingsFirstPage::RefreshSettingsFirstPage(QWidget *parent)
+    : QWidget(parent)
+{
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->setObjectName(QStringLiteral("mainLayout"));
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+    QLabel *label = new QLabel(i18n("Please close KMail/Kontact before using it."));
+    QFont f = label->font();
+    f.setBold(true);
+    f.setPointSize(22);
+    label->setFont(f);
+    label->setObjectName(QStringLiteral("label"));
+    mainLayout->addWidget(label, 0, Qt::AlignHCenter);
+}
+
+RefreshSettingsFirstPage::~RefreshSettingsFirstPage()
+{
+}
diff -Nru kmail-19.04.3/kmail-refresh-settings/refreshsettingsfirstpage.h kmail-19.12.3/kmail-refresh-settings/refreshsettingsfirstpage.h
--- kmail-19.04.3/kmail-refresh-settings/refreshsettingsfirstpage.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/refreshsettingsfirstpage.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   Copyright (C) 2019 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 REFRESHSETTINGSFIRSTPAGE_H
+#define REFRESHSETTINGSFIRSTPAGE_H
+
+#include <QWidget>
+
+class RefreshSettingsFirstPage : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit RefreshSettingsFirstPage(QWidget *parent = nullptr);
+    ~RefreshSettingsFirstPage();
+};
+
+#endif // REFRESHSETTINGSFIRSTPAGE_H
diff -Nru kmail-19.04.3/kmail-refresh-settings/refreshsettringsfinishpage.cpp kmail-19.12.3/kmail-refresh-settings/refreshsettringsfinishpage.cpp
--- kmail-19.04.3/kmail-refresh-settings/refreshsettringsfinishpage.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/refreshsettringsfinishpage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+   Copyright (C) 2019 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 "refreshsettringsfinishpage.h"
+#include <QHBoxLayout>
+#include <KLocalizedString>
+#include <QPlainTextEdit>
+
+RefreshSettringsFinishPage::RefreshSettringsFinishPage(QWidget *parent)
+    : QWidget(parent)
+{
+    QHBoxLayout *mainLayout = new QHBoxLayout(this);
+    mainLayout->setObjectName(QStringLiteral("mainLayout"));
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+
+    mTextEdit = new QPlainTextEdit(this);
+    mTextEdit->setObjectName(QStringLiteral("textedit"));
+    mTextEdit->setReadOnly(true);
+    mainLayout->addWidget(mTextEdit);
+    connect(this, &RefreshSettringsFinishPage::cleanDoneInfo, this, &RefreshSettringsFinishPage::slotCleanDoneInfo);
+}
+
+RefreshSettringsFinishPage::~RefreshSettringsFinishPage()
+{
+}
+
+void RefreshSettringsFinishPage::slotCleanDoneInfo(const QString &str)
+{
+    mTextEdit->insertPlainText(str + QLatin1Char('\n'));
+}
diff -Nru kmail-19.04.3/kmail-refresh-settings/refreshsettringsfinishpage.h kmail-19.12.3/kmail-refresh-settings/refreshsettringsfinishpage.h
--- kmail-19.04.3/kmail-refresh-settings/refreshsettringsfinishpage.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/kmail-refresh-settings/refreshsettringsfinishpage.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   Copyright (C) 2019 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 REFRESHSETTRINGSFINISHPAGE_H
+#define REFRESHSETTRINGSFINISHPAGE_H
+
+#include <QWidget>
+class QPlainTextEdit;
+class RefreshSettringsFinishPage : public QWidget
+{
+    Q_OBJECT
+public:
+    explicit RefreshSettringsFinishPage(QWidget *parent = nullptr);
+    ~RefreshSettringsFinishPage();
+
+Q_SIGNALS:
+    void cleanDoneInfo(const QString &info);
+
+private:
+    void slotCleanDoneInfo(const QString &info);
+    QPlainTextEdit *mTextEdit = nullptr;
+};
+
+#endif // REFRESHSETTRINGSFINISHPAGE_H
diff -Nru kmail-19.04.3/ktnef/CMakeLists.txt kmail-19.12.3/ktnef/CMakeLists.txt
--- kmail-19.04.3/ktnef/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/ktnef/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -5,6 +5,10 @@
 
 add_subdirectory(src)
 
-install( FILES ktnefapps.categories ktnefapps.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR} )
+if (${ECM_VERSION} STRGREATER "5.58.0")
+    install(FILES ktnefapps.categories ktnefapps.renamecategories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+else()
+    install(FILES ktnefapps.categories ktnefapps.renamecategories  DESTINATION ${KDE_INSTALL_CONFDIR})
+endif()
 
 add_subdirectory(doc)
diff -Nru kmail-19.04.3/ktnef/src/ktnefmain.cpp kmail-19.12.3/ktnef/src/ktnefmain.cpp
--- kmail-19.04.3/ktnef/src/ktnefmain.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/ktnef/src/ktnefmain.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -312,7 +312,7 @@
     QString dir = QFileDialog::getExistingDirectory(this, QString(), mLastDir);
     if (!dir.isEmpty()) {
         mLastDir = dir;
-        dir.append(QLatin1String("/"));
+        dir.append(QLatin1Char('/'));
         QList<KTNEFAttach *> list = mParser->message()->attachmentList();
         QList<KTNEFAttach *>::ConstIterator it;
         QList<KTNEFAttach *>::ConstIterator end(list.constEnd());
@@ -390,8 +390,8 @@
 void KTNEFMain::extractTo(const QString &dirname)
 {
     QString dir = dirname;
-    if (dir.right(1) != QLatin1String("/")) {
-        dir.append(QLatin1String("/"));
+    if (dir.right(1) != QLatin1Char('/')) {
+        dir.append(QLatin1Char('/'));
     }
     QList<KTNEFAttach *> list = mView->getSelection();
     QList<KTNEFAttach *>::ConstIterator it;
diff -Nru kmail-19.04.3/ktnef/src/main.cpp kmail-19.12.3/ktnef/src/main.cpp
--- kmail-19.04.3/ktnef/src/main.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/ktnef/src/main.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -27,10 +27,10 @@
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); 
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     QApplication app(argc, argv);
     KLocalizedString::setApplicationDomain("ktnef");
-    app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     KCrash::initialize();
     Kdelibs4ConfigMigrator migrate(QStringLiteral("ktnef"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("ktnefrc"));
diff -Nru kmail-19.04.3/ktnef/src/org.kde.ktnef.desktop kmail-19.12.3/ktnef/src/org.kde.ktnef.desktop
--- kmail-19.04.3/ktnef/src/org.kde.ktnef.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/ktnef/src/org.kde.ktnef.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -15,6 +15,7 @@
 Name[en_GB]=KTnef
 Name[es]=KTnef
 Name[et]=KTnef
+Name[eu]=KTnef
 Name[fi]=KTnef
 Name[fr]=KTnef
 Name[fy]=KTnef
@@ -67,6 +68,7 @@
 GenericName[en_GB]=TNEF File Viewer (proprietary format used by outlook)
 GenericName[es]=Visor de archivos TNEF (formato propietario usado por outlook)
 GenericName[et]=TNEF-failide (Outlookis kasutatav omanduslik vorming) näitaja
+GenericName[eu]=TNEF fitxategi erakuslea (outlook-ek erabiltzen duen formatu jabeduna)
 GenericName[fi]=TNEF-tiedostokatselin (Outlookin käyttämä suljettu tiedostomuoto)
 GenericName[fr]=Afficheur de fichier TNEF (format propriétaire utilisé par Outlook)
 GenericName[gl]=Visor de ficheiros de TNEF (formato privativo empregado por outlook)
@@ -104,8 +106,8 @@
 Comment[ar]=عارض/مستخرج لملفّات TNEF
 Comment[bg]=Програма за преглед и извличане на файлове TNEF
 Comment[bs]=Pregledač/izdvajač iz TNEF datoteka
-Comment[ca]=Un visor/extractor pels fitxers TNEF
-Comment[ca@valencia]=Un visor/extractor pels fitxers TNEF
+Comment[ca]=Un visor/extractor per als fitxers TNEF
+Comment[ca@valencia]=Un visor/extractor per als fitxers TNEF
 Comment[cy]=Gwelydd/echdynnydd i ffeiliau TNEF
 Comment[da]=En fremviser/udpakker til TNEF-filer
 Comment[de]=Betrachten und Extrahieren von TNEF-Dateien
@@ -113,6 +115,7 @@
 Comment[en_GB]=A viewer/extractor for TNEF files
 Comment[es]=Un visor/extractor para archivos TNEF
 Comment[et]=TNEF-failide näitaja/ekstraktija
+Comment[eu]=TNEF fitxategien erakusle/erauzle bat
 Comment[fa]=یک مشاهده‌گر/استخراج‌گر برای پرونده‌های TNEF
 Comment[fi]=Näytin/purkaja TNEF-tiedostoille
 Comment[fr]=Un afficheur / extracteur de fichier TNEF
diff -Nru kmail-19.04.3/ktnef/src/qwmf.h kmail-19.12.3/ktnef/src/qwmf.h
--- kmail-19.04.3/ktnef/src/qwmf.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/ktnef/src/qwmf.h	2020-03-02 07:34:49.000000000 +0000
@@ -68,7 +68,7 @@
     /**
      * @return true if the metafile is placeable.
      */
-    bool isPlaceable() const
+    Q_REQUIRED_RESULT bool isPlaceable() const
     {
         return mIsPlaceable;
     }
@@ -76,7 +76,7 @@
     /**
      * @return true if the metafile is enhanced.
      */
-    bool isEnhanced() const
+    Q_REQUIRED_RESULT bool isEnhanced() const
     {
         return mIsEnhanced;
     }
@@ -84,7 +84,7 @@
     /**
      * @return bounding rectangle
      */
-    QRect bbox() const
+    Q_REQUIRED_RESULT QRect bbox() const
     {
         return mBBox;
     }
diff -Nru kmail-19.04.3/MAINTAINERS kmail-19.12.3/MAINTAINERS
--- kmail-19.04.3/MAINTAINERS	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/MAINTAINERS	2020-03-02 07:34:49.000000000 +0000
@@ -1,2 +1 @@
 Laurent Montel <montel@kde.org>
-
diff -Nru kmail-19.04.3/po/ar/akonadi_archivemail_agent.po kmail-19.12.3/po/ar/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ar/akonadi_archivemail_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/ar/akonadi_archivemail_agent.po	2020-03-03 00:33:54.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-01-22 19:10+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -181,12 +181,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr "تعذّرت إضافة أرشيف ثانٍ لهذا المجلّد. عدّل الموجود بدلًا من هذا."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "الدّليل غير موجود. رجاءً افحص الإعدادات. عُلِّقت الأرشفة."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "يبدأ أرشفة %1"
diff -Nru kmail-19.04.3/po/ar/akonadi_followupreminder_agent.po kmail-19.12.3/po/ar/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/ar/akonadi_followupreminder_agent.po	2019-07-09 00:20:16.000000000 +0000
+++ kmail-19.12.3/po/ar/akonadi_followupreminder_agent.po	2020-03-03 00:33:54.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-01-22 22:24+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -18,86 +18,86 @@
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "عميل متابعة التّذكيرات"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "متابعة التّذكيرات"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, fuzzy, kde-format
 #| msgid "Copyright (C) 2014-2018 Laurent Montel"
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "الحقوق محفوظة © ٢٠١٤-٢٠١٨ لِ‍ Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "المصين"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "صفا الفليج"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "safa1996alfulaij@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "إلى"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "الموضوع"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "الموعد النّهائيّ"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "الجواب"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "استُلِم"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "ينتظر"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "أظهر الرّسالة"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "احذف"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
@@ -108,12 +108,12 @@
 msgstr[4] "أمتأكّد من إزالة %1 عنصرًا محدّدًا؟"
 msgstr[5] "أمتأكّد من إزالة %1 عنصر محدّد؟"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "استُلِم جواب من %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "ما زلت تنتظر جوابًا لهذا البريد:"
diff -Nru kmail-19.04.3/po/ar/akonadi_mailfilter_agent.po kmail-19.12.3/po/ar/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ar/akonadi_mailfilter_agent.po	2019-07-09 00:20:16.000000000 +0000
+++ kmail-19.12.3/po/ar/akonadi_mailfilter_agent.po	2020-03-03 00:33:54.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-01-26 10:47+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -23,17 +23,17 @@
 msgid "Filter Log Viewer"
 msgstr "عارض سجلّات التّرشيح"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&سجّل أنشطة التّرشيح"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -42,23 +42,23 @@
 "يمكنك هنا تفعيل وتعطيل تسجيل أنشطة التّرشيح. بطبيعة الحال، تُجمع بيانات "
 "السّجلّات وتُعرض فقط إن كان التّسجيل مفعّلًا."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "تفاصيل التّسجيل"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "سجّل وصف الأنماط"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "سجّل تقدير &قاعدة المرشّحات"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -72,34 +72,34 @@
 "ترشيح بمفردها، وإلّا فستجد معلومات عن نتيجة تقدير كلّ قواعد التّرشيح للمرشّح "
 "الوحيد."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "سجّل تقدير أ&نماط المرشّحات"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "سجّل إجراءات المرشّحات"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "اقصر حجم السّجلّات:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " ك.بايت"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "بلا حدّ"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -111,7 +111,7 @@
 "قصر أقصى حدّ للذّاكرة المستخدمة لذلك، فإن تخطّى حجم السّجلّات المجموعة هذا الحدّ "
 "فستُهمل البيانات الأكثر قدمًا طالما وصل التّطبيق إلى الحدّ."
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -120,63 +120,63 @@
 "تعذّرت كتابة الملفّ %1:\n"
 "وصف الخطأ المفصّل هو ”%2“."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "خطأ في «بريدك»"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "يرشّح الرّسالة %1 من أصل %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "خطأ أثناء تطبيق نقل مرشّح البريد"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "خطأ أثناء تطبيق حذف مرشّح البريد"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "خطأ أثناء تطبيق تعديلات مرشّح البريد"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>يقدّر قواعد المرشّحات:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>تطابقت قواعد التّرشيح.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>بدأ ترشيح الرّسالة ”%1“ من ”%2“ في ”%3“:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "يرشّح الرّسائل"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "فُعّل تسجيل مرشّح البريد"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "جاهز"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "يرشّح في %1"
diff -Nru kmail-19.04.3/po/ar/akonadi_sendlater_agent.po kmail-19.12.3/po/ar/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ar/akonadi_sendlater_agent.po	2019-07-09 00:20:16.000000000 +0000
+++ kmail-19.12.3/po/ar/akonadi_sendlater_agent.po	2020-03-03 00:33:54.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-01-23 16:15+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -61,57 +61,57 @@
 msgid "Your emails"
 msgstr "safa1996alfulaij@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "إلى"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "الموضوع"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "أرسِل حواليّ"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "متكرّر؟"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "معرّف الرّسالة"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "لا رسائل تتنظر..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "أرسل الآن"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "احذف"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "نعم"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "لا"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
@@ -122,67 +122,67 @@
 msgstr[4] "أتريد حذف العناصر المحدّدة؟"
 msgstr[5] "أتريد حذف العناصر المحدّدة؟"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "إزالة العناصر"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "أتريد إزالة الرّسائل أيضًا؟"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "إزالة الرّسائل"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "لم يُعثر على رسائل."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "لم يُعثر على الرّسالة."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "خطأ أثناء جلب الرّسالة."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "تعذّر جلب الرّسالة. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "لا يمكننا إنشاء نقل"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "الرّسالة ليس رسالة حقيقيّة"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "تعذّر إرسال الرّسالة."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "أُرسلت الرّسالة"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "حدث خطأ. أتريد إعادة إرسالها؟"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "حدث خطأ"
diff -Nru kmail-19.04.3/po/ar/kmail.po kmail-19.12.3/po/ar/kmail.po
--- kmail-19.04.3/po/ar/kmail.po	2019-07-09 00:20:16.000000000 +0000
+++ kmail-19.12.3/po/ar/kmail.po	2020-03-03 00:33:54.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2018-01-26 10:29+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -185,8 +185,8 @@
 msgstr "عدّة مفاتيح تعمية لكلّ عنوان"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "بريدك"
@@ -293,27 +293,27 @@
 "تعذّر على «بريدك» اكتشاف قائمة بريديّة كليًّا في هذا المجلد. فضلًا املأ العناوين "
 "يدويًّا."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "الحصّة"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "الاستخدام:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "الحالة:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "ممتلئ بنسبة %p٪"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "استُخدمت %1 من %2"
@@ -335,7 +335,7 @@
 "واضغط المفتاح/المفاتيح التي تريد ربطها بهذا المجلّد.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "القوالب"
@@ -346,106 +346,106 @@
 msgstr "ا&ستخدم قوالب رسائل مخصّصة في هذا المجلّد"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "ا&نسخ القوالب العموميّة"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "العرض"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "استخدم أي&قونات مخصّصة"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "ال&عاديّة:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&غير المقروءة:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "أظهر عمود المرسل/المستلم في قائمة الرّسائل"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "أ&ظهر العمود:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "المبدئيّ"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "المرسل"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "المستلم"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "قائمة الرّسائل"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "استخدم التّجميع المبدئيّ"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "التّجميع"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "استخدم السّمة المبدئيّة"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "السّمة"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "نسق الرّسالة المبدئيّ"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "فضّل HTML على النّصّ"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "فضّل النّصّ على HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "استخدم الإعدادات العموميّة"
@@ -455,100 +455,105 @@
 msgid "Retrieval Options"
 msgstr "خيارات الاسترجاع"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "الهويّات"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "الاستقبال"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "الإرسال"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "حسابات الإرسال (أضف واحدًا على الأقلّ):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "الخيارات العامّة"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "أكّد &قبل الإرسال"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "دقّق الهجاء قبل الإرسال"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "غير آليّ أبدًا"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "عند التمال البريد يدويًّا"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "عند كلّ التماس للبريد"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "أرسل الآن"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "أرسل لاحقًا"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "أرسل الرّ&سائل في مجلّد الصّادر:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "طريقة الإرسال ال&مبدئيّة:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "أضف حساب بريد..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "خصّص الحساب..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -556,30 +561,30 @@
 msgstr ""
 "تعذّر بدء مرشد الحسابات. رجاءً تحقّق من أنّ ”مرشد الحسابات“ مثبّت كما ينبغي."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "تعذّر بدء مرشّد الحسابات"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "ضمّن في التماس البريد اليدويّ"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "بدّل إلى عدم الاتّصال عند إطفاء «بريدك»"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "التمس البريد عند البدء"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -635,7 +640,7 @@
 msgid "Fixed Width Font"
 msgstr "الخطّ ثابت العرض"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "المؤلّف"
@@ -936,61 +941,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "تعذّر إنشاء الوسم. ثمّة وسم آخر بنفس الاسم بالفعل."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "عامّ"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "القوالب القياسيّة"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "القوالب المخصّصة"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "المواضيع"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "طقم المحارف"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "التّرويسات"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "المرفقات"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "التّصحيح الآليّ"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "التّغيير الآليّ لحجم الصّورة"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "التّوقيع"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -999,30 +1004,30 @@
 "أدرج آليًّا التّوقيع المُعدّ\n"
 "عند بدء كتابة رسالة"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "أدرج التّوقيع فوق أيّ نصّ مُقتبس"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "لا تقتبس التّوقيع الموجود عند الرّدّ"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "التّنسيق"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1033,7 +1038,7 @@
 "(بدلًا من كلّ الرّسالة)، هذا\n"
 "إن كان هناك نصّ محدّد في نافذة الرّسالة."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1044,17 +1049,17 @@
 "حتّى إن أُنشئ السّطر بإضافة كاسر سطريّ إضافيّ أثناء\n"
 "لفّ كلمات النّصّ."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "فعّل طيّ الكلمات الآليّ عند العرض المحدّد"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "اضبط عرض النّصّ لطيّ كلماته آليًّا"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1065,7 +1070,7 @@
 "تمامًا كما استُلمت. إن لم تؤشّر\n"
 "عليه فسيكون الرّد نصًّا صرفًا مبدئيًّا."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, fuzzy, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1073,34 +1078,34 @@
 "are supported."
 msgstr "نسّق جزء النّصّ الصّرف للرّسالة من رقْم HTML.\n"
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "ضمن السّياق"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "كمرفق"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "اضبط النّسق المبدئيّ للرّسالة الممرّرة"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "نوع التّمرير المبدئيّ:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "المستلمون"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, fuzzy, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1110,17 +1115,17 @@
 "مبدئيًّا، اطلب MDN عند بدء كتابة رسالة.\n"
 "يمكنك تحديد هذا لكلّ رسالة باستخدام \"\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "حذّرني إن حدّدت الكثير من المستلمين"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "حدّد أقصى عدد من المستلمين قبل التّحذير"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1136,7 +1141,7 @@
 "تجنّب إرسال رسالة إلى العديد من النّاس بالخطأ. مع ذلك،\n"
 "لاحظ أنّ الخيار لا يأخذ قوائم التّوزيع أو القوائم البريديّة بعين الاعتبار."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1145,42 +1150,42 @@
 "تذكّر آخر العناوين المُدخلة،\n"
 "ووفّرها لإكمال المستلمين"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "لا تحفظ"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "اضبط الإكمال..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "لا تحفظ آليًّا"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "لا تحفظ آليًّا"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1192,18 +1197,18 @@
 msgstr[4] " دقيقة"
 msgstr[5] " دقيقة"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "احفظ الرّسالة آليًّا كلّ س دقيقة"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "بادئات عنوان ال&رّدّ"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1212,59 +1217,59 @@
 "تعرّف على أيّ بادئة من القائمة الآتية\n"
 "(المدخلات هي تعبيرات نمطيّة غير حسّاسة للحالة):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "أ&ضف..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "أ&زل"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "ع&دّل..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "أدخل بادئة ردّ جديدة:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "بادئات عنوان التّم&رير"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "أضف..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "أز&ل"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "عدّل..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "أدخل بادئة تمرير جديدة:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1274,88 +1279,88 @@
 "محارف يحوي كلّ المحارف المطلوبة."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&عدّل..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "أدخل طقم المحارف:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "أب&قِ طقم المحارف الأصليّ عند الرّدّ أو التّمرير (إن أمكن ذلك)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "طقم المحارف هذا غير مدعوم."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "ا&ستخدم سابقة مخصّصة لمعرّف الرّسالة"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "سابقة مخصّصة لم&عرّف الرّسالة:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "عرّف حقول ترويسة MIME المخصّصة:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "الاسم"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "القيمة"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&جديد"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "الا&سم:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "ال&قيمة:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid header"
 msgstr "&تمكين التوقيع"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "تسمية المرفقات لتتوافق مع «آوتلوك»"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1363,38 +1368,38 @@
 msgstr ""
 "فعّل هذا ليستطيع «آوتلوك»™ فهم أسماء المرفقات التي تحوي محارف غير إنجليزيّة."
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "ف&عّل اكتشاف المرفقات المفقودة"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "تعرّف على أيّ كلمة من الآتي كإشارة إلى إرفاق ملفّ:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "أدخل كلمة مفتاحيّة جديدة:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "أقصى حجم للملحق:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " ك.بتّ"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "لا حدّ"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, fuzzy, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1477,7 +1482,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer Plugins"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "ملحقات المؤلّف"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1595,7 +1600,7 @@
 msgid "Archive Folder"
 msgstr "أرشف مجلّدًا"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1661,7 +1666,7 @@
 msgid "Notification"
 msgstr "إخطار"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1672,12 +1677,12 @@
 msgstr[4] "%1 مرفقًا (%2)"
 msgstr[5] "%1 مرفق (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "أخفِ قائمة المرفقات"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "أظهر قائمة المرفقات"
@@ -1694,450 +1699,450 @@
 msgid "Encoding"
 msgstr "التّرميز"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "بريدك2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "اختر القاموس المُستخدم لتدقيق هجاء هذه الرّسالة"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "اختر مجلّد البريد المُرسل حيث ستُحفظ نسخة من هذه الرّسالة"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "اختر حساب الصّادر لاستخدامه في إرسال هذه الرّسالة"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "اضبط عنوان بريد ”من:“ الإلكترونيّ لهذه الرّسالة"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "ضع موضوعًا لهذه الرّسالة"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "ال&هويّة:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "ال&قاموس:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "مجلّد البريد المُر&سل :"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "نقل البري&د:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&من:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "الم&وضوع:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "أرسل ال&بريد"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "أ&رسل البريد عبر"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "أرسل"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "أرسل لا&حقًا"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "أرسل لا&حقًا عبر"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "صُفّ"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "احفظ ك&مسودّة"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "احفظ الرّسالة في مجلّد المسودّات"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "احفظ ك&قالب"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "احفظ الرّسالة في مجلّد القوالب"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "احفظ كمل&فّ"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "احفظ الرّسالة كملفّ نصّيّ أو HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "أ&درج ملفًّا نصّيًّا..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "أ&درج ملفًّا نصّيًّا حديثًا"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&دفتر العناوين"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "افتح دفتر العناوين"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "كاتب &جديد"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "حدّد ال&مستلمين..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "احفظ قائمة ال&تّوزيع..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "ألصق ك&مرفق"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "ام&حُ الفراغات"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "استخدم &خطًّا ثابتًا"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&عاجل"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "ا&طلب إخطار التّجميع"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "ا&طلب إخطار التّجميع"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "طيّ ال&كلمات"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "ال&قصاصات"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "دقّق اله&جاء آليًّا"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "تحرير النّصّ الغنيّ"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "النّصّ الغنيّ"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "افتح/أغلق وضع تحرير النّصّ الغنيّ"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&كلّ الحقول"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "ال&هويّة"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "ال&قاموس"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "مجلّد البريد المُر&سل"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "نقل ال&بريد"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&من"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "المو&ضوع"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "أضف ال&تّوقيع"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "أدرج التّوقيع مكان المؤ&شر"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&مدقّق الهجاء..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "مدقّق الهجاء"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&عمّ الرّسالة"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "عمّ"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "و&قّع الرّسالة"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "وقّع"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "Create To-do/Reminder..."
 msgid "Create Follow Up Reminder..."
 msgstr "أنشئ مهمة/مُذكّرًا..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "اضبط «بريدك»..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr "<qt>سيخفي هذا شريط القوائم نهائيًّا. يمكنك إظهاره مجدّدًا بكتابة %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "أخفِ شريط القوائم"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " السّطر: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " العمود: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "كتابة"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "إدراج"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "تدقيق الهجاء: مفعّل"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "تدقيق الهجاء: معطّل"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "أعد &حفظه كقالب"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "ا&حفظ كمسودّة"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "أعد حفظ هذه الرّسالة في مجلّد القوالب لتستطيع استخدامها لاحقًا."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr "احفظ هذه الرّسالة في مجلّد المسودّات لتستطيع لاحقًا تحريرها أو إرسالها."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "أتريد حفظ الرّسالة لوقت لاحق أو إهمالها؟"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "أغلق الكاتب"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "فشل حفظ الرّسالة آليًّا"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "فشل إرسال الرّسالة"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "أدرج ملفًّا"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "أضف كصورة &سياقيّة"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "أضف ك&مرفق"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "اسم المرفق:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid Attachment Name"
 msgstr "&تمكين التوقيع"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2148,7 +2153,7 @@
 msgstr[4] "أضف المسارات في الرّسالة"
 msgstr[5] "أضف المسارات في الرّسالة"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2159,17 +2164,17 @@
 msgstr[4] "أضف الملفّات &كملحقات"
 msgstr[5] "أضف الملفّات &كملحقات"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "أدرج نصّ الحافظة كمرفق"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "غير معنون"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2181,12 +2186,12 @@
 "تعمية (OpenPGP أو S/MIME) لذلك.</p><p>فضلًا حدّد المفتاح/المفاتيح التي ستُستخدم "
 "وذلك في ضبط الهويّة.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "مفتاح تعمية غير معرّف"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2196,12 +2201,12 @@
 "<qt><p>لتوقّع هذه الرّسالة عليك أوّلًا تعريف مفتاح توقيع (OpenPGP أو S/MIME) "
 "ليُستخدم.</p><p>فضلًا اختر المفتاح الذي سيُستخدم وذلك في ضبط الهويّة.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "مفتاح توقيع غير معرّف"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2211,7 +2216,7 @@
 "عليك إدخال بريدك الإلكترونيّ في حقل ”من:“. يحبّذ أيضًا تحديد بريدك الإلكترونيّ "
 "لكلّ الهويّات، لألّا تدخلها في كلّ رسالة."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2220,59 +2225,59 @@
 "عليك تحديد مستلم واحد على الأقلّ، إمّا في حقل ”إلى:“، أو ”ن‌ك:“ (نسخة كربونيّة) "
 "أو ”ن‌ك‌م:“ (نسخة كربونيّة مخفيّة)."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "حقل ”إلى:“ فارغ. أأرسل الرّسالة بأيّ حال؟"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "لم يحدّد ”إلى:“"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "لم تحدّد موضوعًا. أأرسل الرّسالة بأيّ حال؟"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "لم يحدّد موضوع"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "أ&رسلها هكذا"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&حدّد الموضوع"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "عليك تحديد مستلم واحد على الأقل لتعمّي مسودّة."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "على وشك إرسال الرّسالة..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "تأكيد إرسال"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "أ&رسل الآن"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2280,65 +2285,65 @@
 msgstr ""
 "أنت تحاول إرسال البريد إلى أكثر من %1 من المستلمين. أأرسل البريد بأيّ حال؟"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "مستلمون كثر"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "أ&رسلها هكذا"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&حرّر المستلمين"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "تعطيل وضع HTML سيتسبّب للنّصّ بخسارة تنسيقه. أأنت متأكّد؟"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "أنخسر التّنسيق؟"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "اخسر التّنسيق"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2346,7 +2351,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "معلومات محرّر الملحقات"
@@ -2421,26 +2426,26 @@
 msgid "External editor was started."
 msgstr "بدأ المحرّر الخارجيّ."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr "لم يُعثر على النّقل. رجاءً تحقّق بأنّك ستستخدم نقل بريد صحيح."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "لم يعرّف مجلّد الأرشيفات. فضلًا أكّد إعدادات الحساب %1"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2468,11 +2473,6 @@
 msgid "Message will not be encrypted"
 msgstr "لن تُعمّى الرّسالة"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "القصاصات النّصّيّة"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2516,27 +2516,27 @@
 msgid "Cannot move messages."
 msgstr "تعذّر نقل الرّسائل."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "تعذّر جلب المجلّد. الخطأ كان: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "لم يُرجع مجلّد."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "تعذّر جلب المجلّد الأبّ. الخطأ كان: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "تعذّر إرجاع قائمة المجلّدات."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "أُرشفت الرّسائل"
@@ -2577,48 +2577,48 @@
 msgid "&Existing identities:"
 msgstr "الهويّات ال&موجودة:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "خطأ أثناء توليد زوج مفاتيح جديد: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "خطأ أثناء توليد المفتاح"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "لا مفتاح"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "ولّد زوج مفاتيح جديد"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "يولّد زوج مفاتيح جديد..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "حرّر الهويّة"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "عامّ"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "اسم&ك:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2629,12 +2629,12 @@
 "المُرسل،</p><p>إن تركته فارغًا فلن يظهر اسمك الحقيقيّ، وسيظهر بريدك الإلكترونيّ "
 "فقط.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "المن&ظّمة:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2644,12 +2644,12 @@
 "<qt><h3>المنظّمة</h3><p>على هذا الحقل احتواء اسم منظّمتك إن أردته أن يظهر في "
 "ترويسة البريد المُرسل.</p><p>من الآمن (والطّبيعيّ) أن تترك هذا فارغًا.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "ال&بريد الإلكترونيّ:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2664,12 +2664,12 @@
 "</p><p>إن تركت هذا فارغًا، أو خاطئًا، فسيواجه الآخرين مشكلة في الرّدّ عليك.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr ""
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2680,12 +2680,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "التّعمية"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2705,12 +2705,12 @@
 "رسائلك رقميًّا باستخدام OpenPGP، إلّا أنّ وظائف البريد الطّبيعيّة لن تتأثّر.</"
 "p><p>يمكنك معرفة المزيد عن المفاتيح في <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "مفتاح توقيع OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2731,12 +2731,12 @@
 "رسائلك رقميًّا باستخدام OpenPGP، إلّا أنّ وظائف البريد الطّبيعيّة لن تتأثّر.</"
 "p><p>يمكنك معرفة المزيد عن المفاتيح في <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "مفتاح تعمية OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, fuzzy, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2749,12 +2749,12 @@
 "بريدك الالكتروني رقميا بواسطة S/MIME ، اما وظائف البريد العادية فلن يكن "
 "عليها اي مفعول.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "شهادة توقيع S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2764,40 +2764,40 @@
 "functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "شهادة تعمية S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "النّسق المفضّل:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "وقّع الرّسائل آليًّا"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically sign messages"
 msgid "Automatically encrypt messages when possible"
 msgstr "وقّع الرّسائل آليًّا"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "متقدّم"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "عنوان الرّ&دّ على:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, fuzzy, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2814,12 +2814,12 @@
 "have your email in the <tt>From:</tt> field, but any responses to go to a "
 "group address.</p><p>If in doubt, leave this field blank.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "ع&ناوين ن‌ك:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2830,12 +2830,12 @@
 "blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "ع&ناوين ن‌ك‌م:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2846,90 +2846,90 @@
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "ال&قاموس:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&مجلّد البريد المُرسل:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "مجلّد ال&مسودّات:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "مجلّد ال&قوالب:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "حساب الصّادر:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "أرفق vCard خاصّتي إلى الرّسالة"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "أنشئ..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "لغة التّصحيح الآليّ:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "استعد اسم المجال المبدئيّ"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "المجال ال&مبدئيّ:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "ا&ستخدم قوالب رسائل مخصّصة لهذه الهويّة"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "التّوقيع"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "الصّورة"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr ""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "عنوان البريد الإلكترونيّ غير صالح"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2938,7 +2938,7 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2947,7 +2947,7 @@
 "أحد مفاتيح تعمية OpenPGP المضبوطة لا تحوي أيّ مستخدم بالبريد الإلكترونيّ "
 "المضبوط لهذه الهويّة (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, fuzzy, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2960,7 +2960,7 @@
 "سينتج عن ذلك رسائل تنبيه من قبل الجانب الآخر عندما سيحاول التحقق من التواقيع "
 "المُعدة بهذه الطريقة."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -2969,22 +2969,22 @@
 "أحد شهادات تعمية S/MIME المضبوطة لا تحوي عنوان البريد الإلكترونيّ المضبوط "
 "لهذه الهويّة (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, fuzzy, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "لم يوجد عنوان البريد الإلكتروني في المفتاح/الشهادات"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "ملفّ التّوقيع غير صالح"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "حرّر الهويّة ”%1“"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -2993,7 +2993,7 @@
 "مجلّد المسودّات المخصّص للهويّة غير موجود (بعد الآن)، لذلك سيُستخدم مجلّد المسودّات "
 "المبدئيّ."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "حرّر..."
@@ -3025,6 +3025,21 @@
 msgid "We cannot delete vCard file."
 msgstr "تعذّر حذف ملفّ vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgctxt "@info"
+#| msgid "Do you really want to execute <filename>%1</filename>?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "أتريد حقًا تنفيذ <filename>%1</filename>؟"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "تأكيد إرسال"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3183,7 +3198,7 @@
 "الأمثلة موجودة في <a href=\"http://ace.home.xs4all.nl/X-Faces/\">http://ace."
 "home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3220,7 +3235,7 @@
 msgstr[4] "قوائم التّجميع %2 فارغة ولا يمكن استخدامها."
 msgstr[5] "قوائم التّجميع %2 فارغة ولا يمكن استخدامها."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "أضف إلى دفتر العناوين"
@@ -3230,22 +3245,22 @@
 msgid "Contact created successfully"
 msgstr "أُنشئ المتراسل بنجاح"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "تعذّر تخزين المتراسل: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "فشل تخزين المتراسل"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "أتريد إرفاق المجلّد ”%1“ هذا؟"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "أرفق مجلّدًا"
@@ -3452,7 +3467,7 @@
 msgstr "م&جلّدات"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3460,7 +3475,7 @@
 msgstr "طبّ&ق كلّ المرشّحات على المجلّد"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current Folder & All Subfolders"
@@ -3487,7 +3502,7 @@
 msgstr "&مرّر"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&طبّق المرشّح"
@@ -3512,7 +3527,7 @@
 msgstr "مساع&دة"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "شريط الأدوات الرّئيسيّ"
@@ -3571,12 +3586,12 @@
 msgid "The file does not contain a message."
 msgstr "لا يحوي الملفّ رسالة."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "يحوي الملفّ عدّة رسائل. ستظهر الرّسالة الأولى فقط."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3585,32 +3600,32 @@
 "أتريد تمرير الرّسائل المحدّدة كمرفقات في رسالة واحدة (كملخّص MIME) أو كرسائل "
 "منفردة؟"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "أرسل كملخّص"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "أرسلها منفردة"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "يرشّح الرّسائل"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "يرشّح الرّسالة %1 من %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "ينقل الرّسائل"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "يحذف الرّسائل"
@@ -3639,66 +3654,66 @@
 msgid "Text Direction Toolbar"
 msgstr "شريط أدوات اتّجاه النّصّ"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "«بريدك» في وضع عدم الاتّصال، عُلّقت كلّ مهامّ الشّبكة"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "على وشك إرسال الرّسالة..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "«بريدك» متّصل بالإنترنت، استُكملت كلّ مهامّ الشّبكة"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr "«بريدك» متّصل بالإنترنت، ستُستكمل كلّ مهامّ الشّبكة عند اكتشاف شبكة"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "«بريدك» في وضع عدم الاتّصال حاليًّا. أتريد المتابعة؟"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "متّصل/غير متّصل"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "اعمل متّصلًا"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "اعمل بلا اتّصال"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "اكتُشف اتّصال بالشّبكة، استُكملت كلّ مهامّ الشّبكة"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "لم يُكتشف أيّ اتّصال بالشّبكة، عُلّقت كلّ مهامّ الشّبكة"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3707,12 +3722,12 @@
 "فشل فتح الملفّ المحفوظ آليًّا في %1.\n"
 "السّبب: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "فشل فتح الملفّ المحفوظ آليًّا"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3724,7 +3739,7 @@
 msgstr[4] "عُدّلت %1 هويّة لتستخدم النّقل الافتراضيّ:"
 msgstr[5] "عُدّلت %1 هويّة لتستخدم النّقل الافتراضيّ:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3736,43 +3751,46 @@
 msgstr[4] "عُدّلت %1 هويّة لتستخدم النّقل المعدّل:"
 msgstr[5] "عُدّلت %1 هويّة لتستخدم النّقل المعدّل:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "يرسل الرّسائل"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "يمهّد عمليّة الإرسال..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "المورد %1 معطوب."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "لم يسجّل عميل أرشفة البريد."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3780,12 +3798,12 @@
 "properly installed."
 msgstr "تعذّر بدء مدير الشّهادات، فضلًا تحقّق من تثبيتك."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "خطأ «بريدك»"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3793,24 +3811,24 @@
 "properly installed."
 msgstr "تعذّر بدء مرشد الاستيراد. فضلًا تحقّق من تثبيتك."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "تعذّر بدء مرشّد الاستيراد"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "تعذّر بدء برنامج ”مصدّر إعداد PIM“. فضلًا تحقّق من تثبيتك."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "تعذّر بدء برنامج ”مصدّر إعدادات PIM“"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3818,94 +3836,94 @@
 "properly installed."
 msgstr "تعذّر بدء مرشد الاستيراد. فضلًا تحقّق من تثبيتك."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr ""
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr "عُثر على عميل بريد آخر في النّظام. أتريد استيراد البيانات منه؟"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "تعذّر بدء مرشد الاستيراد. فضلًا تحقّق من تثبيتك."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "لا موضوع"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(لا قوالب)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "ليس لهذا المجلّد أيّة خيارات مُعدّة لحذفه نهائيًّا"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>أتريد حقًّا حذف المجلّد <b>%1</b> نهائيًّا؟</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "اح&ذفه نهائيًّا"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "أفرغ المهملات"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "انقل إلى المهملات"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "أتريد حقًّا إفراغ مجلّد المهملات؟"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr "<qt>أتريد حقًّا نقل كلّ الرّسائل من المجلّد <b>%1</b> إلى المهملات؟</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "نُقلت كلّ الرّسائل إلى المهملات"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "أتريد حقًّا حذف كلّ الرّسائل القديمة نهائيًّا؟"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "أأحذف الرّسائل القديمة نهائيًّا؟"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr ""
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3913,17 +3931,17 @@
 "compromised by other present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "تحذير أمنيّ"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr ""
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3943,535 +3961,535 @@
 msgstr[5] ""
 "<qt>أتريد حقًّا حذف ال‍%1 رسالة المحدّدة؟<br />إرجاعها بعد الحذف محال.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr ""
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr ""
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "ينقل الرّسائل..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "يحذف الرّسائل..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "حُذفت الرّسائل بنجاح."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "نُقلت الرّسائل بنجاح."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "فشل حذف الرّسائل."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "أُلغي حذف الرّسائل."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "فشل نقل الرّسائل."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "أُلغي نقل الرّسائل."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "انقل الرّسائل إلى مجلّد"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "ينسخ الرّسائل..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "نُسخت الرّسائل بنجاح."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "فشل نسخ الرّسائل."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "أُلغي نسخ الرّسائل."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "انسخ الرّسائل إلى المجلّد"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "ينقل الرّسائل إلى المهملات..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "ينقل الرّسائل إلى المهملات..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "نُقلت الرّسائل إلى المهملات بنجاح."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "نُقلت الرّسائل إلى المهملات بنجاح."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "فشل نقل الرّسائل إلى المهملات."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "فشل نقل الرّسائل إلى المهملات."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "أُلغي نقل الرّسائل إلى المهملات."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "أُلغي نقل الرّسائل إلى المهملات."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "اقفز إلى مجلّد"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "احفظ &ك‍..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "اح&ذف كلّ المجلّدات نهائيًّا"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "التمس ال&بريد"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "التمس البريد في"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "التمس البريد"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "أر&سل الرّسائل المصطفّة"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "حالة الاتّصال (مجهولة)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "أرسل الرّسائل المصطفّة عبر"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "مدير الشّهادات"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "ا&ستورد رسائلًا..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr ""
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr ""
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "استورد من &عميل بريد آخر..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "حرّر ردود ”خارج المكتب“..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "ا&ضبط الأرشفة الآليّة..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "ا&حذف"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "ا&نقل الموضوع إلى المهملات"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "انقل الموضوع إلى سلّة المهملات"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "احذف المو&ضوع"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "ا&بحث عن رسائل..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "حدّد &كلّ الرّسائل"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "إدارة ال&قوائم البريديّة..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "ا&ضبط اختصارًا..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "إعدادات الح&ذف النّهائيّ"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "أر&شف المجلّد..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "حمّل المراجع ال&خارجيّة"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "انسخ الرّسالة إلى..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "انقل الرّسالة إلى..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "رسالة &جديدة..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "جديد"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "رسالة من &قالب"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "رسالة جديدة إلى قا&ئمة بريدية..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "أ&نشئ مرشّحًا"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "رشّح حسب المو&ضوع..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "رشّح حسب المُر&سل..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "رشّح حس&ب المستلم..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "رشّح حسب &ن‌ك..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "علّم الموضو&ع"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "علّم الموضوع بم&قروء"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "علّم كلّ الرّسائل في الموضوع المحدّد بمقروءة"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "علّم الموضوع ب&غير مقروء"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "علّم كلّ الرّسائل في الموضوع المحدّد بغير مقروءة"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "علّم الموضوع بم&همّ"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "أزل علامة الأ&هميّة من الموضوع"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "علّم الموضوع بعنصر إ&جرائيّ"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "أزل علامة ال&عنصر الإجرائيّ من الموضوع"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&راقب الموضوع"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "ت&جاهل الموضوع"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "احفظ الم&رفقات..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 msgid "Copy Decrypted To..."
 msgstr "رسالة جديدة إلى..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "طبّ&ق كلّ المرشّحات"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "و&سّع الموضوع/المجموعة"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "وسّع الموضوع أو المجموعة الحاليّة"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "ا&طو الموضوع/المجموعة"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "اطوِ الموضوع أو المجموعة الحاليّة"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "و&سّع كلّ المواضيع"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "وسّع كلّ المواضيع في المجلّد الحاليّ"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "اط&وِ كلّ المواضيع"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "اطوِ كلّ مواضيع المجلّد الحاليّ"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "ا&عرض الرّسالة"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "الرّسالة ال&تّالية"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "انتقل إلى الرّسالة التّالية"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "الرّسالة &غير المقروءة التّالية"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "التّالية"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "انتقل إلى الرّسالة غير المقروءة التّالية"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "الرّسالة ال&سّابقة"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "انتقل إلى الرّسالة السّابقة"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "الرّسالة غير الم&قروءة السّابقة"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "السّابقة"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "انتقل إلى الرّسالة غير المقروءة السّابقة"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "ال&مجلّد غير المقروء التّالي"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "انتقل إلى المجلّد التّالي والذي فيه رسائل غير مقروءة"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "المجلّد غير الم&قروء السّابق"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "انتقل إلى المجلّد السّابق والذي فيه رسائل غير مقروءة"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "الن&صّ غير المقروء التّالي"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "انتقل إلى النّص غير المقروء التّالي"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4480,174 +4498,174 @@
 "مرّر لأسفل في الرّسالة الحاليّة. إن كنت في نهايتها فانتقل إلى الرّسالة غير "
 "المقروءة التّالية."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "اضبط المر&شّحات..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr ""
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "أ&ضف حسابًا..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "م&قدّمة «بريدك»"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "اعرض صفحة بداية «بريدك»"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "اضبط الإ&خطارات..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "ا&ضبط «بريدك»..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr ""
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "أضف مجلّدًا مفضّلًا..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr ""
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "طبّ&ق كلّ المرشّحات"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "استورد/صدّر بيانات «بريدك»..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "متراسل دفتر عناوين جديد."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "انسخ الرّسالة إلى المجلّد"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "اقفز إلى مجلّد..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "أجعض العمليّة الحاليّة"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "ركّز على المجلّد التّالي"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "ركّز على المجلّد السّابق"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr ""
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "ركّز على المجلّد الأوّل"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "ركّز على المجلّد الأخير"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "ركّز على الرّسالة التّالية"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "ركّز على الرّسالة السّابقة"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "اختر أوّل رسالة"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "اختر آخر رسالة"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr ""
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "ركّز على البحث السّريع"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "وسّع التّحديد إلى الرّسالة السّابقة"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "وسّع التّحديد إلى الرّسالة التّالية"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "انقل الرّسالة إلى مجلّد"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message W&indow"
 msgid "Use Less Bandwidth"
 msgstr "نا&فذة الرسائل"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
@@ -4655,45 +4673,51 @@
 
 #: kmmainwidget.cpp:3590
 #, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "اسم الهوية"
+
+#: kmmainwidget.cpp:3601
+#, fuzzy, kde-format
 msgid "Add Favorite Folder"
 msgstr "أضف مجلدًا مفضلًا"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "أ&فرغ المهملات"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "ا&نقل كلّ الرّسائل إلى المهملات"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "ا&حذف البحث"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "حرّر البحث..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "ترا&جع"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "ترا&جع عن: ”%1“"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "المرشّح %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4701,7 +4725,7 @@
 msgid "Search... <%1>"
 msgstr "ابحث...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, fuzzy, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4709,12 +4733,12 @@
 "present and anticipated security exploits."
 msgstr "استخدام HTML في البريد سيعرّضك "
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "استخدم HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4724,119 +4748,119 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "إ&لغاء"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "يبدأ..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "ا&نقل إلى المهملات"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "المهملات"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "انقل الرّسالة إلى سلّة المهملات"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "تعذّر نسخ العنصر. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "رسالة جديدة إلى..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, fuzzy, kde-format
 msgid "Reply To..."
 msgstr "رُدّ على..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "مرّر إلى..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "أضف إلى متراسل موجود"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "افتح في دفتر العناوين"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "علّم هذه الوصلة"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "حرّر المتراسل..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "احفظ الوصلة ك‍..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "ا&بحث في الرّسالة..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "احفظ الصّورة على القرص..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "أظهر نسق HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "أظهر نسق HTML عندما يأتي بريد من هذا المتراسل"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "حمّل المراجع الخارجيّة للبريد القادم من هذا المتراسل"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "شارك الصّورة..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, fuzzy, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4844,64 +4868,64 @@
 msgstr ""
 "«بريدك» الآن مبنيّ على إطار عمل إدارة المعلومات الشّخصية «أكونادي»، والذي جلب"
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "بحث مطوّر"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, fuzzy, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "دعم إرسال الملاحظات إلى الرّسائل"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "تجمّد أقلّ للواجهة الرّسوميّة، التماس البريد يحدث في الخلفيّة"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "دعم GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "مصيّر HTML جديد (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "دقّق الهجاء قبل الإرسال"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "عميل بريد لكدي"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "يجلب محتوى المجلّد"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "فضلًا انتظر . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "غير متّصل"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4910,7 +4934,7 @@
 "«بريدك» في وضع عدم الاتّصال حاليًّا. انقر <a href=\"kmail:goOnline\">هنا</a> "
 "لنتّصل بالإنترنت . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4919,22 +4943,22 @@
 "الحساب في وضع عدم الاتّصال حاليًّا. انقر <a href=\"kmail:goResourceOnline"
 "\">هنا</a> لنتّصل بالإنترنت . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "عُدّل المتراسل بنجاح."
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "رسائل جديدة في"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "لا رسائل غير مقروءة"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4961,8 +4985,8 @@
 msgstr "الحقوق محفوظة © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5052,18 +5076,18 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "مراسلون"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, fuzzy, kde-format
 #| msgid "Copyright © 2004–2010 Tobias Koenig"
 msgid "(c), 2004 Tobias Koenig"
@@ -5112,27 +5136,27 @@
 msgid "All"
 msgstr "الكل"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "c الـ KMail"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5159,7 +5183,7 @@
 msgid "&Reply"
 msgstr "&رُدّ"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, fuzzy, kde-format
 msgid "&Reply..."
 msgstr "&رُدّ..."
@@ -5169,12 +5193,12 @@
 msgid "Reply to A&uthor..."
 msgstr "رُدّ على &المؤلف..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, fuzzy, kde-format
 msgid "Reply to &All..."
 msgstr "رُدّ على ال&كل..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, fuzzy, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "رُدّ على &قائمة بريدية...."
@@ -5205,7 +5229,7 @@
 msgid "&Edit As New"
 msgstr "&حرّر الرّسالة"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5400,45 +5424,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "فشل البحث. الأخطاء كانت: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "ا&بحث"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&ضمن السّياق..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "كمر&فق..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "احفظ المرفقات..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "امحُ التّحديد"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "تنقّل إلى المجلّد الأصليّ"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5449,68 +5473,68 @@
 msgstr[4] "%1 تطابقًا"
 msgstr[5] "%1 تطابق"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "آخر بحث"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "لم تحدّد مجلّدًا صالحًا."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "نسيت تحديد التّجميعات."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "نسيت تعريف الشّرط."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "نسيت إضافة شروط."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "يبحث..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "تعذّر إيجاد أيّة نتائج. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "فشل البحث."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "اكتمل البحث."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "أُوقف البحث."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5518,7 +5542,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, fuzzy, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5529,7 +5553,7 @@
 msgstr[4] "انسخ الرسائل"
 msgstr[5] "انسخ الرسائل"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, fuzzy, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5540,7 +5564,7 @@
 msgstr[4] "قُص الرسائل"
 msgstr[5] "قُص الرسائل"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5665,7 +5689,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5673,7 +5697,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5681,27 +5705,27 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 #| msgid "Show quick search line edit"
 msgid "Show folder quick search line edit"
 msgstr "أعرض تحرير سطر البحث السريع"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5710,19 +5734,19 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "دقّق الهجاء قبل الإرسال"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5733,13 +5757,13 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "فترة الحفظ الآليّ:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5748,151 +5772,151 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "قائمة المجلّدات"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr ""
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr ""
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr ""
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr ""
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr ""
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr ""
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5900,7 +5924,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5908,7 +5932,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5916,7 +5940,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5924,7 +5948,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5932,7 +5956,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6183,7 +6207,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6488,10 +6512,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "التمس البريد في"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7014,6 +7037,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "أعد تفعيل كلّ تحذيرات ”لا تسألني مجدّدًا“"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7077,6 +7110,14 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#~ msgid "Text Snippets"
+#~ msgstr "القصاصات النّصّيّة"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "التمس البريد في"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "اسم المجلّد وحجمه عند اقترابه من الحصّة"
 
@@ -10456,11 +10497,6 @@
 #~ msgstr "استخدم الهوية المب&دئية"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "اسم الهوية"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "الخادم &يدعم منخل Sieve"
@@ -12562,10 +12598,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "يفتح المسار..."
 
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "أتريد حقًا تنفيذ <filename>%1</filename>؟"
-
 #~ msgid "Execute"
 #~ msgstr "نفّذ"
 
diff -Nru kmail-19.04.3/po/bg/kmail.po kmail-19.12.3/po/bg/kmail.po
--- kmail-19.04.3/po/bg/kmail.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/bg/kmail.po	2020-03-03 00:33:55.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2013-08-06 15:41+0300\n"
 "Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
 "Language-Team: Bulgarian <dict@ludost.net>\n"
@@ -200,8 +200,8 @@
 msgstr ""
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -316,27 +316,27 @@
 "KMail не може да открие пощенски списък в тази папка. Моля, попълнете "
 "адресите ръчно."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Квота"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Състояние:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr ""
@@ -360,7 +360,7 @@
 "асоциирате с тази папка.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Шаблони"
@@ -372,112 +372,112 @@
 msgstr "&Потребителски шаблони за съобщение"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Копиране на глобалните шаблони"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Изглед"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Изпол&зване на потребителски икони"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, fuzzy, kde-format
 #| msgid "&Normal:"
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "Нор&мално:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, fuzzy, kde-format
 #| msgid "&Unread:"
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "Неп&рочетено:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Показване на колоната \"Подател/Получател\" в списъка със съобщения"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "По&казване на колона:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "По подразбиране"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Подател"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Получател"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Списък със съобщения"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default aggregation"
 msgstr "Изтриване на н&ишка"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Използване на темата по подразбиране"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Тема"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Message Status"
 msgid "Message Default Format"
 msgstr "Състояние на съобщение"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "Предпочитане на HTML пред обикновен текст"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "&Предпочитане на HTML пред обикновен текст"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -488,103 +488,108 @@
 msgid "Retrieval Options"
 msgstr "Настройки на изтеглянето"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Само&личност"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Получаване"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Изпращане"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Изходящи сметки (добавете поне една):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Общи настройки"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Потвър&ждение преди изпращане"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Проверка на правописа преди изпращане"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Никога автоматично"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "При ръчна проверка на пощата"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "При всяка проверка на пощата"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Изпращане сега"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Изпращане по-късно"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Поставяне на &съобщенията в папка \"Изходяща\":"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Мето&д по подразбиране:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "Add Mail Account..."
 msgstr "Добавяне на бележка..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "Custom Account..."
 msgstr "Добавяне на бележка..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -594,33 +599,33 @@
 "Грешка при стартиране управлението на удостоверенията. Моля, проверете "
 "инсталацията си."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start account wizard"
 msgstr "Грешка при създаване на сметка"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, fuzzy, kde-format
 #| msgid "Include in manual mail chec&k"
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Включване при ръчната провер&ка на пощата"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Check mail on startup"
 msgstr "Проверка на по&щата при стартиране"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -680,7 +685,7 @@
 msgid "Fixed Width Font"
 msgstr "Равноширок шрифт"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Съчиняване"
@@ -1017,93 +1022,93 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Общи"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Стандартни шаблони"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Потребителски шаблони"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Тема"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Кодова таблица"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Заглавки"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Прикрепени файлове"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Подпис"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "&Формат:"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1111,7 +1116,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1119,17 +1124,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1137,7 +1142,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1145,36 +1150,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Вградено"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Като прикрепен файл"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Default Forwarding Type:"
 msgid "Default forwarding type:"
 msgstr "Препращане по подразбиране:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "All Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Всички получатели"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1182,18 +1187,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Максимален брой редове за редактор на получателя."
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1204,51 +1209,51 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Без автозапис"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Настройване на автозавършването..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Без автозапис"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Без автозапис"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1257,19 +1262,19 @@
 msgstr[0] " мин"
 msgstr[1] " мин"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "Автоматично и&скане на известие за доставка на съобщение (ИДС)"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Отговор - пред&ставки на темата"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1278,59 +1283,59 @@
 "Разпознаване на последователност от следните представки\n"
 "(въведеното е нечувствително към големи/малки букви):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Д&обавяне..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "И&зтриване"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Промя&на..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Въведете нова представка при отговор:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Препра&щане - представки на темата"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Добавяне..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "И&зтриване"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Промяна..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Въведете нова представка при препращане:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1340,90 +1345,90 @@
 "необходимите кодови таблици."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Промяна..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Въведете кодова таблица:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Запазване на оригиналната кодова таблица при отговор или препращане (ако е "
 "възможно)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Тази кодова таблица не се поддържа."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Потребителска наставка за идентификация на съобщение"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Потребителска наставка (message-&id):"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Потребителски заглавни части - mime:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Име"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Стойност"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "Но&в"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Име:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "Сто&йност:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid header"
 msgstr "Невалидна е-поща"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Съвместимо с Outlook именуване на прикрепените файлове"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1433,43 +1438,43 @@
 "прикрепените файлове, съдържащи символи, които не са част от английската "
 "азбука"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Откр&иване на липсващите прикрепени файлове"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Разпознаване на поне една от ключовите думи като намерение за прикрепяне на "
 "файл:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Въведете нова ключова дума:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "Attachments"
 msgid "Maximum Attachment Size:"
 msgstr "Прикрепени файлове"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "Ограничение на размера:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1566,7 +1571,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Съчиняване"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1686,7 +1691,7 @@
 msgid "Archive Folder"
 msgstr "Нова папка"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgctxt "Start of the filename for a mail archive file"
 #| msgid "Archive"
@@ -1758,7 +1763,7 @@
 msgid "Notification"
 msgstr "Уведомление"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "As Attachment"
 msgid "1 attachment (%2)"
@@ -1766,14 +1771,14 @@
 msgstr[0] "Като прикрепен файл"
 msgstr[1] "Като прикрепен файл"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgctxt "message status"
 #| msgid "Has Attachment"
 msgid "Hide attachment list"
 msgstr "Имащи прикрепени файлове"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "has an attachment"
 msgid "Show attachment list"
@@ -1791,394 +1796,394 @@
 msgid "Encoding"
 msgstr "Кодова таблица"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 #| msgid "Set subject of message"
 msgid "Set a subject for this message"
 msgstr "Задаване тема на съобщение"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "Само&личност:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Речник:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "&Папка за изпратена поща:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Поще&нски транспорт:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&От:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Тема:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Изпращане на поща"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Изпращане на поща с"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Изпращане"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Изпращане &по-късно"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Изпращане &по-късно с"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, fuzzy, kde-format
 #| msgid "Queue"
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "На опашката"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Запис като &чернова"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "Търс&ене във всички локални папки"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Запис като &шаблон"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 #| msgid "Save as &Template"
 msgid "Save email in Template folder"
 msgstr "Запис като &шаблон"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "Запис във файл"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgid "&Insert Text File..."
 msgstr "&Вмъкване на файл..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, fuzzy, kde-format
 #| msgid "&Insert File Recent"
 msgid "&Insert Recent Text File"
 msgstr "&Вмъкване на последен файл"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Адресник"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "Open Address Book"
 msgstr "Отваряне в адресника"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Ново съобщение"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Избор на &получатели..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Запис на списък за &разпращане..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Поставяне като при&крепен файл"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Изчистване на ин&тервалите"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "&Равноширок шрифт"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "Спеш&но"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Искане на известие за доставка на съобщение (ИДС)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Искане на известие за доставка на съобщение (ИДС)"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Пре&насяне"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Участници"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Автоматична проверка на правописа"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Rich Text Editing"
 msgstr "Информация за влизане"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Всички полет&а"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "Само&личност"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Речник"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Папка \"Изпратена\""
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "По&щенски транспорт"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&От"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Т&ема"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Добавяне на под&пис"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "&Премахване на подпис"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Вмъкване на подпи&с"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Правопи&с..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Правопис"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Шифроване на съоб&щение"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Шифроване"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Подписване на съобщение"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Подписване"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Формат на шифрованото съобщение"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "Тър&сене на съобщения..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Настройване на KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Скриване на лентата с менюто"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Ред: %1"
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Колона: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ВРХУ"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "ВМЪК"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Проверка на правописа: вкл."
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Проверка на правописа: изкл."
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "&Нов запис като чернова"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Запис като чернова"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2187,7 +2192,7 @@
 "Нов запис на съобщението в папка \"Чернови\". По-късно може да бъде "
 "изпратено по всяко време."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2196,62 +2201,62 @@
 "Запис на съобщението в папка \"Чернови\". По-късно може да бъде редактирано "
 "и изпратено."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Искате ли съобщението да бъде записано?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Затваряне на прозореца за съчиняване"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Autosave Message Failed"
 msgstr "Неуспешен автозапис"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Sending Message Failed"
 msgstr "Неуспешен автозапис"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "&Вмъкване на файл..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Добавяне като &прикрепен файл"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Име на прикрепен файл:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Attachment Name"
 msgstr "Невалидна е-поща"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Quoted Message"
 msgid "Add URL into Message"
@@ -2259,25 +2264,25 @@
 msgstr[0] "Цитирано съобщение"
 msgstr[1] "Цитирано съобщение"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Добавяне като &прикрепен файл"
 msgstr[1] "Добавяне като &прикрепени файлове"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, fuzzy, kde-format
 #| msgid "Paste as text or attachment?"
 msgid "Insert clipboard text as attachment"
 msgstr "Поставяне като прикрепен файл?"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "без име"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2289,12 +2294,12 @@
 "самоличност не е определила (OpenPGP или S/MIME) ключ.</p><p>Моля, направете "
 "от настройките на самоличността.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Неопределен шифроващ ключ"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2305,12 +2310,12 @@
 "(OpenPGP or S/MIME) ключ, който да бъде използван.</p><p>Моля, направете от "
 "настройките на самоличността.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Неопределен подписващ ключ"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2320,7 +2325,7 @@
 "Трябва да въведете вашата е-поща в полето \"От:\". Задайте е-пощата си за "
 "всички самоличности, за да не я въвеждате ръчно при всяко съобщение."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2332,37 +2337,37 @@
 "Трябва да посочите поне един получател в полето \"До\", \"Копие до\", или "
 "\"Скрито копие до\"."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Полето \"До\" е празно. Изпращане на съобщението въпреки това?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Полето \"До\" не е попълнено"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Не сте написали тема. Изпращане на съобщението въпреки това?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Няма тема"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Изпращане &както си е"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Задаване на тема"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2374,89 +2379,89 @@
 "Трябва да посочите поне един получател в полето \"До\", \"Копие до\", или "
 "\"Скрито копие до\"."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Подготовка за изпращане..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Изпращане на потвърждение"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Изпра&щане сега"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Твърде много получатели"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Изпращане &както си е"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, fuzzy, kde-format
 #| msgid "All Recipients"
 msgid "&Edit Recipients"
 msgstr "Всички получатели"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Lose Formatting"
 msgstr "Информация за влизане"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2464,7 +2469,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Send Confirmation"
 msgid "Plugin Editor Information"
@@ -2548,25 +2553,25 @@
 msgid "External editor was started."
 msgstr "Зареден е външен редактор"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2593,11 +2598,6 @@
 msgid "Message will not be encrypted"
 msgstr "Съобщението няма да бъде шифровано"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Участници (текст)"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2648,32 +2648,32 @@
 msgid "Cannot move messages."
 msgstr "1 ново съобщение в %2"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "Не е избрана папка"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Removed 1 old message from folder %2."
 #| msgid_plural "Removed %1 old messages from folder %2."
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Премахнато 1 старо съобщение от папка %2."
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Removed 1 old message from folder %2."
 #| msgid_plural "Removed %1 old messages from folder %2."
 msgid "Unable to return list of folders."
 msgstr "Премахнато 1 старо съобщение от папка %2."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "OpenPGP Message - Bad Signature"
 msgid "Messages archived"
@@ -2718,49 +2718,49 @@
 msgid "&Existing identities:"
 msgstr "С&ъществуващи самоличности:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Въведете нова ключова дума:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Редактиране на самоличност"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Общи"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "Вашето &име:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2772,12 +2772,12 @@
 "оставите това поле празно, вашето име няма да се показва; само електронния "
 "адрес.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Организация:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2789,12 +2789,12 @@
 "изпратените съобщения.</p><p>По-безопасно (и нормално) е да оставите полето "
 "празно.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Е-поща:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Email address</h3><p>This field should have your full email "
@@ -2811,13 +2811,13 @@
 "адрес.</p><p>Ако оставите полето празно или го попълните грешно, хората ще "
 "имат проблеми като ви отговорят.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 #| msgid "&Email address:"
 msgid "Email a&liases:"
 msgstr "&Е-поща:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2828,12 +2828,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Шифриране"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2855,12 +2855,12 @@
 "p><p>Можете да научите повече за ключовете на <a>http://www.gnupg.org</a></"
 "p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP ключ за подписване:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2884,12 +2884,12 @@
 "функции на пощата няма да бъдат засегнати.</p><p>Можете да научите повече за "
 "ключовете на <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP ключ за шифроване:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2902,12 +2902,12 @@
 "KMail няма да може да подписва съобщения използвайки S/MIME. Нормалните "
 "функции на пощата няма да бъдат засегнати.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME удостоверение за подписване:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2922,42 +2922,42 @@
 "полето празно, но KMail няма да може да подписва съобщенията чрез S/MIME; "
 "нормалните функции на пощата няма да бъдат засегнати.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME удостоверение за шифроване:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred crypto message format:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Предпочитан формат за шифровано съобщение:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "Автоматично подписване на съоб&щенията"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Автоматично шифроване на съоб&щенията"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Допълнителни"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Ад&рес за отговор:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2975,13 +2975,13 @@
 "отговор да отива към груповия адрес.</p><p>Ако се двоумите, оставете полето "
 "празно.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "Адреси за &скрити копия:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3006,12 +3006,12 @@
 "повече от един адрес, използвайте запетая за разделяне на получателите.</"
 "p><p>Ако се двоумите, оставете полето празно.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Адреси за &скрити копия:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3028,60 +3028,60 @@
 "повече от един адрес, използвайте запетая за разделяне на получателите.</"
 "p><p>Ако се двоумите, оставете полето празно.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Речник:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Па&пка за изпратени поща:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Папка за &чернови:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Папка за &шаблони:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr ""
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "Добавяне на \"заглавна част\" към съобщение"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "Преименуване..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr ""
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Домей&н по подразбиране:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Домей&н по подразбиране:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3090,35 +3090,35 @@
 "<qt><p> Домейнът по подразбиране се използва за допълване на пощенски адрес, "
 "който се състои само от име на потребител.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, fuzzy, kde-format
 #| msgid "&Use custom message templates"
 msgid "&Use custom message templates for this identity"
 msgstr "&Потребителски шаблони за съобщение"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Подпис"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Изображение"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Email Alias \"%1\""
 msgstr "Невалидна е-поща"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Невалидна е-поща"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3131,7 +3131,7 @@
 "Това може да доведе до предупреждаващи съобщения до получаващата страна, "
 "когато се опитат да проверят подписите, направени с тези настройки"
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3140,7 +3140,7 @@
 "Един от настроените OpenPGP ключове за шифроване не съдържа потребителско ID "
 "със съответния електронен адрес за тази самоличност (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3153,7 +3153,7 @@
 "Това може да доведе до предупреждаващи съобщения до получаващата страна, "
 "когато се опитат да проверят подписите, направени с тези настройки."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3162,22 +3162,22 @@
 "Едно от настроените S/MIME удостоверения за подписване не съдържа съответния "
 "електронен адрес за тази самоличност (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Електронният адрес не е открит в ключ/удостоверение"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Файлът за подпис е невалиден"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Редактиране на самоличност \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3189,7 +3189,7 @@
 "Потребителска папка за чернови за самоличност \"%1\" не съществува. Затова "
 "ще бъде използвана тази по подразбиране."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Редактиране..."
@@ -3225,6 +3225,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Изпращане на потвърждение"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3393,7 +3406,7 @@
 "Примери има на <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www."
 "xs4all.nl/~ace/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3427,7 +3440,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Добавяне в адресника"
@@ -3438,24 +3451,24 @@
 msgid "Contact created successfully"
 msgstr "Съобщението беше изтрито успешно."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Failed to store contact"
 msgstr "Грешка при създаване на сметка"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Сигурни ли сте, че искате кошчето да бъде изпразнено?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "New Folder"
 msgid "Attach Folder"
@@ -3687,7 +3700,7 @@
 msgstr "&Папка"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3695,7 +3708,7 @@
 msgstr "Прила&гане на всички филтри"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3721,7 +3734,7 @@
 msgstr "П&репращане"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Прилага&не на филтър"
@@ -3746,7 +3759,7 @@
 msgstr "&Помощ"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Главна лента с инструменти"
@@ -3801,45 +3814,45 @@
 msgid "The file does not contain a message."
 msgstr "Файлът не съдържа съобщение."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Файлът съдържа множество съобщения. Показано е само първото съобщение."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 #| msgid "Send Digest"
 msgid "Send As Digest"
 msgstr "Изпращане на извлечение"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Филтриране на съобщенията"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Филтриране на съобщение %1 от %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Преместване на съобщенията"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Изтриване на съобщенията"
@@ -3868,29 +3881,29 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail е изключена от мрежата. Всички задачи са преустановени."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "&Изпращане на поща"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Подготовка за изпращане..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail е включена в мрежата. Всички задачи са възстановени."
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3898,52 +3911,52 @@
 "connection is detected"
 msgstr "KMail е включена в мрежата. Всички задачи са възстановени."
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "В момента KMail не е включена в мрежата. Какъв режим ще изберете?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Вкл/Изкл"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Работа в мрежата"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Работа извън мрежа"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
 msgstr "KMail е включена в мрежата. Всички задачи са възстановени."
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "KMail е изключена от мрежата. Всички задачи са преустановени."
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Opening Autosave File Failed"
 msgstr "Неуспешен автозапис"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3954,7 +3967,7 @@
 "Тези %1 самоличности бяха променени да ползват пощенския транспорт по "
 "подразбиране:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3962,44 +3975,46 @@
 msgstr[0] "Самоличността бе променена да ползва пощенския транспорт:"
 msgstr[1] "Тези %1 самоличности бяха променени да ползва пощенския транспорт:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Изпращане на съобщения"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, fuzzy, kde-format
 #| msgid "Initiating sender process..."
 msgid "Initiating sending process..."
 msgstr "Инициализиране на процес за изпращане..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -4009,12 +4024,12 @@
 "Грешка при стартиране управлението на удостоверенията. Моля, проверете "
 "инсталацията си."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Грешка в Kmail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4024,29 +4039,29 @@
 "Грешка при стартиране управлението на удостоверенията. Моля, проверете "
 "инсталацията си."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start import wizard"
 msgstr "Грешка при създаване на сметка"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Грешка при стартиране управлението на удостоверенията. Моля, проверете "
 "инсталацията си."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Грешка при създаване на сметка"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4056,18 +4071,18 @@
 "Грешка при стартиране управлението на удостоверенията. Моля, проверете "
 "инсталацията си."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start ImportWizard"
 msgstr "Грешка при създаване на сметка"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
@@ -4075,52 +4090,52 @@
 "Грешка при стартиране управлението на удостоверенията. Моля, проверете "
 "инсталацията си."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Без тема"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(няма шаблони)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Папката няма настройки за срок на валидност"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Наистина ли искате да маркирате изтекла папката <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Маркиране на папка като изтекла"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Маркиране като изтекла"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Изпразване на кошчето"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Преместване в кошчето"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Сигурни ли сте, че искате кошчето да бъде изпразнено?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4129,29 +4144,29 @@
 "<qt>Сигурни ли сте, че искате всички съобщения от папка <b>%1</b> да бъдат "
 "преместени в кошчето?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Всички съобщения са преместени в кошчето"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr ""
 "Сигурни ли сте, че искате всички стари съобщения да бъдат маркирани като "
 "изтекли?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Маркиране на старите съобщения като изтекли?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Маркиране като изтекли"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4161,17 +4176,17 @@
 "Зареждането на външни препратки в html поща ще ви направи по-уязвими за спам "
 "и и може да увеличи риска от проблеми със сигурността."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Предупреждение за сигурността"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Зареждане на външни препратки"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4186,427 +4201,427 @@
 "<qt>Наистина ли искате маркираните %1 съобщения да бъдат изтрити?<br /"
 ">Веднъж изтрити, те повече не могат да бъдат възстановени.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Изтриване на съобщения"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Изтриване на съобщение"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Moving messages..."
 msgstr "Преместване на съобщенията"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Deleting messages..."
 msgstr "Изтриване на съобщенията"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, fuzzy, kde-format
 #| msgid "Messages deleted successfully."
 msgid "Messages deleted successfully."
 msgstr "Съобщението беше изтрито успешно."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved successfully."
 msgstr "Кореспонденцията беше преместена успешно"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Грешка при изтриване на съобщения."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Изтриването на съобщенията беше отменено."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Грешка при преместването на съобщения."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Преместването на съобщенията беше отменено."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Преместване на съобщенията в папка"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Копиране на писмата..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages copied successfully."
 msgstr "Кореспонденцията беше преместена успешно"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Copying messages failed."
 msgstr "Грешка при преместването на съобщения."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Copying messages canceled."
 msgstr "Преместването на съобщенията беше отменено."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, fuzzy, kde-format
 #| msgid "Copy Message to Folder"
 msgid "Copy Messages to Folder"
 msgstr "Копиране на съобщение в папка"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Moving messages to trash..."
 msgstr "Преместване на съобщение в кошчето"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Deleting and moving messages to trash..."
 msgstr "Преместване на съобщение в кошчето"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash successfully."
 msgstr "Кореспонденцията беше преместена успешно"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Кореспонденцията беше преместена успешно"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Moving messages to trash failed."
 msgstr "Грешка при преместването на съобщения."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Грешка при преместването на съобщения."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Moving messages to trash canceled."
 msgstr "Преместването на съобщенията беше отменено."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Преместването на съобщенията беше отменено."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Прескачане до папка"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "&Запис като..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Маркиране на всички папки като изтекли"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Пр&оверка на пощата"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Проверка за поща в"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Проверка за поща"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Изп&ращане на съобщенията от опашката"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, fuzzy, kde-format
 #| msgid "Onlinestatus (unknown)"
 msgid "Online status (unknown)"
 msgstr "Състояние в мрежата (неизвестно)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Изпращане на съобщенията от опашката с"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, fuzzy, kde-format
 #| msgid "Certificate Manager..."
 msgid "Certificate Manager"
 msgstr "Управление на удостоверенията..."
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages..."
 msgid "&Import Messages..."
 msgstr "&Импортиране на съобщения..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Търсене на грешки в Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Преглед филтрирането на &дневника..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Редактиране на отговорите \"Извън офиса\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "&Настройване на известяването..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Delayed Messages..."
 msgstr "Изтриване на съобщенията"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "Тър&сене на съобщения..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Изтриване"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Пр&еместване на нишка в кошчето"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Преместване на нишката в кошчето"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Изтриване на н&ишка"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Тър&сене на съобщения..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Ма&ркиране на всички съобщения"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Управление на &пощенски списък..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Настройване на пряк път..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Настройки за &изтичане"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "&Archive Folder..."
 msgstr "Н&ова папка..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Зареждане на въ&ншни препратки"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Message To..."
 msgstr "Ново съобщение до..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Move Message To..."
 msgstr "Ново съобщение до..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Ново съобщение..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Ново"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Съобщение от &шаблон"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "&Ново съобщение до пощенски списък..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "С&ъздаване на филтър"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Филтриране - \"&Тема\"..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Филтриране - \"&От\"..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Филтриране - \"&До\"..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Филтриране - \"&До\"..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Маркиране на ни&шка като"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "&Прочетена"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Маркиране на всички съобщения в избраната нишка като прочетени"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Н&епрочетена"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Маркиране на всички съобщения в избраната нишка като непрочетени"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "&Важна"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Размаркиране на нишката като &важна"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "&Действие"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 #| msgid "Remove &Action Item Message Mark"
 msgid "Remove &Action Item Thread Mark"
 msgstr "Размаркиране на съобщение като &действие"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Следена"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Игнорирана"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Запис на прикрепените файлове..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Decrypted To..."
 msgstr "Ново съобщение до..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Прила&гане на всички филтри"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4614,13 +4629,13 @@
 msgid "&Expand Thread / Group"
 msgstr "&Разгъване на нишка"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "Разгъване на текущата нишка"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4628,123 +4643,123 @@
 msgid "&Collapse Thread / Group"
 msgstr "С&гъване на нишка"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "Сгъване на текущата нишка"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Раз&гъване на всички нишки"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Разгъване на всички нишки в текущата папка"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Сгъване на вси&чки нишки"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Сгъване на всички нишки в текущата папка"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Показване на съобщение"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "След&ващо съобщение"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Преминаване към следващото съобщение"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "&Следващо непрочетено съобщение"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Следващо"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Преминаване към следващото непрочетено съобщение"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Пре&дишно съобщение"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Преминаване към предишното непрочетено съобщение"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Предишн&о непрочетено съобщение"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Предишно"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Преминаване към предишното непрочетено съобщение"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "С&ледваща непрочетена папка"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Преминаване към следващата папка с непрочетени съобщения"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Преди&шна непрочетена папка"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Преминаване към предишната папка с непрочетени съобщения"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Следващ непрочетен &текст"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Преминаване към следващия непрочетен текст"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4753,236 +4768,242 @@
 "Превъртане надолу на текущото съобщение. При достигане на краят му "
 "преминаване към следващото непрочетено съобщение."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "&Настройване на филтрите..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Управление на &Sieve скриптовете..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "&Add Account..."
 msgstr "Добавяне на бележка..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "В&ъведение в KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Показване стартовата страница на KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "&Настройване на известяването..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Настройване на KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Срок на годност..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Добавяне на папка с отметки..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr ""
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Прила&гане на всички филтри"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "&Настройване на KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "New AddressBook Contact..."
 msgstr "Отваряне в адресника"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Копиране на съобщение в папка"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to Folder..."
 msgstr "Прескачане до папка"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Прекъсване на текущата операция"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Фокусиране върху следващата папка"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Фокусиране върху предишната папка"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Избор на папка за фокусиране"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "Фокусиране върху следващата папка"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "Фокусиране върху следващата папка"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Фокусиране върху следващо съобщение"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Фокусиране върху предишно съобщение"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "Ма&ркиране на всички съобщения"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "Ма&ркиране на всички съобщения"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Избор на съобщения за фокусиране"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, fuzzy, kde-format
 #| msgid "Show Quick Search"
 msgid "Set Focus to Quick Search"
 msgstr "Показване на бързо търсене"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Фокусиране върху предишно съобщение"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Фокусиране върху следващо съобщение"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Преместване на съобщение в папка"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Настройки"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Restart"
+msgid "Restart Account"
+msgstr "Рестартиране"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Добавяне на папка с отметки"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Из&празване на кошчето"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Преместване на всички съобщения в ко&шчето"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Изтриване на търсене"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Редактиране на скрипт..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Филтър %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Searching..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Търсене..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4992,12 +5013,12 @@
 "Използването на HTML в писма ще ви направи по-уязвими към спам и може да "
 "увеличи риска от проблеми със сигурността."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Използване на HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -5007,192 +5028,192 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "&Cancel"
 msgid "Cancel"
 msgstr "О&тказ"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Стартиране..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "П&реместване в кошчето"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Кошче"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Преместване на съобщение в кошчето"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "1 new message in %2"
 #| msgid_plural "%1 new messages in %2"
 msgid "Cannot copy item. %1"
 msgstr "1 ново съобщение в %2"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Ново съобщение до..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Отговор до..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Препращане до..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Add to Existing Contact"
 msgstr "Грешка при създаване на сметка"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Отваряне в адресника"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Отбелязване на тази препратка"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Редактиране на контакт..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Запис на препратка като..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "Тър&сене в съобщение..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "Запис на препратка като..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr ""
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "Запис на препратка като..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "Поддръжка на GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "Потвър&ждение преди изпращане"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "Пощенски клиент за KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Mailinglist Folder Properties"
 msgid "Retrieving Folder Contents"
 msgstr "Настройки на папка за пощенски списък"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Моля, изчакайте"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "Работа извън мрежа"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5206,7 +5227,7 @@
 "изключена от мрежата. Натиснете <a href=\"kmail:goOnline\">тук</a>, за да я "
 "включите. . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5220,23 +5241,23 @@
 "изключена от мрежата. Натиснете <a href=\"kmail:goOnline\">тук</a>, за да я "
 "включите. . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Contact modified successfully"
 msgstr "Кореспонденцията беше преместена успешно"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Нови съобщения в"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Няма непрочетени писма"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, fuzzy, kde-format
 #| msgid "Unread Message"
 msgid "1 unread message"
@@ -5260,8 +5281,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5355,19 +5376,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Контакти"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5416,27 +5437,27 @@
 msgid "All"
 msgstr "Всички"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5465,7 +5486,7 @@
 msgid "&Reply"
 msgstr "&Отговор"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Отговор..."
@@ -5475,12 +5496,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Отговор до ав&тора..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Отговор до вс&ички..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Отговор до пощенски &списък..."
@@ -5511,7 +5532,7 @@
 msgid "&Edit As New"
 msgstr "Редактиране на с&ъобщение"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5714,113 +5735,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Търсене на съобщения"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Търсене"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Вградено..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Като п&рикрепен файл..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Запис на прикрепени файлове..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Изчистване на избор"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "Прескачане до папка"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 съвпадение"
 msgstr[1] "%1 съвпадения"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Последно търсене"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Търсене..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "1 new message in %2"
 #| msgid_plural "%1 new messages in %2"
 msgid "Cannot get search result. %1"
 msgstr "1 ново съобщение в %2"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "Търсенето е отменено"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search complete."
 msgstr "Търсенето е отменено"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgctxt ""
 #| "@info/plain Displayed grayed-out inside the textbox, verb to search"
@@ -5828,7 +5849,7 @@
 msgid "Search stopped."
 msgstr "Търсене"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5836,7 +5857,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, fuzzy, kde-format
 #| msgid "Copy Messages"
 msgid "Copy Message"
@@ -5844,7 +5865,7 @@
 msgstr[0] "Копиране на съобщенията"
 msgstr[1] "Копиране на съобщенията"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, fuzzy, kde-format
 #| msgid "Cut Messages"
 msgid "Cut Message"
@@ -5852,7 +5873,7 @@
 msgstr[0] "Изтриване на съобщенията"
 msgstr[1] "Изтриване на съобщенията"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Checking index status..."
@@ -5989,7 +6010,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5997,7 +6018,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -6007,19 +6028,19 @@
 "KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Показване на лента бързо търсене"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Warn if the number of recipients is more than:"
@@ -6027,7 +6048,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -6036,20 +6057,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "Потвър&ждение преди изпращане"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Автоматично и&скане на известие за доставка на съобщение (ИДС)"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -6066,13 +6087,13 @@
 "съобщение</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Интервал на автозапис:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -6084,155 +6105,155 @@
 "автозаписа като зададете стойност 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "Показване на панела за управление на участници в прозореца за съчиняване."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Прозорец за преглед на съобщения"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, fuzzy, kde-format
 #| msgid "&Do not show a message preview pane"
 msgid "Do not show a message preview pane"
 msgstr "Б&ез прозорец за предварителен преглед"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane belo&w the message list"
 msgid "Show the message preview pane below the message list"
 msgstr "Показване на прозореца за преглед по&д списъка със съобщения"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane ne&xt to the message list"
 msgid "Show the message preview pane next to the message list"
 msgstr "Показване на прозореца за преглед д&о списъка със съобщения"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Списък с папки"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Дълъг списък с папки"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Кратък списък с папки"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Шаблон за нови съобщения"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Шаблон за отговор"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Шаблон за отговор до всички"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Шаблон за препращане"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Символи за цитиране"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6240,7 +6261,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6248,7 +6269,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6256,7 +6277,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6264,7 +6285,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6272,7 +6293,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6564,7 +6585,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6932,10 +6953,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Проверка за поща в"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7618,6 +7638,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Включване отново на предупрежденията \"Изключване въпроса\""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7681,6 +7711,14 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#~ msgid "Text Snippets"
+#~ msgstr "Участници (текст)"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Проверка за поща в"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Име и размер на папка когато е близо до квотата"
 
@@ -9150,9 +9188,6 @@
 #~ msgid "R&emove"
 #~ msgstr "И&зтриване"
 
-#~ msgid "Restart"
-#~ msgstr "Рестартиране"
-
 #, fuzzy
 #~| msgid "New Message To..."
 #~ msgid "Message Delayed..."
diff -Nru kmail-19.04.3/po/bs/akonadi_archivemail_agent.po kmail-19.12.3/po/bs/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/bs/akonadi_archivemail_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/bs/akonadi_archivemail_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2014-01-31 18:56+0100\n"
 "Last-Translator: Samir Ribić <megaribi@epn.ba>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -183,12 +183,12 @@
 "Ne mogu dodati drugu arhivu za ovu fasciklu. Umjesto toga se mijenja "
 "postojeća."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Počni arhivirati %1"
diff -Nru kmail-19.04.3/po/bs/akonadi_followupreminder_agent.po kmail-19.12.3/po/bs/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/bs/akonadi_followupreminder_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/bs/akonadi_followupreminder_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2013-10-24 06:02+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -20,85 +20,85 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
@@ -106,12 +106,12 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr ""
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr ""
diff -Nru kmail-19.04.3/po/bs/akonadi_mailfilter_agent.po kmail-19.12.3/po/bs/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/bs/akonadi_mailfilter_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/bs/akonadi_mailfilter_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2013-10-19 23:24+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -25,17 +25,17 @@
 msgid "Filter Log Viewer"
 msgstr "Kriteriji filtera"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Zabilježi aktivnosti filtera"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -45,23 +45,23 @@
 "dnevnik. Naravno, podaci se prikupljaju i prikazuju samo kada je bilježenje "
 "uključeno. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalji bilježenja"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Zapiši opis uzorka"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Zapiši procjenu &pravila filtera"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -75,34 +75,34 @@
 "detaljne podatke za svako pojedinačno pravilo. U suprotnom, dobićete "
 "informacije samo o rezultatu procjene svih pravila određenog filtera."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Zapiši procjenu uzorka filtera"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Zapiši akcije filtera"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Ograničenje veličine dnevnika:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "neograničeno"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -115,7 +115,7 @@
 "ako veličina prikupljenih podataka pređe ovo ograničenje, biće odbačeni "
 "najstariji podaci dok dnevnik ne bude manji od ograničenja. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -124,64 +124,64 @@
 "Ne mogu pisati u datoteku %1:\n"
 "\"%2\" je detaljan opis greške."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail greška"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtriram poruku %1 od %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, fuzzy, kde-format
 #| msgid "Error applying mail filter delete"
 msgid "Error applying mail filter move"
 msgstr "Greška pri korištenju filtera za brisanje"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Greška pri korištenju filtera za brisanje"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Greška u primjeni modifikacije filtera pošte"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Procjenjujem pravila filtera:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Pravila filtera se poklapaju.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Počni filtirrati poruku \"%1\" od \"%2\" na \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtriram poruke"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Dnevnik filtera pošte aktivan"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Spremno"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtriram u %1"
diff -Nru kmail-19.04.3/po/bs/akonadi_sendlater_agent.po kmail-19.12.3/po/bs/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/bs/akonadi_sendlater_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/bs/akonadi_sendlater_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: okular\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2013-11-09 20:08+0000\n"
 "Last-Translator: Nermina Agović <nagovic1@etf.unsa.ba>\n"
 "Language-Team: Bosanski <lokal@lugbih.org>\n"
@@ -62,57 +62,57 @@
 msgid "Your emails"
 msgstr "Samir.ribic@etf.unsa.ba,lbajgoric1@etf.unsa.ba,nagovic1@etf.unsa.ba"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Prima"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Naslov"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Poslano oko"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Ponavljajući"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID poruke"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Nema poruka na čekanju..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Šalji sada"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Obriši"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Da"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Ne"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected items? Do you want to continue?"
 msgid "Do you want to delete the selected item?"
@@ -121,68 +121,68 @@
 msgstr[1] "Želite li obrisati odabrane objekte? Želite li nastaviti?"
 msgstr[2] "Želite li obrisati odabrane objekte? Želite li nastaviti?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Ukloni objekte"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Da li želiš ukloniti i ovu poruku?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Ukloni poruke"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Nema nađene poruke."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, fuzzy, kde-format
 msgid "No message found."
 msgstr "Nema nađene poruke."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Greška pri dobavljanju poruke."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Ne može donijeti poruku. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Ne možemo formirati transport"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Poruka nije realna poruka"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Nemoguće poslati poruku."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Poruka poslana"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Nađena greška. Želite li ponovo poslati?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Nađena greška"
diff -Nru kmail-19.04.3/po/bs/kmail.po kmail-19.12.3/po/bs/kmail.po
--- kmail-19.04.3/po/bs/kmail.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/bs/kmail.po	2020-03-03 00:33:55.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2014-02-08 00:17+0100\n"
 "Last-Translator: Samir Ribić <megaribi@epn.ba>\n"
 "Language-Team: Bosanski <bs@li.org>\n"
@@ -203,8 +203,8 @@
 msgstr "Višestruki enkripcijski ključevi po adresi"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -311,27 +311,27 @@
 "KMail nije mogao otkriti mailing listu u ovom fasciklu. Molim ručno unesite "
 "potrebne adrese."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Upotreba:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% puno"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 KiB used"
 msgid "%1 of %2 used"
@@ -355,7 +355,7 @@
 "želite da pridružite ovojm fasciklu.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Šabloni"
@@ -366,109 +366,109 @@
 msgstr "&Koristi vlastite šablone poruka u ovom direktoriju"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopiraj globalne predloške"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Pogled"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Koristi vlastite &ikone"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normalno:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "N&epročitana:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Prikaži kolonu pošiljaoca/primaoca u listi poruka"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Pri&kaži kolonu:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Podrazumijevano"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Pošiljalac"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Primalac"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Popis poruka"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Koristi podrazumijevanu agregaciju"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregacija"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Koristi podrazumijevanu temu"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Message Delayed..."
 msgid "Message Default Format"
 msgstr "Poruka odložena..."
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "Koristi HTML umjesto običnog teksta"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "Preferiraj &HTML umjesto čistog teksta"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Use Global Settings"
@@ -479,103 +479,108 @@
 msgid "Retrieval Options"
 msgstr "Opcije dobavljanja"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Identitet"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Preuzimam"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Šaljem"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Izlazni računi (dodajte barem jedan):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Uobičajene opcije"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Potvrda &prije slanja"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Provjeri pravopis prije slanja"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nikad automatski"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Pri ručnoj provjeri pošte"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Pri svakoj provjeri pošte"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Pošalji odmah"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Pošalji kasnije"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Pošalji poruke iz &Outboxa:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Podrazumjevana metoda slanja:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "Add Mail Account..."
 msgstr "Dodaj bilješku..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "Prilagodi redoslijed naloga"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -583,30 +588,30 @@
 "properly installed."
 msgstr "Ne mogu pokrenuti čarobnjak za naloge. Provjerite vašu instalaciju."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Ne mogu pokrenuti čarobnjaka za nalog."
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Uključi ručnu provjeru pošte"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Uključi rad van mreže pri napuštanju KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Provjeri poštu pri pokretanju"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -666,7 +671,7 @@
 msgid "Fixed Width Font"
 msgstr "Font fiksne širine"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Sastavljač"
@@ -972,73 +977,73 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Ne možemo kreirati karticu. Kartica s istim imenom već postoji."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Opšte"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardni šabloni"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Prilagođeni šabloni"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Tema"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Kodiranje"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Prilozi"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Automatsko ispravljanje"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Automatski raširi sliku"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Potpis"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr "Automatski umetni podešen potpis kada počinješ pisanje poruke"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Ubaci potpis iznad bilo kojeg citiranog teksta"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1047,18 +1052,18 @@
 "Umetni RFC-usaglašen  separator potpisa (dvije crtice i razmak u liniji) "
 "prije potpisa"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Kada odgodovaram, ne citiraj postojeće potpise"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1068,7 +1073,7 @@
 "Kada odgovaram,samo citiraj izabrani tekst (umjesto cijele poruke) teskt je "
 "izabran u prozoru poruke"
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1080,17 +1085,17 @@
 "čak i kada je red kreiran dodavanjem dodadnog kraja reda  \n"
 "prilikom formiranja izraza u tekstu."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Omogući automatsko formiranje izraza određenih sa"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Podesi širinu teksta za automatsko formiranje izraza"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1102,7 +1107,7 @@
 "Iko nije označeno,odgovor će biti kao običan tekst prema zadanim "
 "podešavanjima."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1112,34 +1117,34 @@
 "Formatiraj jednostavni dio teksa poruke od HTML oznake.\n"
 "Podebljano,italik, i podvučeni tekst,liste,i eksterne oznake su podržane."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Utkano"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Kao prilog"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Podesi zadani format proslijeđene poruke"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tip zadanog proslijeđivanja:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Primaoci"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1150,17 +1155,17 @@
 "Možete odabrati ovo na po-poruku osnovi koristeći \"Opcije-Zahtjevam "
 "obavještenje o rasporedu\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Upozori ako je previše primaoca određeno"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Podesi maksimalni broj primaoca za upozorenje"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1177,7 +1182,7 @@
 "Primijetite, ipak, da to ne uzima u obzir distribuciju listama\n"
 "ili mailing liste."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1186,18 +1191,18 @@
 "Zapamti upravo unesene adrese,\n"
 "i ponudi ih za popunjavanje primatelja"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Ne spašavaj"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Maksimalno nedavnih adresa zadržano:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1206,25 +1211,25 @@
 "Maksimalan broj nedavno unešenih adresa koje će biti zapamćene za "
 "popunjavanje"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Uredi redoslijed dovršavanja..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Nema auto-snimanja"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Nema auto-snimanja"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1233,18 +1238,18 @@
 msgstr[1] " minute"
 msgstr[2] " minuta"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Automatski spasi poruku u određenom intervalu"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefiks za temu &odgovora"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1253,59 +1258,59 @@
 "Prepoznaj bilo koji niz sljedećih prefiksa\n"
 "(unesite regularne izraze bez razlikovanja velikih i malih slova):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Dodaj..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Ukloni"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Izm&ijeni..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Unesite novi prefiks odgovora:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefiksi &teme proslijeđivanja"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Dodaj..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Ukloni"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Izmijeni..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Unesite novi prefiks proslijeđivanja:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1315,90 +1320,90 @@
 "tražeći skup znakova koji sadrži sve potrebne znakove."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Iz&mijeni..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Unesite skup znakova:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Čuvaj originalni skup znakova pri odgovoru ili proslijeđivanju (ako je "
 "moguće)."
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Ovaj skup znakova nije podržan."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Koristi vlastiti message-id sufiks"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Vlastiti message-&id sufiks:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definišite vlastita polja mime zaglavlja:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Naziv"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Vrijednost"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&vo"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Naziv:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Vrijednost:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid header"
 msgstr "Pogrešna e-mail adresa"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Imenovanje priloga kompatibilno sa Outlook-om"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1407,42 +1412,42 @@
 "Uključite ovu opciju kako biste postigli da Outlook(tm) razumije imena "
 "priloga koja sadrže ne-engleske znakove"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Uključi prepoznavanje nedostajućih priloga"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Prepoznaj bilo koju od sljedećih ključnih riječi kao pokušaj dodavanja "
 "priloga:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Unesite novu ključnu riječ:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "Attachments"
 msgid "Maximum Attachment Size:"
 msgstr "Prilozi"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Bez ograničenja"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1536,7 +1541,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Sastavljač"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1654,7 +1659,7 @@
 msgid "Archive Folder"
 msgstr "Arhiviraj fasciklu"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1720,7 +1725,7 @@
 msgid "Notification"
 msgstr "Obavijest"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1728,12 +1733,12 @@
 msgstr[1] "%1 priloga (%2)"
 msgstr[2] "%1 priloga (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Sakrij listu priloga"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Prikaži listu priloga"
@@ -1750,333 +1755,333 @@
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Odaberite riječnik koji se koristi prilikom provjere pravopisa u ovoj poruci"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Odaberite fasciklu za poslatu poštu  gdje se čuva kopija ove poruke"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Odaberite odlazni nalog za slanje ove poruke"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Postavi \"Od:\" adresu elektronske pošte za tu poruku"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Postavi temu za tu poruku"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitet:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Rječnik:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Direkorij za po&slatu poštu:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Transport pošte:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Od:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Te&ma:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Pošalji poštu"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Pošalji poštu p&reko"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Pošalji"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Pošalji &kasnije"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Pošalji kasnije pr&eko"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Red čekanja"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Snimi kao &nedovršenu"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Snimi poštu u Draft fascikli"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Snimi kao ša&blon"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Snimi poštu u fascikli šablona"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Snimi kao datoteku"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Snimi poštu kao tekstualnu ili HTML datoteku"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Ubaci tekstualnu datoteku..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Ubaci nedavnu tekstualnu datoteku"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adresar"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Otvori u adresaru"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nova poruka"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Izaberite &primaoce..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Snimi &distribucionu listu..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Umetni kao pri&log"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Očisti razmake"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "K&oristi fiksni font"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Hitno"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Zatraži obavijest o stanju poruke"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Zatraži obavijest o stanju poruke"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Prijelom riječi"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Isječci"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatska provjera pravopisa"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Bogato uređenje teksta"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Bogati tekst"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "(De)aktiviraj režim uređivanja bogatog teksta"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Sva &polja"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitet"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Rječnik"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Direktorij za p&oslatu poštu"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Mail Transport"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Od"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "T&ema"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Dodaj po&tpis"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Stavi p&otpis"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Umetni potpis na položaju &kursora"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Provjera pravopisa..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Provjera pravopisa"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Ši&friraj poruku"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Kriptuj"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Potpiši poruku"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Potpiši"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Smještajni forma:"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Odaberite kriptografski format za ovu poruku"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Pronađi poruke..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Podesi KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2084,53 +2089,53 @@
 msgstr ""
 "<qt>Ovo će potpuno sakriti meni. Možete ga ponovo uključiti kucajuči %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Sakrij meni"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linija: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolona: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Provjera pravopisa: uključena"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Provjera pravopisa: isključena"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Ponovo &snimi kao šablon"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Snimi kao nacrt"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2139,7 +2144,7 @@
 "Ponovo snimi ovu poruku u fascikl za šablone. Tada se može upotrijebiti "
 "kasnije."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2148,60 +2153,60 @@
 "Snimi ovu poruku u fascikl za nedovršene poruke. Tada se može urediti i "
 "poslati kasnije."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Da li želite snimiti poruku za kasnije ili je poništiti?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "&Nova poruka"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Snimanje poruke neuspjelo"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Slanje poruke neuspjelo"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert Text File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "&Ubaci tekstualnu datoteku..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Dodaj kao ugrađenu sl&iku"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Dodaj kao dod&atak"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Ime priloga:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Attachment Name"
 msgstr "Pogrešna e-mail adresa"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2209,7 +2214,7 @@
 msgstr[1] "Dodaj URL-ove u poruku"
 msgstr[2] "Dodaj UR-ove u poruku"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2217,17 +2222,17 @@
 msgstr[1] "Dodaj datoteke kao &Prilog"
 msgstr[2] "Dodaj datoteke kao &Prilog"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Umetni tekst međuspremnika kao dodatak"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "bez imena"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2240,12 +2245,12 @@
 "šifrovanje koji biste koristili za ovo.</p><p>Molim izaberite ključeve koje "
 "ćete koristiti u konfiguraciji identiteta.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Ključ enkripcije nije definisan"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2257,12 +2262,12 @@
 "ključ koji će biti korišten sa trenutnim identitetom u postavkama identiteta."
 "</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nije definisan ključ za potpisivanje"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2273,7 +2278,7 @@
 "e-mail adresu za sve identitete, tako da je ne morate unositi za svaku "
 "poruku posebno."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2281,59 +2286,59 @@
 msgstr ""
 "Morate navesti bar jednog primaoca, bilo u Za: polje ili CC ili kao BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Za: polje je prazno. Poslati poruku svakako?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Za: nije navedeno"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Niste upisali temu"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Pošalji &kao što jeste"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Navedi temu"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Morate navesti bar jednog primaoca kako biste mogli šifrovati nacrt"
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Spremam se poslati e-mail..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Potvrda slanja poruke"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Pošalji &odmah"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2342,22 +2347,22 @@
 "Pokušavate da pošaljete poruku za više od %1 primaoca. Poslati poruku "
 "svakako?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Previše primaoca"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Pošalji &kao što jeste"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Uredi Primaoce"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2365,43 +2370,43 @@
 msgstr ""
 "Gašenjem HTML će uzrokovati da tekst izgubi oblikovanje. Da li ste sigurni?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Izgubiti oblikovanje?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Izgubiti oblikovanje"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Dodaj obični tekst za označavanje"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2409,7 +2414,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Send Confirmation"
 msgid "Plugin Editor Information"
@@ -2487,27 +2492,27 @@
 msgid "External editor was started."
 msgstr "Vanjski editor je pokrenut."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Arhivna fascikla nije definisana. Provjerite postavke za nalog"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Arhivna fascikla nije definisana. Provjerite postavke za nalog"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid ""
@@ -2535,11 +2540,6 @@
 msgid "Message will not be encrypted"
 msgstr "Poruka neće biti šifrovana"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Isječci teksta"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2585,27 +2585,27 @@
 msgid "Cannot move messages."
 msgstr "Ne mogu pomjeriti poruke."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Ne mogu dohvatiti fasciklu. Javljena greška: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Nijedan direktorij nije vraćen"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Ne mogu dohvatiti roditeljsku fasciklu. Javljena greška: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Ne mogu dohvatiti listu fascikli."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Poruke su arhivirane"
@@ -2647,49 +2647,49 @@
 msgid "&Existing identities:"
 msgstr "&Postojeći identiteti:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Unesite novu ključnu riječ:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Izmijeni identitet"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Opšte"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Vaše ime:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2701,12 +2701,12 @@
 "ostavite ovo polje praznim, umjesto vašeg pravog imena ispisivaće se vaša e-"
 "mail adresa.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zacija:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2717,12 +2717,12 @@
 "ako želite da bude prikazano u zaglavlju e-pošte koja je poslana.</"
 "p><p>Sigurno je( i normalno ) ostaviti ovo prazno.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Email adresa:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2737,12 +2737,12 @@
 "alias adresu u polje ispod.</p><p>Ako ovo polje ostavite prazno, ili da je "
 "pogrešno, ljudi će imati problema da van odgovaraju.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Email a&liasi:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2759,12 +2759,12 @@
 "org<br>last@example.org</td></tr></table><p>Unesite jednu alias adresu po "
 "liniji.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kriptografija"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2786,12 +2786,12 @@
 "utjecati na normalne e-mail funkcije.</p><p>Možete saznati više o ključevima "
 "na <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP ključ za potpisivanje:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2815,12 +2815,12 @@
 "koristeći OpenPGP; normalne funkcije e-pošte neće biti djelotvorne.</"
 "p><p>Možete više naći o ključevima na <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP ključ:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2834,12 +2834,12 @@
 "KMail neće biti u stanju da kriptografski potpisuje poruke. Ovo neće "
 "utjecati na normalne e-mail funkcije.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Slanje certifikata"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2854,40 +2854,40 @@
 "u stanju da šifruje izlazne poruke za vas koristeći S/MIME. Ovo neće "
 "utjecati na normalne e-mail funkcije.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME certifikat za šifrovanje:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Željeni format:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Automatski potpiši poruke"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Automatski š&ifriraj poruke kad god je moguće"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Napredno"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Reply-To adresa:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2905,12 +2905,12 @@
 "</tt>, ali da odgovori idu na adresu čitave grupe.</p><p>Ako niste sigurni, "
 "ostavite polje praznim.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&CC adrese:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2927,12 +2927,12 @@
 "razdvajanje liste CC primalaca.</p><p>Ako ste u sumnji, ostavite ovo polje "
 "prazno.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC adrese:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2949,58 +2949,58 @@
 "koji pripada vama.</p><p>Ako niste sigurni, ostavite ovo polje praznim.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "R&ječnik:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Direktorij p&oslanih poruka:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Direktorij &nacrta:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Direktorij za ša&blone:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Otvoren nalog:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Dodaj vizitkartu poruci."
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Kreiraj..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Jezik autokorekcije:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Po&drazumjevana domena:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Po&drazumjevana domena:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3009,33 +3009,33 @@
 "<qt> <p>Podrazumijevana domena se koristi za dovršavanje email adresa koje "
 "sadrže samo korisničko ime.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Koristi obične šablone poruka za ovaj identitet"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Potpis"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Slika"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Pogrešan alias e-maila \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Pogrešna e-mail adresa"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3048,7 +3048,7 @@
 "Ovo može rezultirati porukama upozorenja na strani primatelja kada pokuša "
 "provjeriti potpise napravljene ovom konfiguracijom."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3057,7 +3057,7 @@
 "Jedan od podešenih OpenPGP ključeva za šifrovanje ne sadrži ID korisnika sa "
 "podešenom e-mail adresom za ovaj identitet (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3070,7 +3070,7 @@
 "Ovo može rezultirati porukama upozorenja na strani primatelja kada pokuša "
 "provjeriti potpise napravljene ovom konfiguracijom."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3079,22 +3079,22 @@
 "Jedan od podešenih S/MIME ključeva za šifrovanje ne sadrži ID korisnika sa "
 "podešenom e-mail adresom za ovaj identitet (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-mail adresa nije pronađena u ključu/certifikatu"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Datoteka potpisa nije ispravan"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Izmijeni identitet \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3106,7 +3106,7 @@
 "Vlastiti fascikl nacrta za identitet \"%1\" (više) ne postoji. Stoga će biti "
 "korišten uobičajeni fascikl za nacrte."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Izmijeni..."
@@ -3138,6 +3138,19 @@
 msgid "We cannot delete vCard file."
 msgstr "Ne možemo obrisati vcard datoteku."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Potvrda slanja poruke"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3306,7 +3319,7 @@
 "Primjeri su dostupni na <a href=\"http://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Slika"
@@ -3340,7 +3353,7 @@
 msgstr[1] "Distribucijske liste %2 su prazne, ne mogu se koristiti."
 msgstr[2] "Distribucijske liste %2 su prazne, ne mogu se koristiti."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Dodaj u adresar"
@@ -3350,22 +3363,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakt uspješno kreiran."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kontaktna adresa se ne može smjestiti: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Neuspješno čuvanje kontakt informacija."
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Da li ste sigurni da želite dodati ovu fasciklu  \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Dodaj fasciklu"
@@ -3582,7 +3595,7 @@
 msgstr "Di&rektorij"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3590,7 +3603,7 @@
 msgstr "Staviti sve prečišćavače ma direktorij"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3616,7 +3629,7 @@
 msgstr "P&roslijedi:"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Primijeni &filter"
@@ -3641,7 +3654,7 @@
 msgstr "&Pomoć"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Glavna alatna traka"
@@ -3698,12 +3711,12 @@
 msgid "The file does not contain a message."
 msgstr "Datoteka ne sadrži poruku."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Datoteka sadrži više poruka. Prikazana je samo prva poruka."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3712,32 +3725,32 @@
 "Da li želite da proslijedite odabrane poruke kao dodatke u jednoj poruci "
 "(kao MIME zbirni dokument) ili kao posebne poruke?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Pošalji kao zbirni dokument"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Pošalji posebno"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtriram poruke"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtriram poruku %1 od %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Obriši poruke"
@@ -3766,29 +3779,29 @@
 msgid "Text Direction Toolbar"
 msgstr "Alatna traka pravca teksta"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail je podešen da bude van veze; svi mrežni poslovi su suspendovani"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "&Pošalji poštu"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Spremam se poslati e-mail..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail je podešen da bude na vezi; svi mrežni poslovi su nastavljeni"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3797,38 +3810,38 @@
 "KMail je postavljen da radi na mreži; svi mrežni poslovi će se nastaviti "
 "kada se prepozna mrežna konekcija"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail je trenutno van veze. Kako želite da se nastavi?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Na vezi/van veze"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Radi na vezi"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Radi van veze"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Mrežna konekcija prepoznata, mrežni poslovi su oporavljeni"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Nijedna mrežna konekcija nije prepoznata, mrežni poslovi su suspendovani"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3837,12 +3850,12 @@
 "Neuspjelo otvaranje datoteke automatskog snimanja %1.\n"
 "Razlog: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Neuspjelo otvaranje datoteke automatskog snimanja"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3854,7 +3867,7 @@
 msgstr[2] ""
 "Ovih %1 identiteta je izmijenjeno da koriste podrazumijevani transport:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3863,45 +3876,47 @@
 msgstr[1] "Ova %1 identiteta su izmijenjena da koriste izmijenjeni transport:"
 msgstr[2] "Ovih %1 identiteta je izmijenjeno da koriste izmijenjeni transport:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "na &dolazne poruke"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Iniciram proces slanja"
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, fuzzy, kde-format
 #| msgid "Resource %1 is broken. This resource is now %2"
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Resurs %1 je oštećen. Taj resurs je sada %2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Agent za arhiviranje pošte nije registrovan."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Agent za kasnije slanje pošte nije registrovan."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Send Later Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr "Agent za kasnije slanje pošte nije registrovan."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3911,12 +3926,12 @@
 "Ne mogu pokrenuti upravitelj certifikatima. Molim provjerite vašu "
 "instalaciju."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail greška"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3926,26 +3941,30 @@
 "Nije moguće pokretanje uvezenog čarobnjaka. Molimo provjerite vašu "
 "instalaciju."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Nije moguće pokrenuti čarobnjaka za uvoz"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Nije moguće pokretanje programa za izvoz PIM postavki. Molimo provjerite "
 "vašu instalaciju."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Nije moguće pokrenuti programa za uvoz PIM postavki"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3955,74 +3974,74 @@
 "Nije moguće pokretanje uvezenog čarobnjaka. Molimo provjerite vašu "
 "instalaciju."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Nije moguće pokrenuti čarobnjaka za uvoz"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Drugi  poštanski program je pronađen na sistemu. Želite li uvesti podatke iz "
 "njega?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Nije moguće pokretanje uvezenog čarobnjaka. Molimo provjerite vašu "
 "instalaciju."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Nema teme"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(nema šablona)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Ovaj fascikl nema podešenu opciju za brisanje starih poruka"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Da li ste sigurni da želite brisati stare poruke u fasciklu <b>%1</b>?</"
 "qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Briši stare poruke"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Briši stare"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Premjesti u smeće"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Da li ste sigurni da želite isprazniti fascikl sa smećem?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4031,27 +4050,27 @@
 "<qt>Da li ste sigurni da želite premjestiti sve poruke iz fascikla <b>%1</b> "
 "u smeće?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Premjestio sam sve poruke u smeće"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Da li ste sigurni da želite pobrisati sve stare poruke?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Briši stare poruke?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Briši stare"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4062,17 +4081,17 @@
 "„spam“ i može povećati verovatnoću da će vaš sistem biti kompromitovan "
 "drugim prisutnim i očekivanim bezbijednosnim zloupotrebama."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Sigurnosno upozorenje"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Učitaj spoljne reference"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4090,539 +4109,539 @@
 "<qt>Da li stvarno želite da obrišete %1 odabranih poruke?<br />Jednom "
 "obrisane, ne mogu biti vraćene.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Obriši poruke"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Obriši poruku"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Premještanje poruka..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Brisanje poruka..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Poruke su uspješno obrisane."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Poruke premještene uspješno."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Brisanje poruka nije uspelo."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Brisanje poruka je otkazano."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Premještanje poruka prekinuto."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Premjesti poruke u direkorij"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopiram poruke..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Poruke kopirane uspješno."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Kopiranje poruka neuspjelo."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopiranje poruka otkazano."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopiraj poruke u fasciklu"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Sklanjanje poruka u smeće..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Sklanjanje poruka u smeće..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Poruke sklonjene u smeće uspješno."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Poruke sklonjene u smeće uspješno."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Sklanjanje poruka u smeće nije uspjelo."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Sklanjanje poruka u smeće nije uspjelo."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Sklanjanje poruka u smeće otkazano."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Sklanjanje poruka u smeće otkazano."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Skoči do fascikla"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Snimi &kao..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Briši stare poruke u &svim fasciklima"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Provjeri &poštu"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Provjeri poštu u"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Provjeri poštu"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Pošalji po&redane poruke"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Stanje na mreži (nepoznato)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Pošalji spremljene poruke preko"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Upravljač certifikatima"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Uvezi Poruke..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Ispravljanje Sieve-a..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filtriraj &preglednik dnevnika..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Izmijeni automatske odgovore..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Konfiguriši automatsko arhiviranje"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "Brisanje poruka..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Pronađi poruke..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Obriši"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Pr&emjesti lanac u smeće"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Premjesti lanac u kantu za smeće"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Obriši &lanac"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Pronađi poruke..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Izaberi &sve poruke"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Upravljanje diskusionom listom..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Dodijeli prečicu..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Postavke ist&eka"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arhiviranje fascikle..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Učitaj spoljne re&ference"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopiraj poruku u..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Pomjeri poruku u..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nova poruka..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nova"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "&Šablon za pošiljaoca poruke"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nova poruka na &mailing listu..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Napravi filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filter na &temu..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filter na &pošiljaoca..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filter na p&rimaoca..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Filter na p&rimaoca..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Označi &thread"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Označi thread kao &pročitan"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Označi sve poruke u izabranom threadu kao pročitane"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Označi thread kao n&epročitan"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Označi sve poruke u izabranom threadu kao nepročitane"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Označi thread kao &važan"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Ukloni oznaku &Važan thread"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Označi lanac kao &akcionu stavku"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Ukloni oznaku &akcionog sa lanca"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Prati thread"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignoriši thread"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Snimi pri&loge..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Kopiraj stavku u..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Primijeni s&ve filtere"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Raširi nit / grupu"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Raširi trenutnu nit ili grupu"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Sažmi nit / grupu"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Sažmi trenutnu nit ili grupu"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "R&aširi sve threadove"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Raširi sve threadove u trenutnom fasciklu"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Saž&mi sve threadove"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Sažmi sve threadove u trenutnom fasciklu"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Prikaži poruku"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Sljedeća poruka"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Idi na sljedeću poruku"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Sljedeća &nepročitana poruka"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Sljedeća"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Idi na sljedeću nepročitanu poruku"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Prethodna poruka"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Idi na prethodnu poruku"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Prethodna n&epročitana poruka"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Prethodna"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Idi na prethodnu nepročitanu poruku"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Sljedeći nepročitan &fascikl"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Idi na sljedeći fascikl sa nepročitanim porukama"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Prethodn&i nepročitani fascikl"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Idi na prethodni fascikl sa nepročitanim porukama"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Sljedeći nepročitan &tekst"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Idi na idući nepročitani tekst"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4631,229 +4650,235 @@
 "Skroluje trenutnu poruku. Ako ste na kraju trenutne poruke, ide na sljedeću "
 "nepročitanu poruku."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Podesi &filtere..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Upravljaj &Sijeve skriptama..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "&Add Account..."
 msgstr "Dodaj bilješku..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail &Uvod"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Prikaži KMail stranicu dobrodošlice"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Podesi &obavještenja..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Po&desi KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Izbaci..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Dodaj omiljeni diretkorij..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Pretplate na serverskoj strani..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Primijeni s&ve filtere"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "&Izvezi KMail podatke..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Novi kontakt u adresaru..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopiraj poruku u fascikl"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Idi na direktorij..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Prekini trenutnu operaciju"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Fokus na idući fascikl"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Fokus na prethodni fascikl"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Izaberi fascikl sa fokusom"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Fokus na prvu fasciklu"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Fokus na zadnju fasciklu"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Fokus na sljedeću poruku"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Fokus na prethodnu poruku"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Izaberi prvu poruku"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Izaberi zadnju poruku"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Odaberite poruku sa fokusom"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Usredotočite se na brzo pretraživanje"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Proširivanje izbora na prethodnu poruku"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Proširivanje izbora na sljedeću poruku"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Premjesti poruku u fascikl"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Postavke"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Restart"
+msgid "Restart Account"
+msgstr "Pokreni ponovo"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Dodaj omiljeni fascikl"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Isprazni smeće"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Premjesti sve poruke u smeće"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Obriši pretragu"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Searching..."
 msgid "Edit Search..."
 msgstr "Tražim..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Akcija filtriranja %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Searching..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Tražim..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4864,12 +4889,12 @@
 "vjerovatnoću da vaš sistem bude ugrožen drugim sadašnjim i budućim "
 "sigurnosnim zloupotrebama."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Koristi HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4879,118 +4904,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Pokrećem..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Pre&mjesti u smeće"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Smeće"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Premjesti poruke u kantu za smeće"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Ne možete kopirati stavku. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nova poruka za..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Odgovori na..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Proslijedi na..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Dodaj u postojeći kontakt."
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Otvori u adresaru"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Zabilježi ovaj link"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Uredi kontakt..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Snimi link kao..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Pronađi u poruci..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Sačuvaj sliku na disk..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Prikaži HTML format"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Prikaži HTML format kada pošta dolazi od ovog kotakta"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Učitaj vanjsku referencu kada pošta dolazi za ovaj kontakt"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Podijeli sliku..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4999,69 +5024,69 @@
 "KMail sada se zasniva na Akonadi PIM, koji donosi mnoge promjene sa svih "
 "strana."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Guranje pošte (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Unaprijeđena pretraga"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Podrška za dodavanje bilješki porukama"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Manje zamrzavanja korisničkog interfejsa provjera pošte se dešava u pozadini"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG podrška"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "Potvrda pravopisa prije slanja"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE elektronska pošta"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "Preuzimam svojstva fascikle"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Molim sačekajte"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "van veze"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5075,7 +5100,7 @@
 "Kliknite <a href=\"kmail:goOnline\">ovde</a> da bi se povezali . . .</"
 "p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5089,22 +5114,22 @@
 "Kliknite <a href=\"kmail:goOnline\">ovde</a> da bi se povezali . . .</"
 "p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontakt izmijenjen uspješno."
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nova poruka u..."
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5128,8 +5153,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5222,17 +5247,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5279,27 +5304,27 @@
 msgid "All"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5326,7 +5351,7 @@
 msgid "&Reply"
 msgstr "&Odgovori"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "Odgovo&ri..."
@@ -5336,12 +5361,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Odgovori a&utoru..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Odgovori svim&a..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Odgovori na mailing &listu..."
@@ -5372,7 +5397,7 @@
 msgid "&Edit As New"
 msgstr "&Edituj poruku"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5570,46 +5595,46 @@
 msgstr ""
 "Nepomuk ne može napraviti pretragu.Greške pronađene:  <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Nađi poruke"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Traži"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&U sastavu poruke..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Kao &prilog..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "&Snimi priloge..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Očisti izbor"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "Skoči do fascikla"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5617,69 +5642,69 @@
 msgstr[1] "%1 podudarnosti"
 msgstr[2] "%1 podudarnosti"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Posljednja pretraga"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Niste izabrali ispravan folder."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Zaboravili ste izabrati kolekcije."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Zaboravili ste definirati uslove."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Svi izabrani folderi su prazni ili ne postoje."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, fuzzy, kde-format
 #| msgid "You forgot to define condition."
 msgid "You forgot to add conditions."
 msgstr "Zaboravili ste definirati uslove."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Sadržani uslovi ne mogu biti korišteni sa brojem znakova manjim od 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Tražim..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Ne možemo dobiti rezultate pretrage. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Pretraga neuspjela"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Pretraga završena"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Pretraga zaustavljena"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5690,7 +5715,7 @@
 "Uobičajeni razlog je da postoji jos jedan folder sa istim imenom. Greška "
 "prijavljena \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5698,7 +5723,7 @@
 msgstr[1] "Kopiraj %1 poruke"
 msgstr[2] "Kopiraj %1 poruka"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5706,7 +5731,7 @@
 msgstr[1] "Isijeci %1 poruke"
 msgstr[2] "Isijeci %1 poruka"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5841,7 +5866,7 @@
 "Određuje da li je ovo prva prijava aplikacije (samo za internu upotrebu)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5849,7 +5874,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5859,26 +5884,26 @@
 "ekran."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Prikaži liniju za brzu pretragu fascikla"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Prosljeđivanje u liniji kao podrazumevano."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Prijavi ako je broj primaoca veći od:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5889,19 +5914,19 @@
 "odobrenje prije slanja meila. Upozorenje može biti ugašeno."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Potvrda pravopisa prije slanja"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automatski traži obavijest o &prijemu poruke"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5917,13 +5942,13 @@
 "<em>Opcije</em>-&gt;<em>Zahtevaj ovaveštenje o raspoređivanju</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Interval pro&vjere:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5935,152 +5960,152 @@
 "snimanje ako podesite vrijednost na nulu."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Prikaži panel za umetanje i upravljanje isečcima teksta u sastavljaču."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "Kada je uključeno, poslane poruke će biti smještene u šifrovanom obliku"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Lista nedavno korištenih URL-ova"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Spisak svih ranije korištenih kodiranja"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Veličina dijaloga identiteta  (samo za internu upotrebu)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Širina prozora za pretragu  (samo za internu upotrebu)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Visina prozora za pretragu  (samo za internu upotrebu)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Širina dijaloga za konfiguraciju KMail (samo za internu upotrebu)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Visina dijaloga za konfiguraciju KMail (samo za internu upotrebu)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Panel za čitanje poruke"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Ne pokazuj okno pregleda poruka"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Prikaži okno pregleda poruka ispod liste poruka"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Prikaži okno pregleda poruka pored liste poruka"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Popis fascikla"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Dugačka lista fascikli"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kratka lista fascikli"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Šablon poruke za novu poruku"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Šablon poruke za odgovor"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Šablon poruke za odgovor svima"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Šablon poruke za prosljeđivanje"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Znakovi citiranja"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Navodi pravila koja se koristi prilikom prikaza"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6090,7 +6115,7 @@
 "internu upotrebu)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6100,7 +6125,7 @@
 "upotrebu)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6110,7 +6135,7 @@
 "internu upotrebu)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6120,7 +6145,7 @@
 "internu upotrebu)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6130,7 +6155,7 @@
 "upotrebu)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6401,10 +6426,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6769,10 +6831,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Provjeri poštu u"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7394,6 +7455,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Ponovo uključi sva \"Ne pitaj ponovo\" upozorenja"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7458,6 +7529,14 @@
 msgid "Zoom: %1%"
 msgstr "Zumiraj"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Isječci teksta"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Provjeri poštu u"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Ime fascikla i veličina kada je blizu kvoti"
 
@@ -8873,9 +8952,6 @@
 #~ msgid "R&emove"
 #~ msgstr "&Ukloni..."
 
-#~ msgid "Restart"
-#~ msgstr "Pokreni ponovo"
-
 #~ msgid "Message Delayed..."
 #~ msgstr "Poruka odložena..."
 
diff -Nru kmail-19.04.3/po/bs/ktnef.po kmail-19.12.3/po/bs/ktnef.po
--- kmail-19.04.3/po/bs/ktnef.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/bs/ktnef.po	2020-03-03 00:33:55.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2013-10-23 13:25+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
diff -Nru kmail-19.04.3/po/ca/akonadi_archivemail_agent.po kmail-19.12.3/po/ca/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ca/akonadi_archivemail_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/ca/akonadi_archivemail_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-29 16:07+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -180,14 +180,14 @@
 "No s'ha pogut afegir un segon arxiu per aquesta carpeta. En lloc d'això, "
 "modifiqueu l'arxiu existent."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "El directori no existeix. Si us plau, verifiqueu els ajustaments. L'arxivat "
 "s'ha posposat."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Comença a arxivar %1"
@@ -243,9 +243,3 @@
 #, kde-format
 msgid "Years"
 msgstr "Anys"
-
-#~ msgid "Archive now"
-#~ msgstr "Arxiva ara"
-
-#~ msgid "Configure Archive Mail Agent"
-#~ msgstr "Configura l'agent per arxivar el correu"
diff -Nru kmail-19.04.3/po/ca/akonadi_followupreminder_agent.po kmail-19.12.3/po/ca/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/ca/akonadi_followupreminder_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/ca/akonadi_followupreminder_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_followupreminder_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-29 16:07+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -21,106 +21,97 @@
 "X-Accelerator-Marker: &\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agent per a recordatoris de seguiment"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Recordatori de seguiment"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Mantenidor"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Antoni Bella"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "antonibella5@yahoo.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Assumpte"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Data límit"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Resposta"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "S'ha rebut"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "A l'espera"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Mostra el missatge"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Voleu eliminar aquest element seleccionat?"
 msgstr[1] "Voleu eliminar aquests %1 elements seleccionats?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "S'ha rebut resposta de %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Encara resteu a l'espera d'una resposta sobre aquest correu:"
-
-#~ msgid "Configure"
-#~ msgstr "Configura"
-
-#~ msgid "Follow Up Mail."
-#~ msgstr "Correu de seguiment."
-
-#~ msgid "Follow Up Mail"
-#~ msgstr "Correu de seguiment"
diff -Nru kmail-19.04.3/po/ca/akonadi_mailfilter_agent.po kmail-19.12.3/po/ca/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ca/akonadi_mailfilter_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/ca/akonadi_mailfilter_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-09-29 13:55+0100\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -27,17 +27,17 @@
 msgid "Filter Log Viewer"
 msgstr "Visor del registre de filtratge"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Comparteix..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Registra les activitats de filtratge"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -47,23 +47,23 @@
 "Naturalment, només es recullen i es mostren les dades de registre quan "
 "s'activa el registre. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalls del registre"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Descripció del patró de registre"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Registra l'avaluació de les &regles de filtratge"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -78,34 +78,34 @@
 "només es donarà informació quant al resultat de l'avaluació de totes les "
 "regles d'un sol filtre."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Registra l'avaluació del patró de filtratge"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Registra les accions de filtratge"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Límit de mida de la bitàcola:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " kB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "sense límit"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -118,7 +118,7 @@
 "dades de registre recollides excedeix aquest límit, llavors es descartaran "
 "les dades més antigues fins que ja no s'excedeixi el límit. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -127,63 +127,63 @@
 "No s'ha pogut escriure el fitxer %1:\n"
 "«%2» és la descripció detallada de l'error."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "S'ha produït un error al KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "S'està filtrant el missatge %1 de %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Error en aplicar el moviment del filtre de correu"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Error en aplicar la supressió del filtre de correu"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Error en aplicar les modificacions del filtre de correu"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>S'estan avaluant les regles del filtre:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Les regles del filtre han coincidit.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Comença el filtratge en el missatge «%1» des de «%2» a «%3»:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtratge de missatges"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Activat el registre de filtratge de correu"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Preparat"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtratge en %1"
diff -Nru kmail-19.04.3/po/ca/akonadi_sendlater_agent.po kmail-19.12.3/po/ca/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ca/akonadi_sendlater_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/ca/akonadi_sendlater_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-12-29 16:07+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -63,124 +63,124 @@
 msgid "Your emails"
 msgstr "antonibella5@yahoo.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Assumpte"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Envia al voltant de"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Recurrència"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID del missatge"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "No hi ha missatges en espera..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Envia ara"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Sí"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "No"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Suprimeixo l'element seleccionat?"
 msgstr[1] "Suprimeixo els elements seleccionats?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Elimina els elements"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Voleu eliminar també els missatges?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Elimina els missatges"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "No s'ha trobat el missatge."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "No s'ha trobat el missatge."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Error mentre s'obtenia el missatge."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "No s'ha pogut obtenir el missatge. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "No s'ha pogut crear el transport"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "El missatge no és un missatge real"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "No s'ha pogut enviar el missatge."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "El missatge s'ha enviat"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "S'ha trobat un error. Voleu tornar-lo a enviar?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "S'ha trobat un error"
@@ -196,38 +196,3 @@
 #, kde-format
 msgid "Remove"
 msgstr "Elimina"
-
-#~ msgctxt "@title:window"
-#~ msgid "Send Later"
-#~ msgstr "Envia més tard"
-
-#~ msgid "Send Later"
-#~ msgstr "Envia més tard"
-
-#~ msgid "Delay"
-#~ msgstr "Retard"
-
-#~ msgid "Days"
-#~ msgstr "Dies"
-
-#~ msgid "Weeks"
-#~ msgstr "Setmanes"
-
-#~ msgid "Months"
-#~ msgstr "Mesos"
-
-#~ msgid "Years"
-#~ msgstr "Anys"
-
-#~ msgid "You cannot select a date prior to the current date."
-#~ msgstr "No podeu seleccionar una data anterior a l'actual."
-
-#~ msgid "Send at:"
-#~ msgstr "Envia el:"
-
-#~ msgid "Repeat every:"
-#~ msgstr "Repeteix cada:"
-
-#~| msgid "Send Later"
-#~ msgid "SendLater"
-#~ msgstr "Envia més tard"
diff -Nru kmail-19.04.3/po/ca/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/ca/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/ca/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/ca/akonadi_unifiedmailbox_agent.po	2020-03-03 00:33:55.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_unifiedmailbox_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-08 12:02+0100\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -54,37 +54,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "S'està sincronitzant la bústia unificada %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Afegeix una bústia unificada"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nom:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Tria la icona..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Icona:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Entrada"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Enviat"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Esborranys"
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/ca/docs/akonadi_archivemail_agent/add-archive-mail.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/ca/docs/akonadi_archivemail_agent/add-archive-mail.png differ
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/ca/docs/akonadi_archivemail_agent/configure-archive-mail-agent.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/ca/docs/akonadi_archivemail_agent/configure-archive-mail-agent.png differ
diff -Nru kmail-19.04.3/po/ca/docs/akonadi_archivemail_agent/index.docbook kmail-19.12.3/po/ca/docs/akonadi_archivemail_agent/index.docbook
--- kmail-19.04.3/po/ca/docs/akonadi_archivemail_agent/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/akonadi_archivemail_agent/index.docbook	2020-03-03 00:34:18.000000000 +0000
@@ -41,9 +41,9 @@
 >&FDLNotice;</legalnotice>
 
 <date
->30 d'agost de 2013</date>
+>21 de setembre de 2019</date>
 <releaseinfo
->&kde; 4.11</releaseinfo>
+>Aplicacions 19.12</releaseinfo>
 </articleinfo>
 
 <sect1 id="introduction">
@@ -61,7 +61,7 @@
 <para
 >Utilitzeu <menuchoice
 ><guimenu
->Eines</guimenu
+>Arranjament</guimenu
 ><guimenuitem
 >Configura l'arxivat automàtic...</guimenuitem
 > </menuchoice
@@ -109,7 +109,7 @@
 >, el camí de la carpeta seleccionada a la llista de carpetes del &kmail;, la data en el format <userinput
 >any-mes-dia</userinput
 > i l'extensió de fitxer seleccionada, &pex;, <filename
->Arxiu_Carpetes locals_entrada_Família_2013-09-03.tar.bz2</filename
+>Arxiu_Carpetes locals_entrada_Família_2019-09-03.tar.bz2</filename
 >. </para
 ></listitem>
 <listitem
@@ -164,6 +164,18 @@
 <para
 >Podeu utilitzar la casella de selecció a l'esquerra de cada entrada a la llista per habilitar o inhabilitar l'arxivat d'aquesta tasca. </para>
 <para
+>És possible accedir a aquest diàleg de configuració qualsevol vegada després d'utilitzar <menuchoice
+><guimenu
+>Arranjament</guimenu
+> <guimenuitem
+>Configura el &kmail;...</guimenuitem
+></menuchoice
+>, després seleccioneu la pàgina <guilabel
+>Connectors</guilabel
+> a la finestra principal del &kmail; i premeu el botó de configuració amb l'element <guilabel
+>Agent per arxivar el correu</guilabel
+>. </para>
+<para
 >Utilitzant el menú contextual llançat amb un clic del &BDR; sobre una tasca d'arxivat podreu obrir la carpeta que conté els arxius o iniciar immediatament la tasca d'arxivat. Això sobreescriurà un arxiu creat amb anterioritat durant el mateix dia sense notificació. </para>
 
 </sect2>
@@ -176,9 +188,9 @@
 <para
 >&i18n-archivemailagent;</para>
 <para
->Copyright del programa 2013 Laurent Montel montel@kde.org </para>
+>Copyright del programa 2013-2019 Laurent Montel montel@kde.org </para>
 <para
->Copyright de la documentació &copy; 2013 Laurent Montel montel@kde.org </para>
+>Copyright de la documentació &copy; 2013-2019 Laurent Montel montel@kde.org </para>
 
 <para
 >Traductor/Revisor de la documentació: &credits.Antoni.Bella;</para
diff -Nru kmail-19.04.3/po/ca/docs/akonadi_followupreminder_agent/index.docbook kmail-19.12.3/po/ca/docs/akonadi_followupreminder_agent/index.docbook
--- kmail-19.04.3/po/ca/docs/akonadi_followupreminder_agent/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/akonadi_followupreminder_agent/index.docbook	2020-03-03 00:34:18.000000000 +0000
@@ -33,9 +33,9 @@
 </copyright>
 
 <date
->10 de juny de 2014</date>
+>21 de setembre de 2019</date>
 <releaseinfo
->&kde; 4.14</releaseinfo>
+>Aplicacions 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -46,6 +46,78 @@
 <para
 >L'&i18n-followupreminderagent; és un agent de l'Akonadi que permet utilitzar correus com a recordatoris de seguiment </para>
 
+<sect2 id="using-kapp">
+<title
+>Usar l'&i18n-followupreminderagent;</title>
+
+<para
+>Utilitzeu <menuchoice
+><guimenu
+>Opcions</guimenu
+><guimenuitem
+>Crea un recordatori de seguiment...</guimenuitem
+></menuchoice
+> a la finestra de l'editor del &kmail; per obrir un diàleg que permetrà crear un recordatori per a fer el seguiment del vostre correu electrònic actual en una data concreta.</para>
+
+<screenshot>
+<screeninfo
+>Diàleg de l'&i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="add-followup-reminder.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Diàleg de l'&i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para
+>Diàleg de l'&i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+<para
+>Premeu el botó de fletxa cap avall al camp <guilabel
+>Data</guilabel
+> per a seleccionar la data des de l'estri de calendari del &kde;. També és possible triar el calendari per al recordatori mitjançant la llista desplegable <guilabel
+>Emmagatzema la pendent a</guilabel
+>.</para>
+<para
+>Per eliminar els recordatoris que heu programat, utilitzeu <menuchoice
+><guimenu
+>Arranjament</guimenu
+> <guimenuitem
+>Configura el &kmail;...</guimenuitem
+></menuchoice
+>, després seleccioneu la pàgina <guilabel
+>Connectors</guilabel
+> al &kmail; i premeu el botó de configuració amb l'element <guilabel
+>Agent per a recordatoris de seguiment</guilabel
+>. A continuació, utilitzeu el menú contextual llançat amb un clic del &BDR; sobre un element de recordatori per a seleccionar l'acció <guimenuitem
+>Suprimeix</guimenuitem
+>. </para>
+
+<screenshot>
+<screeninfo
+>Configurant l'&i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="followupreminder-configure.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Configurant l'&i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para
+>Configurant l'&i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+</sect2>
+
 <sect2 id="credits">
 
 <title
@@ -54,9 +126,9 @@
 <para
 >&i18n-followupreminderagent;</para>
 <para
->Copyright del programa 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright del programa 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Copyright de la documentació &copy; 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright de la documentació &copy; 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Traductor/Revisor de la documentació: &credits.Antoni.Bella;</para
diff -Nru kmail-19.04.3/po/ca/docs/akonadi_sendlater_agent/index.docbook kmail-19.12.3/po/ca/docs/akonadi_sendlater_agent/index.docbook
--- kmail-19.04.3/po/ca/docs/akonadi_sendlater_agent/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/akonadi_sendlater_agent/index.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -43,9 +43,9 @@
 </copyright>
 
 <date
->30 de novembre de 2013</date>
+>21 de setembre de 2019</date>
 <releaseinfo
->&kde; 4.12</releaseinfo>
+>Aplicacions 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -112,9 +112,13 @@
 ><guimenu
 >Arranjament</guimenu
 > <guimenuitem
->Configura l'Agent per enviar més tard...</guimenuitem
+>Configura el &kmail;...</guimenuitem
 ></menuchoice
-> al &kmail;. </para>
+>, després seleccioneu la pàgina <guilabel
+>Connectors</guilabel
+> al &kmail; i premeu el botó de configuració amb l'element <guilabel
+>Agent per enviar més tard</guilabel
+>. </para>
 
 <screenshot>
 <screeninfo
@@ -150,9 +154,9 @@
 <para
 >&i18n-sendlateragent;</para>
 <para
->Copyright del programa 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright del programa 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Copyright de la documentació &copy; 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright de la documentació &copy; 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Traductor/Revisor de la documentació: &credits.Antoni.Bella;</para
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/ca/docs/akonadi_sendlater_agent/sendlateragent-configure.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/ca/docs/akonadi_sendlater_agent/sendlateragent-configure.png differ
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/ca/docs/akonadi_sendlater_agent/sendlateragent-dialog.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/ca/docs/akonadi_sendlater_agent/sendlateragent-dialog.png differ
diff -Nru kmail-19.04.3/po/ca/docs/kmail2/configure.docbook kmail-19.12.3/po/ca/docs/kmail2/configure.docbook
--- kmail-19.04.3/po/ca/docs/kmail2/configure.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/kmail2/configure.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -182,7 +182,7 @@
 
 
 <para
->Podeu trobar una ràpida introducció a la pàgina <guilabel
+>Trobareu una ràpida introducció a la pàgina <guilabel
 >Identitats</guilabel
 > en la secció <link linkend="getting-started"
 >Començar</link
@@ -811,7 +811,7 @@
 >Pàgina Comptes</title>
 
 <para
->Podeu cercar una ràpida introducció a la pàgina <guilabel
+>Trobareu una ràpida introducció a la pàgina <guilabel
 >Comptes</guilabel
 > a la secció <link linkend="setting-up-your-account"
 >Arranjar el vostre compte</link
@@ -998,7 +998,7 @@
 <para
 >Aquesta secció permet canviar el tipus, mida i joc de caràcters amb el que es mostren els tipus de lletra. <guilabel
 >Cos del missatge</guilabel
-> estableix el tipus de lletra pel plafó de lectura, <guilabel
+> estableix el tipus de lletra per a la subfinestra de lectura, <guilabel
 >Editor</guilabel
 > estableix el tipus de lletra pel cos dels vostres missatges escrits a l'editor del &kmail;. </para>
 
@@ -1046,7 +1046,7 @@
 >Llista de carpetes llarga</guilabel
 > (per omissió) utilitzant l'altura de la finestra i <guilabel
 >Llista de carpetes curta</guilabel
-> utilitzant el plafó de vista prèvia del missatge la part inferior de la finestra.</para>
+> utilitzant la subfinestra de vista prèvia del missatge la part inferior de la finestra.</para>
 <para
 >Si voleu tenir les vostres carpetes preferides i un camp de cerca ràpida en les carpetes a la part superior esquerra de la finestra principal, seleccioneu les dues opcions següents.</para>
 <para
@@ -1067,7 +1067,7 @@
 > per a inhabilitar aquesta característica.</para>
 <para
 >Podeu escollir en relació amb la llista de missatges on voleu el <guilabel
->Plafó de vista prèvia del missatge</guilabel
+>Subfinestra de vista prèvia del missatge</guilabel
 > o si no el voleu de cap manera.</para>
 </sect2>
 
@@ -1077,7 +1077,7 @@
 <para
 >A la secció <guilabel
 >General</guilabel
-> podeu modificar l'aparença del plafó Llista de missatges.</para>
+> podeu modificar l'aparença de la subfinestra Llista de missatges.</para>
 <para
 >Escolliu <guilabel
 >Mostra els consells per a les capçaleres dels missatges i dels grups</guilabel
@@ -1373,7 +1373,7 @@
 <para
 >Si l'opció <guilabel
 >Tanca la finestra de missatge després de contestar o reenviar</guilabel
-> està activada, el &kmail; tancarà la finestra de missatge després de contestar o reenviar el missatge que es mostra a la finestra. Això només s'aplica a la finestra de missatge separada, no al plafó de vista prèvia incrustat del missatge.</para>
+> està activada, el &kmail; tancarà la finestra de missatge després de contestar o reenviar el missatge que es mostra a la finestra. Això només s'aplica a la finestra de missatge separada, no a la subfinestra incrustada de vista prèvia del missatge.</para>
 <para
 >Per omissió, <guilabel
 >Activa les tecles d'accessibilitat</guilabel
@@ -1383,7 +1383,7 @@
 <para
 ><guilabel
 >Mostra la barra d'estat HTML</guilabel
-> activa una barra al costat esquerre del plafó lector que us informa de si un missatge és &html; o no. Això és important atès que els missatges &html; poden imitar l'aspecte d'un missatge signat i encriptat, pel que hauríeu de ser conscients que llegiu un missatge &html;. La mateixa barra d'estat &html; no es pot veure influenciada pel codi &html; del missatge.</para>
+> activa una barra al costat esquerre de la subfinestra del lector que us informa de si un missatge és &html; o no. Això és important atès que els missatges &html; poden imitar l'aspecte d'un missatge signat i encriptat, pel que hauríeu de ser conscients que llegiu un missatge &html;. La mateixa barra d'estat &html; no es pot veure influenciada pel codi &html; del missatge.</para>
  
 <para
 >Habiliteu <guilabel
diff -Nru kmail-19.04.3/po/ca/docs/kmail2/faq.docbook kmail-19.12.3/po/ca/docs/kmail2/faq.docbook
--- kmail-19.04.3/po/ca/docs/kmail2/faq.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/kmail2/faq.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -223,7 +223,7 @@
 >bogofilter</guilabel
 > amb &kmail; ja tindreu una <emphasis
 >llista de paraules</emphasis
->. També es pot usar al servidor, de manera que no haureu de començar a entrenar-lo altra vegada. El truc està a posar-ho abans de les receptes de <guilabel
+>. També es pot emprar al servidor, de manera que no haureu de començar a entrenar-lo altra vegada. El truc està a posar-ho abans de les receptes de <guilabel
 >procmail</guilabel
 >:</para>
   <para
@@ -252,7 +252,7 @@
 ></screen>
 </para>
 <para
->Tingueu present que ara usareu una bústia per al correu brossa i una pels que siguin incerts. Afegeixo «a-» al nom per assegurar-me que siguin fàcilment visibles, a la part superior de la llista.</para>
+>Tingueu present que ara utilitzareu una bústia per al correu brossa i una per als que siguin incerts. Afegeixo «a-» al nom per assegurar-me que siguin fàcilment visibles, a la part superior de la llista.</para>
 <para
 >Finalment, per millorar el rendiment, executeu la següent ordre ocasionalment sobre el correu brossa i incert desat:</para>
 <para
@@ -483,7 +483,7 @@
 ></question>
 <answer>
 <para
->Normalment l'&imap; no implementa filtratge però els nous tipus de comptes &imap; desconnectats ho fan. Hauríeu d'usar el filtre al costat del servidor (pregunteu a l'administrador a sobre de com instal·lar filtres al servidor i amb quin format), atès que l'&imap; gestiona tot el vostre correu <emphasis
+>Normalment l'&imap; no implementa filtratge però els nous tipus de comptes &imap; desconnectats ho fan. Hauríeu d'emprar el filtre al costat del servidor (pregunteu a l'administrador a sobre de com instal·lar filtres al servidor i amb quin format), atès que l'&imap; gestiona tot el vostre correu <emphasis
 >sobre el servidor</emphasis
 >. Malauradament, encara que allí hi hagi un llenguatge de filtratge (Sieve, definit en el RFC3028), no hi ha un protocol d'accés estandarditzat per a instal·lar scripts Sieve al costat del servidor. Si en el futur hi hagués un protocol tal, el &kmail; molt probablement n'inclourà la implementació.</para>
 </answer>
@@ -492,7 +492,7 @@
 <qandaentry id="pgp-faq">
 <question
 ><para
->Què és el que hauria de saber si desitjo usar <application
+>Què és el que hauria de saber si desitjo emprar <application
 >PGP</application
 >/<application
 >GnuPG</application
@@ -501,14 +501,14 @@
 
 <answer
 ><para
->El &kmail; proveeix d'una senzilla i fàcil d'usar interfície d'usuari per a les funcions bàsiques d'aquests programes. Encara que hauríeu de saber com funcionen aquests, ja que podríeu fer-ne un ús no segur. Algunes qüestions importants són:</para>
+>El &kmail; proveeix d'una senzilla i fàcil d'emprar interfície d'usuari per a les funcions bàsiques d'aquests programes. Encara que hauríeu de saber com funcionen aquests, ja que podríeu fer-ne un ús no segur. Algunes qüestions importants són:</para>
 
 <itemizedlist>
 <listitem>
 <para
 ><emphasis
 >De veres</emphasis
-> hauríeu de provar que l'encriptatge funciona abans d'usar-lo. El &kmail; dóna per segur estranys errors del <application
+> hauríeu de provar que l'encriptatge funciona abans d'emprar-lo. El &kmail; dóna per segur estranys errors del <application
 >PGP</application
 >/<application
 >GnuPG</application
@@ -532,7 +532,7 @@
 </listitem>
 <listitem>
 <para
->Si esteu usant la implementació OpenPGP integrada en el &kmail;, aquest no podrà encriptar i signar els adjunts. Per a encriptar i signar adjunts us caldrà tenir instal·lats i configurats els connectors de criptografia.</para>
+>Si esteu emprant la implementació OpenPGP integrada en el &kmail;, aquest no podrà encriptar i signar els adjunts. Per a encriptar i signar adjunts us caldrà tenir instal·lats i configurats els connectors de criptografia.</para>
 </listitem>
 <listitem>
 <para
@@ -599,9 +599,9 @@
 >Un índex fora de data es pot deure a diversos motius. Els dos més importants són: <itemizedlist>
 <listitem
 ><para
->Un altre programa ha modificat el contingut de la carpeta: Si desitgeu usar el &kmail; amb el procmail, si us plau, llegiu-vos <link linkend="faq-procmail"
+>Un altre programa ha modificat el contingut de la carpeta: Si voleu emprar el &kmail; amb el procmail, si us plau, llegiu-vos <link linkend="faq-procmail"
 >aquesta &PMF;</link
->. Si desitgeu usar el &kmail; junt amb un altre client de correu, si us plau, llegiu-vos <link linkend="faq-other-muas"
+>. Si desitgeu emprar el &kmail; junt amb un altre client de correu, si us plau, llegiu-vos <link linkend="faq-other-muas"
 >aquesta &PMF;</link
 >.</para
 ></listitem>
@@ -646,15 +646,15 @@
 <qandaentry id="faq-other-muas">
 <question
 ><para
->Puc usar el &kmail; junt amb un altre client de correu, &pex;, <application
+>Puc emprar el &kmail; junt amb un altre client de correu, &pex;, <application
 >mutt</application
 >?</para
 ></question>
 <answer>
 <para
->Si esteu usant el format mbox per a les vostres carpetes, no serà possible el que useu un altre client de correu diferent mentre s'executa el &kmail;. amb el <application
+>Si esteu emprant el format mbox per a les vostres carpetes, no serà possible el que useu un altre client de correu diferent mentre s'executa el &kmail;. amb el <application
 >mutt</application
-> també poden haver-hi problemes encara que s'executin tots dos alhora. En aquest cas us recomanem usar el format maildir (directori de correu), aquest us hauria de resoldre tots els problemes.</para>
+> també poden haver-hi problemes encara que s'executin tots dos alhora. En aquest cas us recomanem emprar el format maildir (directori de correu), aquest us hauria de resoldre tots els problemes.</para>
 </answer>
 </qandaentry>
 
@@ -784,7 +784,7 @@
 ></question>
 <answer
 ><para
->Les referències a contingut extern, com ara imatges, estan inhabilitades per omissió, atès que es poden usar per a saber si heu visionat el missatge. Tot i que aquesta funció la podeu habilitar a la pestanya <guilabel
+>Les referències a contingut extern, com ara imatges, estan inhabilitades per omissió, atès que es poden emprar per a saber si heu visionat el missatge. Tot i que aquesta funció la podeu habilitar a la pestanya <guilabel
 >Seguretat</guilabel
 > en el diàleg de configuració del &kmail;; i també els connectors (com l'<trademark class="registered"
 >Adobe</trademark
@@ -797,7 +797,7 @@
 <qandaentry>
 <question
 ><para
->Puc usar dues versions del &kmail; alhora? Puc tornar des d'una versió actual del &kmail; a una de més antiga?</para
+>Puc emprar dues versions del &kmail; alhora? Puc tornar des d'una versió actual del &kmail; a una de més antiga?</para
 ></question>
 <answer
 ><para
@@ -840,7 +840,7 @@
 ></question>
 <answer
 ><para
->Associar una carpeta amb una llista de correu no té per què filtrar els missatges de la llista de correu. Haureu d'afegir una nova regla de filtratge manualment. Encara que, una vegada associada podreu usar <menuchoice
+>Associar una carpeta amb una llista de correu no té per què filtrar els missatges de la llista de correu. Haureu d'afegir una nova regla de filtratge manualment. Encara que, una vegada associada podreu utilitzar <menuchoice
 > <guimenu
 >Missatge</guimenu
 ><guimenuitem
@@ -876,13 +876,13 @@
 <qandaentry id="faq-procmail">
 <question
 ><para
->Puc usar &kmail; i <application
+>Puc emprar el &kmail; i <application
 >procmail</application
 >?</para
 ></question>
 <answer
 ><para
->Si, però és molt important que ho feu de la manera correcta o podríeu perdre correu. Per a usar el <application
+>Sí, però és molt important que ho feu de la manera correcta o podríeu perdre correu. Per a emprar el <application
 >procmail</application
 > i el &kmail; necessitareu configurar aquest últim perquè aconsegueixi el correu nou des de fitxers del gestor de cues creats pel <application
 >procmail</application
@@ -895,7 +895,7 @@
 >procmail</filename
 > i intentarà llistar cada fitxer spool que hi trobi, així com els fitxers de blocat al costat de l'element <guilabel
 >Fitxer de bloqueig de Procmail</guilabel
->. El procmail us permetrà usar fitxers de blocat específics de tres maneres diferents, no havent-hi cap manera d'establir una correspondència entre els fitxers spool i els de blocat. Pel que realment haureu d'assegurar-vos d'especificar el fitxer de blocat correcte per a cada fitxer spool.</para>
+>. El procmail us permetrà utilitzar fitxers de blocat específics de tres maneres diferents, no havent-hi cap manera d'establir una correspondència entre els fitxers spool i els de blocat. Pel que realment haureu d'assegurar-vos d'especificar el fitxer de blocat correcte per a cada fitxer spool.</para>
 </answer>
 </qandaentry>
 
@@ -906,13 +906,13 @@
 ></question>
 <answer
 ><para
->Abans de poder usar el corrector ortogràfic per primera vegada, primer haureu de configurar-lo. Podeu fer això en el menú de la finestra de l'editor sota <menuchoice
+>Abans de poder emprar el corrector ortogràfic per primera vegada, primer haureu de configurar-lo. Podeu fer això en el menú de la finestra de l'editor sota <menuchoice
 ><guimenu
 >Arranjament</guimenu
 > <guimenuitem
 >Corrector ortogràfic...</guimenuitem
 ></menuchoice
->. Des d'aquí podeu establir el diccionari a usar.</para
+>. Des d'aquí podeu establir el diccionari a emprar.</para
 ></answer>
 </qandaentry>
 
@@ -936,7 +936,7 @@
 <qandaentry>
 <question
 ><para
->Puc usar encriptatge amb el meu compte POP3 normal (no <acronym
+>Puc emprar l'encriptatge amb el meu compte POP3 normal (no <acronym
 >SSL</acronym
 >)?</para
 ></question>
@@ -944,7 +944,7 @@
 ><para
 >Si el vostre servidor POP3 executa un dimoni <application
 >ssh</application
->, podreu usar túnels ssh per a les vostres connexions POP3 usant l'ordre següent:</para>
+>, podreu emprar túnels ssh per a les vostres connexions POP3 utilitzant la següent ordre:</para>
 
 <para
 ><userinput
@@ -960,7 +960,7 @@
 >localhost</userinput
 > i ssh crearà un túnel per a la connexió. <note
 ><para
->Si ja s'estan enviant els missatges sense encriptar per Internet, l'avantatge d'usar <application
+>Si ja s'estan enviant els missatges sense encriptar per Internet, l'avantatge d'emprar <application
 >ssh</application
 > serà que la vostra contrasenya s'enviarà encriptada al servidor POP3.</para
 ></note>
@@ -974,7 +974,7 @@
 <qandaentry id="faq-file-locking">
 <question
 ><para
->El &kmail; bloca les carpetes que està usant?</para
+>El &kmail; bloca les carpetes que està emprant?</para
 ></question>
 <answer
 ><para
@@ -983,11 +983,11 @@
 >.</para>
 <para
 >Per a evitar el risc de perdre correu <emphasis
->si esteu usant un compte local</emphasis
+>si esteu utilitzant un compte local</emphasis
 >, és necessari assegurar-se que el &kmail; usi el mateix blocat que el vostre agent d'obtenció del correu.</para>
 
 <para
->Hi ha cinc opcions de blocatge diferents per usar:</para>
+>Hi ha cinc opcions de blocatge diferents per emprar:</para>
 
 <itemizedlist>
 <listitem
@@ -1025,11 +1025,11 @@
 <para
 ><guilabel
 >Fitxer de bloqueig de Procmail</guilabel
-> usarà una petita utilitat junt amb el <application
+> utilitzarà una petita utilitat junt amb el <application
 >procmail</application
 > anomenada <command
 >lockfile</command
->. Podeu usar-la si la vostra carpeta de correu és una carpeta a on teniu permisos d'escriptura. En la majoria dels casos això no funcionarà sobre el fitxer <filename class="directory"
+>. Podeu emprar-la si la vostra carpeta de correu és una carpeta a on teniu permisos d'escriptura. En la majoria dels casos això no funcionarà sobre el fitxer <filename class="directory"
 >/var/spool/mail/usuari</filename
 >. Això crearà els fitxers <filename
 >.lock</filename
@@ -1042,13 +1042,13 @@
 >Tanca del Mutt</guilabel
 > i <guilabel
 >Tanca privilegiada del Mutt</guilabel
->, totes dues opcions usaran una petita utilitat conjuntament amb <application
+>, totes dues opcions empraran una petita utilitat conjuntament amb <application
 >mutt</application
 > anomenada <command
 >mutt_dotlock</command
 >. La <guilabel
 >Tanca del Mutt</guilabel
-> pot usar-se de la mateixa manera que l'opció <guilabel
+> pot emprar-se de la mateixa manera que l'opció <guilabel
 >Fitxer de blocat procmail</guilabel
 >, amb la mateixa limitació respecte a les carpetes <filename class="directory"
 >/var/spool/mail/</filename
@@ -1065,7 +1065,7 @@
 <para
 ><guilabel
 >FCNTL</guilabel
-> usarà la crida al sistema <function
+> emprarà la crida al sistema <function
 >fcntl()</function
 >.</para>
 
@@ -1158,7 +1158,7 @@
 ></question>
 <answer
 ><para
->Podeu obtenir una llista de les funcions per usar aquesta ordre en un intèrpret d'ordres: <userinput
+>Podeu obtenir una llista de les funcions per emprar aquesta ordre en un intèrpret d'ordres: <userinput
 ><command
 >qdbus</command
 > <option
@@ -1170,7 +1170,7 @@
 > <option
 >org.kde.kmail /KMail org.kde.kmail.kmail.folderList</option
 ></userinput
->. Podeu usar <application
+>. Podeu emprar <application
 >qdbusviewer</application
 > per a navegar pels mètodes disponibles en una interfície gràfica.</para
 ></answer>
@@ -1191,11 +1191,11 @@
 <qandaentry>
 <question
 ><para
->Tan sols usaré &imap;, puc ocultar les carpetes locals de la llista de carpetes o hauré de mantenir el fil sempre plegat?</para
+>Tan sols empraré &imap;, puc ocultar les carpetes locals de la llista de carpetes o hauré de mantenir el fil sempre plegat?</para
 ></question>
 <answer
 ><para
->No, no les podeu ocultar. Les carpetes locals funcionen com a punt de retorn quan no podeu abastar al servidor &imap;. Tot i que tan sols useu &imap;, el &kmail; usa la safata de sortida per enviar els missatges. Si les ocultéssiu totes, no podríeu posar els missatges sortints a la safata de sortida i no els podríeu enviar pel mateix motiu. Però és possible mantenir plegat el fil de carpetes locals. El que cal fer és anar a <menuchoice
+>No, no les podeu ocultar. Les carpetes locals funcionen com a punt de retorn quan no podeu abastar al servidor &imap;. Tot i que tan sols useu &imap;, el &kmail; empra la safata de sortida per enviar els missatges. Si les ocultéssiu totes, no podríeu posar els missatges sortints a la safata de sortida i no els podríeu enviar pel mateix motiu. Però és possible mantenir plegat el fil de carpetes locals. El que cal fer és anar a <menuchoice
 ><guimenu
 >Arranjament</guimenu
 ><guimenuitem
@@ -1399,7 +1399,7 @@
 <qandaentry>
 <question
 ><para
->Com usar la traducció de correu?</para
+>Com emprar la traducció de correu?</para
 ></question>
 <answer>
 <para
@@ -1407,7 +1407,7 @@
 >Usar el traductor integrat</link
 >. </para>
 <para
->Ressalteu el text que voleu traduir al plafó de vista prèvia del missatge i seleccioneu <guimenuitem
+>Ressalteu el text que voleu traduir a la subfinestra de vista prèvia del missatge i seleccioneu <guimenuitem
 >Tradueix</guimenuitem
 > (<keycombo action="simul"
 >&Ctrl;&Alt;<keycap
diff -Nru kmail-19.04.3/po/ca/docs/kmail2/getting-started.docbook kmail-19.12.3/po/ca/docs/kmail2/getting-started.docbook
--- kmail-19.04.3/po/ca/docs/kmail2/getting-started.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/kmail2/getting-started.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -114,7 +114,7 @@
 > i una <guilabel
 >Contrasenya</guilabel
 >. Per omissió, es deixa marcada l'opció <guilabel
->Cerca l'arranjament del proveïdor a Internet</guilabel
+>Cerca els ajustaments del proveïdor a Internet</guilabel
 >, l'assistent intentarà recuperar la informació necessària des del servidor. Desmarqueu-la si sou un usuari expert, i necessiteu establir una configuració avançada. Feu clic al botó <guibutton
 >Següent</guibutton
 > una vegada hàgiu finalitzat. <note
@@ -139,7 +139,7 @@
 >. Una vegada seleccionat, feu clic al botó <guibutton
 >Següent</guibutton
 > i se us presentarà la pantalla <guilabel
->Preferències personals</guilabel
+>Ajustaments personals</guilabel
 >. </para>
     <para
 >La pantalla <guilabel
@@ -154,7 +154,7 @@
   <listitem>
     <para
 >La pantalla <guilabel
->Preferències personals</guilabel
+>Ajustaments personals</guilabel
 > es mostrarà si heu introduït el tipus de compte. Comproveu en aquesta pàgina que la informació és correcta. Seleccioneu <guilabel
 >Descarrega tots els missatges per a ús fora de línia</guilabel
 > si voleu que els vostres missatges estiguin disponibles quan no tingueu una connexió a Internet (sols &imap;). Feu clic al botó <guibutton
diff -Nru kmail-19.04.3/po/ca/docs/kmail2/intro.docbook kmail-19.12.3/po/ca/docs/kmail2/intro.docbook
--- kmail-19.04.3/po/ca/docs/kmail2/intro.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/kmail2/intro.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -55,7 +55,7 @@
 </screenshot>
 
 <para
->L'equip del &kmail; us dóna la benvinguda al &kmail;, un amigable client de correu pel &kde;. El nostre objectiu és que sigui bonic i intuïtiu sense sacrificar-ne la potència. </para>
+>L'equip del &kmail; us dóna la benvinguda al &kmail;, un client de correu fàcil d'emprar pel &kde;. El nostre objectiu és que sigui bonic i intuïtiu sense sacrificar-ne la potència. </para>
 
 <para
 >Si mai heu configurat un client de correu electrònic en un sistema &UNIX;, us suggerim que primerament llegiu la secció <link linkend="getting-started"
diff -Nru kmail-19.04.3/po/ca/docs/kmail2/menus.docbook kmail-19.12.3/po/ca/docs/kmail2/menus.docbook
--- kmail-19.04.3/po/ca/docs/kmail2/menus.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/kmail2/menus.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -240,7 +240,7 @@
 >Si voleu desar-lo en un format diferent, &pex;, <filename role="extension"
 >.txt</filename
 >, desseleccioneu <guilabel
->Selecciona automàticament l'extensió del fitxer (.mbox)</guilabel
+>Selecciona automàticament l'extensió del nom de fitxer (.mbox)</guilabel
 >, i assegureu-vos de canviar l'extensió del fitxer per a quan s'anomeni el fitxer.</para
 ></listitem>
 </varlistentry>
@@ -595,7 +595,7 @@
 > per veure les opcions de cerca.</para>
 <para
 >El resultat de la cerca es mostraran a l'àrea de text, en aquest moment podeu <guibutton
->Obre la carpeta de cerques</guibutton
+>Obre la carpeta de cerca</guibutton
 > o ressaltar el missatge desitjat i seleccionar <guibutton
 >Obre el missatge</guibutton
 >.</para
@@ -613,7 +613,7 @@
 > <guimenu
 >Edita</guimenu
 > <guimenuitem
->Troba al missatge...</guimenuitem
+>Cerca al missatge...</guimenuitem
 > </menuchoice
 ></term>
 <listitem
@@ -853,7 +853,7 @@
 ><para
 ><action
 >Canvia la manera com apareixeran els adjunts al <guilabel
->Plafó de vista prèvia del missatge</guilabel
+>Subfinestra de vista prèvia del missatge</guilabel
 ></action
 > (independent de l'arbre &MIME;). Vegeu les <link linkend="using-attachment-view-options"
 >opcions dels adjunts</link
@@ -961,12 +961,12 @@
 ><para
 ><action
 >Mostra el missatge i les seves capçaleres completes en format de text net en una nova finestra.</action
-> Això pot ser d'utilitat per a cercar l'origen d'un correu. </para>
+> Això pot ser d'utilitat per a trobar l'origen d'un correu. </para>
 <note
 ><para
 >Pot ser d'utilitat per a cercar l'origen d'un correu. Hauríeu de saber que és fàcil falsificar la capçalera <literal
 >From:</literal
-> (De:) d'un correu, però encara podreu esbrinar quins servidors usa el remitent mirant a les línies <literal
+> (De:) d'un correu, però encara podreu esbrinar quins servidors utilitza el remitent mirant a les línies <literal
 >Received:</literal
 > (Receptor:) de la capçalera.</para
 ></note
@@ -1024,7 +1024,7 @@
 <listitem
 ><para
 ><action
->Permet escollir el caràcter de codificació que s'usarà al plafó del missatge.</action
+>Permet escollir el caràcter de codificació que s'usarà a la subfinestra del missatge.</action
 > El valor per omissió, <guilabel
 >Auto</guilabel
 >, hauria de funcionar en la majoria dels casos.</para
@@ -1042,7 +1042,7 @@
 <listitem
 ><para
 ><action
->Permet fer zoom sobre el missatge en el plafó del missatge.</action
+>Permet fer zoom sobre el missatge a la subfinestra del missatge.</action
 ></para
 ></listitem>
 </varlistentry>
@@ -1073,7 +1073,7 @@
 ><para
 ><action
 >Mostra un diàleg amb una llista de totes les vostres carpetes.</action
-> Feu clic sobre la carpeta que voleu veure i es mostrarà en el plafó per a la visualització de missatges.</para
+> Feu clic sobre la carpeta que voleu veure i es mostrarà a la subfinestra per a la visualització de missatges.</para
 ></listitem>
 </varlistentry>
 <varlistentry id="reader-go-next-message">
@@ -2066,7 +2066,7 @@
 </inlinemediaobject
 ></entry>
 <entry
->Aquest estat no és establert automàticament pel &kmail;. Podeu usar-lo lliurement per a marcar missatges que són importants per algun motiu.</entry
+>Aquest estat no és establert automàticament pel &kmail;. Podeu emprar-lo lliurement per a marcar missatges que són importants per algun motiu.</entry
 ></row>
 <row>
 <entry
@@ -2180,7 +2180,7 @@
 </inlinemediaobject
 ></entry>
 <entry
->Aquest estat no és establert automàticament pel &kmail;. Podeu usar-lo lliurement per a marcar fils que són importants per algun motiu.</entry
+>Aquest estat no és establert automàticament pel &kmail;. Podeu emprar-lo lliurement per a marcar fils que són importants per algun motiu.</entry
 ></row>
 <row>
 <entry
@@ -2374,7 +2374,7 @@
 > per veure les opcions de cerca.</para>
 <para
 >El resultat de la cerca es mostraran a l'àrea de text, en aquest moment podeu <guibutton
->Obre la carpeta de cerques</guibutton
+>Obre la carpeta de cerca</guibutton
 > o ressaltar el missatge desitjat i seleccionar <guibutton
 >Obre el missatge</guibutton
 >.</para
@@ -2440,7 +2440,7 @@
 ><para
 >La funcionalitat <guilabel
 >Respostes «Fora de l'oficina»</guilabel
-> és un filtre al costat del servidor. Per usar-lo, haureu de configurar la <link linkend="receiving-mail"
+> és un filtre al costat del servidor. Per emprar-lo, haureu de configurar la <link linkend="receiving-mail"
 >pestanya Filtratge</link
 > (observeu les opcions apropiades al servidor kolab) de la configuració del vostre compte &imap;.</para
 ></note
@@ -3236,7 +3236,7 @@
 ></term>
 <listitem
 ><para
->Usa un tipus de lletra fix (monoespai) per a mostrar el missatge actualment editat. El tipus de lletra a usar pot configurar-se a la secció <guilabel
+>Utilitza un tipus de lletra fix (monoespai) per a mostrar el missatge actualment editat. El tipus de lletra a emprar pot configurar-se a la secció <guilabel
 >Aparença</guilabel
 > del diàleg de configuració del &kmail;.</para
 ></listitem>
@@ -3327,7 +3327,7 @@
 ></term>
 <listitem
 ><para
->Signa digitalment el missatge usant <application
+>Signa digitalment el missatge emprant <application
 >OpenPGP</application
 >. Podeu saber més a sobre d'això en el <link linkend="pgp"
 >capítol a sobre de l'OpenPGP</link
@@ -3345,7 +3345,7 @@
 ></term>
 <listitem
 ><para
->Encripta digitalment el missatge usant <application
+>Encripta digitalment el missatge emprant <application
 >OpenPGP</application
 >. Podeu saber més a sobre d'això en el <link linkend="pgp"
 >capítol a sobre de l'OpenPGP</link
diff -Nru kmail-19.04.3/po/ca/docs/kmail2/using-kmail.docbook kmail-19.12.3/po/ca/docs/kmail2/using-kmail.docbook
--- kmail-19.04.3/po/ca/docs/kmail2/using-kmail.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/ca/docs/kmail2/using-kmail.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -38,7 +38,7 @@
 >La finestra principal</title>
 
 <para
->La finestra principal és la que apareix quan s'engega el &kmail;. Per omissió es divideix en tres plafons:</para>
+>La finestra principal és la que apareix quan s'engega el &kmail;. Per omissió es divideix en tres subfinestres:</para>
 
 <variablelist>
 <varlistentry>
@@ -47,24 +47,24 @@
 <listitem>
   <screenshot>
 <screeninfo
->El plafó Carpeta</screeninfo>
+>La subfinestra Carpeta</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="folder-example.png" format="PNG"/>
     </imageobject>
     <textobject>
       <phrase
->El plafó Carpeta</phrase>
+>La subfinestra Carpeta</phrase>
     </textobject>
     <caption>
       <para
->El plafó Carpeta</para>
+>La subfinestra Carpeta</para>
     </caption>
   </mediaobject>
 </screenshot>
 
 <para
->Aquest plafó conté una llista de les carpetes de missatges (d'altres programes de correu les anomenen bústies). Per a seleccionar una carpeta, simplement feu clic a sobre seu. Els missatges continguts en la carpeta apareixeran en el plafó de capçaleres. La llista de carpetes pot mostrar-se tant en mode de vista curta, ocupant una petita porció del costat esquerre de la pantalla, i en vista llarga, que ocupa tota la part esquerra de la pantalla però que és capaç de mostrar més bústies. Podeu canviar entre aquests modes de vista en <guilabel
+>Aquesta subfinestra conté una llista de les carpetes de missatges (d'altres programes de correu les anomenen bústies). Per a seleccionar una carpeta, simplement feu clic a sobre seu. Els missatges continguts en la carpeta apareixeran a la subfinestra de capçaleres. La llista de carpetes pot mostrar-se tant en mode de vista curta, ocupant una petita porció del costat esquerre de la pantalla, i en vista llarga, que ocupa tota la part esquerra de la pantalla però que és capaç de mostrar més bústies. Podeu canviar entre aquests modes de vista en <guilabel
 >Aparença</guilabel
 >/<guilabel
 >Format</guilabel
@@ -103,7 +103,7 @@
   </mediaobject>
 </screenshot>
 <para
->Aquest plafó llista la informació de les capçaleres (les etiquetes d'estat del missatge, remitent, assumpte, data i opcionalment la mida) dels missatges a la carpeta actualment seleccionada. Fent clic a sobre d'una capçalera seleccionareu aquest missatge i es mostrarà al plafó de missatges, també podeu seleccionar més d'un missatge mantenint premuda la tecla &Ctrl; i fent clic a sobre dels missatges. Canvieu la vista de la llista de missatges seleccionant <menuchoice
+>Aquesta subfinestra llista la informació de les capçaleres (les etiquetes d'estat del missatge, remitent, assumpte, data i opcionalment la mida) dels missatges a la carpeta actualment seleccionada. Fent clic a sobre d'una capçalera seleccionareu aquest missatge i es mostrarà a la subfinestra de missatges, també podeu seleccionar més d'un missatge mantenint premuda la tecla &Ctrl; i fent clic a sobre dels missatges. Canvieu la vista de la llista de missatges seleccionant <menuchoice
 ><guimenu
 >Visualitza</guimenu
 ><guimenuitem
@@ -146,10 +146,10 @@
 </varlistentry>
 <varlistentry id="using-message-preview-pane">
 <term
->Plafó vista prèvia de missatges (per omissió; avall a la dreta)</term>
+>Subfinestra per a la vista prèvia de missatges (predeterminat; avall a la dreta)</term>
 <listitem
 ><para
->Aquest plafó mostra el missatge seleccionat. A continuació trobareu les opcions per ajustar la finestra del lector a les vostres preferències.</para>
+>Aquesta subfinestra mostra el missatge seleccionat. A continuació trobareu les opcions per ajustar la finestra del lector a les vostres preferències.</para>
 <para
 >La part superior de la finestra del lector conté diverses opcions de capçalera. Aneu a <menuchoice
 ><guimenu
@@ -229,7 +229,7 @@
 ></listitem>
 </itemizedlist>
 <para
->Si preferiu veure el correu electrònic en format &HTML; en lloc de text net (per omissió), feu clic a la barra situada a la part esquerra del plafó. El text de la barra us informarà en quina vista us trobeu. Si no trobeu aquesta barra, la podeu habilitar en el diàleg <menuchoice
+>Si preferiu veure el correu electrònic en format &HTML; en lloc de text net (per omissió), feu clic a la barra situada a la part esquerra de la subfinestra. El text de la barra us informarà en quina vista us trobeu. Si no trobeu aquesta barra, la podeu habilitar en el diàleg <menuchoice
 ><guimenu
 >Arranjament</guimenu
 ><guimenuitem
@@ -285,7 +285,7 @@
 ><guimenuitem
 >Mostra l'estructura del missatge</guimenuitem
 ></menuchoice
->, es mostrarà al visor de l'estructura del missatge sota el plafó de vista prèvia.</para>
+>, es mostrarà al visor de l'estructura del missatge sota la subfinestra de vista prèvia.</para>
 <para
 >Podeu desplaçar-vos a través de la pàgina del missatge emprant les tecles <keycap
 >Re Pàg</keycap
@@ -295,9 +295,9 @@
 >Fletxa amunt</keysym
 > i <keysym
 >Fletxa avall</keysym
->. També podeu usar les <link linkend="keyboard-shortcuts"
+>. També podeu utilitzar les <link linkend="keyboard-shortcuts"
 >dreceres del teclat</link
-> per a saltar entre els vostres missatges sense que calgui usar el ratolí.</para
+> per a saltar entre els vostres missatges sense que calgui utilitzar el ratolí.</para
 ></listitem>
 </varlistentry>
 </variablelist>
@@ -484,7 +484,7 @@
 ></keycombo
 ></entry>
 <entry
->Selecciona missatges al plafó de capçaleres, començant pel missatge actual.</entry>
+>Selecciona missatges a la subfinestra de capçaleres, començant pel missatge actual.</entry>
 </row>
 </tbody>
 </tgroup>
@@ -619,7 +619,7 @@
 >CC:</guilabel
 >/<guilabel
 >BCC:</guilabel
->, apareixerà un menú emergent que oferirà completar les adreces que heu usat recentment o que estiguin a la vostra llibreta d'adreces. Si no us agrada el menú emergent automàtic podeu inhabilitar-lo fent clic amb el &BDR; a sobre del camp i escollir un mode de compleció diferent.</para>
+>, apareixerà un menú emergent que oferirà completar les adreces que heu utilitzat recentment o que estiguin a la vostra llibreta d'adreces. Si no us agrada el menú emergent automàtic podeu inhabilitar-lo fent clic amb el &BDR; a sobre del camp i escollir un mode de compleció diferent.</para>
 
 <para
 >Sempre que desitgeu afegir-hi més d'un destinatari en un dels camps, useu una coma per a separar cada adreça de la següent. Podríeu necessitar especificar adreces completes (&pex;, <userinput
@@ -708,7 +708,7 @@
 >Signa el missatge</guiicon
 > o <guiicon
 >Encripta el missatge</guiicon
-> de la barra d'eines. A més, podeu seleccionar el format que s'usarà per a signar i/o encriptar el missatge. Segons els programes d'encriptatge instal·lats podeu triar entre: </para>
+> de la barra d'eines. A més, podeu seleccionar el format que s'utilitzarà per a signar i/o encriptar el missatge. Segons els programes d'encriptatge instal·lats podeu triar entre: </para>
 
 <variablelist id="cryptographic-message-formats">
 <varlistentry>
@@ -718,7 +718,7 @@
 ></term>
 <listitem>
 <para
->&kmail; usarà un format que puguin comprendre tots els destinataris del missatge. Podeu indicar el format preferit dels destinataris en la llibreta d'adreces del &kde;.</para
+>El &kmail; emprarà un format que puguin comprendre tots els destinataris del missatge. Podeu indicar el format preferit dels destinataris en la llibreta d'adreces del &kde;.</para
 ></listitem>
 </varlistentry>
 <varlistentry>
@@ -730,7 +730,7 @@
 <para
 >Aquest format està obsolet. Si l'useu, tan sols se signarà i/o encriptarà el text del missatge. <emphasis
 >Els adjunts ni se signaran ni s'encriptaran.</emphasis
-> Els missatges &HTML; no es poden signar amb aquest format. Tan sols l'hauríeu d'usar si és necessari, &ead;, si envieu missatges a usuaris de clients de correu que no poden treballar amb els formats més avançats.</para
+> Els missatges &HTML; no es poden signar amb aquest format. Tan sols l'hauríeu d'emprar si és necessari, &ead;, si envieu missatges a usuaris de clients de correu que no poden treballar amb els formats més avançats.</para
 ></listitem>
 </varlistentry>
 <varlistentry>
@@ -750,7 +750,7 @@
 ></term>
 <listitem>
 <para
->Aquest és un format alternatiu a OpenPGP/&MIME;. Si l'useu, el text del missatge i tots els adjunts se signaran i/o encriptaran (almenys per omissió). És el format més usat a les empreses.</para
+>Aquest és un format alternatiu a OpenPGP/&MIME;. Si l'useu, el text del missatge i tots els adjunts se signaran i/o encriptaran (almenys per omissió). És el format més emprat a les empreses.</para
 ></listitem>
 </varlistentry>
 <varlistentry>
@@ -760,7 +760,7 @@
 ></term>
 <listitem>
 <para
->Aquest format és una variant de S/&MIME;. Tan sols s'hauria d'usar si fos necessari.</para
+>Aquest format és una variant de S/&MIME;. Tan sols s'hauria d'emprar si fos necessari.</para
 ></listitem>
 </varlistentry>
 </variablelist>
@@ -793,7 +793,7 @@
 >Afegir adjunts</title>
 
 <para
->Podeu adjuntar fitxers al vostre missatge usant un dels següents mètodes:</para>
+>Podeu adjuntar fitxers al vostre missatge emprant un dels següents mètodes:</para>
 
 <itemizedlist>
 <listitem>
@@ -832,7 +832,7 @@
 </itemizedlist>
 
 <para
->Una vegada adjuntat un fitxer al vostre missatge, aquest apareixerà al plafó d'adjunts a la part inferior de la finestra de l'editor. Podeu usar el &BDR; a sobre de cada adjunt per a <guimenuitem
+>Una vegada adjuntat un fitxer al vostre missatge, aquest apareixerà a la subfinestra d'adjunts a la part inferior de la finestra de l'editor. Podeu utilitzar el &BDR; a sobre de cada adjunt per a <guimenuitem
 >Visualitza</guimenuitem
 >, <guimenuitem
 >Desa com a...</guimenuitem
@@ -852,7 +852,7 @@
 > si desitgeu suggerir al destinatari que mostri (inclòs) aquesta part en la vista del missatge, en comptes de la icona de vista per omissió. Que funcioni o no dependrà del client de correu del destinatari i de les seves preferències.</para>
 
 <para
->També es poden adjuntar claus públiques usant les opcions apropiades en el menú <menuchoice
+>També es poden adjuntar claus públiques emprant les opcions apropiades en el menú <menuchoice
 ><guimenu
 >Adjunta</guimenu
 ></menuchoice
@@ -867,7 +867,7 @@
 >Revisió ortogràfica del missatge</title>
 
 <para
->&kmail; verificarà automàticament l'ortografia del vostre missatge (en el mode &HTML; això actualment no funciona) i mostrarà les paraules desconegudes usant el color vermell. Si n'hi ha masses, el &kmail; inhabilitarà la seva comprovació. Per triar l'idioma que s'usarà, seleccioneu <menuchoice
+>&kmail; verificarà automàticament l'ortografia del vostre missatge (en el mode &HTML; això actualment no funciona) i mostrarà les paraules desconegudes emprant el color vermell. Si n'hi ha masses, el &kmail; inhabilitarà la seva comprovació. Per triar l'idioma que s'utilitzarà, seleccioneu <menuchoice
 ><guimenu
 >Visualitza</guimenu
 > <guimenuitem
@@ -889,19 +889,19 @@
 ></menuchoice
 > des del menú. L'ús d'aquesta llista desplegable us permetrà canviar l'idioma del corrector ortogràfic amb un clic del ratolí. </para>
 <para
->Per a revisar l'ortografia del missatge usant un diàleg, seleccioneu <menuchoice
+>Per a revisar l'ortografia del missatge emprant un diàleg, seleccioneu <menuchoice
 ><guimenu
 >Eines</guimenu
 > <guimenuitem
 >Ortografia...</guimenuitem
 ></menuchoice
->. El &kmail; usa <ulink url="help:sonnet"
+>. El &kmail; utilitza el <ulink url="help:sonnet"
 >&sonnet;</ulink
 > per a fer-ne la revisió, el qual és el frontal &kde; dels revisors ortogràfics <application
 >ispell</application
 > o <application
 >aspell</application
->. Tingueu present que primer podríeu necessitar configurar-lo usant <menuchoice
+>. Tingueu present que primer podríeu necessitar configurar-lo utilitzant <menuchoice
 ><guimenu
 >Arranjament</guimenu
 > <guimenuitem
@@ -915,15 +915,15 @@
 <title
 >Configuració de l'eina de retalls de text</title>
 <para
->Quan s'està editant a la finestra de redacció, podeu emmagatzemar com a retalls parts del text usades amb freqüència. Per a configurar les capacitats de la part dels retalls seleccioneu <menuchoice
+>Quan s'està editant a la finestra de redacció, podeu emmagatzemar com a retalls parts del text emprades amb freqüència. Per a configurar les capacitats de la part dels retalls seleccioneu <menuchoice
 > <guimenu
 >Visualitza</guimenu
 > <guimenuitem
 >Retalls</guimenuitem
 > </menuchoice
-> a la barra de menús. Apareixerà un quadre nou a la banda esquerra del redactor. </para>
+> a la barra de menús. Apareixerà una subfinestra nova a la banda esquerra del redactor. </para>
 <para
->Per a afegir un retall nou al plafó de retalls, feu clic al plafó, feu clic a <menuchoice
+>Per a afegir un retall nou a la subfinestra de retalls, feu clic a la subfinestra, feu clic a <menuchoice
 ><guimenu
 >Afegeix un retall</guimenu
 ></menuchoice
@@ -956,7 +956,7 @@
 ><guimenuitem
 >Traductor</guimenuitem
 ></menuchoice
-> des de la barra de menús. Apareixerà un nou plafó a la part inferior de l'editor.</para>
+> des de la barra de menús. Apareixerà una nova subfinestra a la part inferior de l'editor.</para>
       <para
 >Per a traduir una secció de text, seleccioneu primer el text que voleu traduir al quadre amb <guilabel
 >Deixeu anar el text que desitgeu traduir</guilabel
@@ -1105,7 +1105,7 @@
 ></menuchoice
 > o <guimenuitem
 >Afegeix una carpeta...</guimenuitem
-> des del menú contextual del &BDR;. Apareixerà un diàleg, introduïu el nom de la nova carpeta en el quadre de text. Podeu personalitzar completament cada carpeta, &pex;, les vistes, les respostes, &etc; en les propietats d'una carpeta, seleccioneu la carpeta que voleu modificar en el plafó de carpetes i seleccioneu <guimenuitem
+> des del menú contextual del &BDR;. Apareixerà un diàleg, introduïu el nom de la nova carpeta en el quadre de text. Podeu personalitzar completament cada carpeta, &pex;, les vistes, les respostes, &etc; en les propietats d'una carpeta, seleccioneu la carpeta que voleu modificar a la subfinestra de carpetes i seleccioneu <guimenuitem
 >Propietats de la carpeta</guimenuitem
 > des del menú contextual del &BDR;. Per a més detalls, vegeu <link linkend="folders-properties-window"
 >Propietats de la carpeta</link
@@ -1123,7 +1123,7 @@
 >. Apareixerà una llista de carpetes, seleccioneu la carpeta de la llista cap la que desitgeu moure els missatges. Els missatges també es poden moure arrossegant-los des de la llista de missatges cap a una carpeta a la llista de carpetes.</para>
 
 <para
->Si teniu carpetes a les que accediu tot sovint, podeu afegir-les al vostre plafó de carpetes preferides a la cantonada superior esquerra. Afegiu-les a través del menú contextual del &BDR; amb l'opció <guimenuitem
+>Si teniu carpetes a les que accediu tot sovint, podeu afegir-les a la subfinestra de les vostres carpetes preferides a la cantonada superior esquerra. Afegiu-les a través del menú contextual del &BDR; amb l'opció <guimenuitem
 >Afegeix a les carpetes preferides</guimenuitem
 >.</para>
 
@@ -1149,8 +1149,8 @@
 >. Feu clic al botó <guibutton
 >Cerca</guibutton
 >. Ara seleccioneu el botó <guibutton
->Obre la carpeta de cerques</guibutton
->. La vostra carpeta de resultats restarà a la part inferior del plafó de carpetes.</para>
+>Obre la carpeta de cerca</guibutton
+>. La vostra carpeta de resultats restarà a la part inferior de la subfinestra de carpetes.</para>
 
 <para
 >La creació de filtres per moure automàticament els missatges a les carpetes especificades és una gran manera d'organitzar els missatges per llista de correu, remitent, assumpte, &etc; Per a més detalls, vegeu <link linkend="filters"
@@ -1304,7 +1304,7 @@
 >Identitat del remitent</guilabel
 >. vegeu <link linkend="configure-identity"
 >Configurar les identitats</link
-> per obtenir informació sobre les identitats. Els missatges de resposta enviats directament seguiran usant per omissió l'adreça <quote
+> per obtenir informació sobre les identitats. Els missatges de resposta enviats directament seguiran emprant per omissió l'adreça <quote
 >A:</quote
 > del missatge d'acord amb la seva identitat corresponent.</para>
 
@@ -1333,7 +1333,7 @@
 <para
 >Amb la llista desplegable <guilabel
 >Mostra la columna</guilabel
-> podeu establir la visualització de les columnes en el plafó de les capçaleres a Omissió, Remitent o Destinatari. Això és d'utilitat si useu una carpeta per a desar els missatges que envieu.</para>
+> podeu establir la visualització de les columnes a la subfinestra de les capçaleres a Omissió, Remitent o Destinatari. Això és d'utilitat si useu una carpeta per a desar els missatges que envieu.</para>
 <para
 >A la secció <guilabel
 >Llista de missatges</guilabel
@@ -1419,7 +1419,7 @@
 >Les &acl; es poden establir per carpeta.</para>
  <note
 ><para
->Com tota la resta que succeeix quan s'està usant <emphasis
+>Com tota la resta que succeeix quan s'està emprant <emphasis
 >&imap; desconnectat</emphasis
 >, us caldrà sincronitzar amb el servidor perquè els canvis es transfereixin cap al servidor.</para
 ></note>
@@ -1480,7 +1480,7 @@
 >Useu-ho per a crear una carpeta compartida perquè d'altra gent hi pugui llegir i enviar missatges, però no modificar.</para>
 <informalexample>
 <para
->Si desitgeu crear un fòrum de debat per a l'empresa, en comptes d'usar un formulari web o un servidor usenet d'una empresa privada, podríeu crear una sèrie de carpetes (una per tema) i atorgar a tothom permisos per a llegir i enviar. En comptes d'enviar a un servidor &nntp; o escriure els missatges en un formulari web, la gent simplement escriuria els correus electrònics i els emmagatzemaria en la carpeta corresponent al tema del missatge.</para>
+>Si desitgeu crear un fòrum de debat per a l'empresa, en comptes d'emprar un formulari web o un servidor usenet d'una empresa privada, podríeu crear una sèrie de carpetes (una per tema) i atorgar a tothom permisos per a llegir i enviar. En comptes d'enviar a un servidor &nntp; o escriure els missatges en un formulari web, la gent simplement escriuria els correus electrònics i els emmagatzemaria en la carpeta corresponent al tema del missatge.</para>
 </informalexample>
 </listitem
 ></varlistentry>
@@ -1679,7 +1679,7 @@
 >Llista de correu</title>
 
 <para
->Si usareu la carpeta per a una llista de correu obriu el diàleg <guilabel
+>Si utilitzareu la carpeta per a una llista de correu obriu el diàleg <guilabel
 >Propietats de la carpeta de llista de correu</guilabel
 > amb <menuchoice
 ><guimenu
@@ -1702,7 +1702,7 @@
 ></term>
 <listitem>
 <para
->Aquesta adreça s'usa per enviar missatges a la llista de correu. Normalment es tracta d'una adreça de correu electrònic.</para>
+>Aquesta adreça s'utilitza per enviar missatges a la llista de correu. Normalment es tracta d'una adreça de correu electrònic.</para>
 </listitem
 ></varlistentry>
 <varlistentry id="folders-properties-mailinglist-subscribe">
@@ -1712,7 +1712,7 @@
 ></term>
 <listitem>
 <para
->Aquesta adreça s'usa per a la subscripció a la llista de correu. Pot tractar-se d'una adreça de correu electrònic o l'adreça d'una pàgina web.</para>
+>Aquesta adreça s'utilitza per a la subscripció a la llista de correu. Pot tractar-se d'una adreça de correu electrònic o l'adreça d'una pàgina web.</para>
 </listitem
 ></varlistentry>
 <varlistentry id="folders-properties-mailinglist-unsubscribe">
@@ -1722,7 +1722,7 @@
 ></term>
 <listitem
 ><para
->Aquesta adreça s'usa per a cancel·lar la subscripció a la llista de correu. Pot tractar-se d'una adreça de correu electrònic o l'adreça d'una pàgina web.</para>
+>Aquesta adreça s'utilitza per a cancel·lar la subscripció a la llista de correu. Pot tractar-se d'una adreça de correu electrònic o l'adreça d'una pàgina web.</para>
 </listitem
 ></varlistentry>
 <varlistentry id="folders-properties-mailinglist-archive">
@@ -1742,7 +1742,7 @@
 ></term>
 <listitem>
 <para
->L'adreça que s'usa per a demanar ajuda per aquesta llista de correu. Normalment es tracta d'una adreça de correu electrònic.</para>
+>L'adreça que s'utilitza per a demanar ajuda per aquesta llista de correu. Normalment es tracta d'una adreça de correu electrònic.</para>
 </listitem
 ></varlistentry>
 </variablelist>
@@ -1835,7 +1835,7 @@
 >Creació ràpida de filtres</title>
 
 <para
->Hi ha dos mètodes per a crear un filtre; el mètode ràpid és usant <menuchoice
+>Hi ha dos mètodes per a crear un filtre; el mètode ràpid és utilitzant <menuchoice
 ><guimenu
 >Missatge</guimenu
 ><guimenuitem
@@ -1965,7 +1965,7 @@
 >En aquest grup es poden definir algunes opcions avançades per als filtres, el qual us permetrà afinar millor el filtratge.</para>
 
 <para
->Usant la primera fila de caselles de selecció, podreu marcar l'aplicació del filtre corresponent: L'opció <guilabel
+>Utilitzant la primera fila de caselles de selecció, podreu marcar l'aplicació del filtre corresponent: L'opció <guilabel
 >Aplica aquest filtre als missatges rebuts</guilabel
 > indica que el filtre serà aplicat als missatges entrants quan els rebeu (&ead;, en <guimenuitem
 >Comprova el correu</guimenuitem
@@ -1975,7 +1975,7 @@
 >Aplica aquest filtre als missatges enviats</guilabel
 > significa que el filtre s'aplica als missatges quan s'envien i l'opció <guilabel
 >Aplica aquest filtre en el filtratge manual</guilabel
-> controla si aplicar aquest filtre quan se selecciona específicament el filtratge (&ead;, usant <menuchoice
+> controla si aplicar aquest filtre quan se selecciona específicament el filtratge (&ead;, utilitzant <menuchoice
 ><guimenu
 >Missatge</guimenu
 > <guimenuitem
@@ -2004,7 +2004,7 @@
 ><guimenuitem
 >Aplica el filtratge</guimenuitem
 ></menuchoice
->. Després podreu aplicar aquest filtre a un missatge. Una altra manera d'aplicar els filtres és usar l'opció <menuchoice
+>. Després podreu aplicar aquest filtre a un missatge. Una altra manera d'aplicar els filtres és utilitzar l'opció <menuchoice
 ><guimenu
 >Missatge</guimenu
 > <guimenuitem
@@ -2012,7 +2012,7 @@
 ></menuchoice
 > del menú, que aplicarà <emphasis
 >tots</emphasis
-> els filtres -un rere l'altre fins que tots els que heu usat o un dels filtres que coincideixi tingui establerta l'opció <guilabel
+> els filtres -un rere l'altre fins que tots els que heu emprat o un dels filtres que coincideixi tingui establerta l'opció <guilabel
 >Si aquest filtre coincideix, atura aquí el procés</guilabel
 >.</para>
 
@@ -2022,7 +2022,7 @@
 
 <note
 ><para
->Els filtres seran anomenats automàticament a menys que els reanomeneu específicament usant el botó <guibutton
+>Els filtres seran anomenats automàticament a menys que els reanomeneu específicament utilitzant el botó <guibutton
 >Reanomena...</guibutton
 >. El diàleg assumirà que haurà de continuar anomenant-los automàticament mentre el nom del filtre comenci per <quote
 >&lt;</quote
@@ -2347,7 +2347,7 @@
 ></term>
 <listitem>
 <para
->Establirà la identitat que serà usada si responeu a aquest missatge.</para>
+>Establirà la identitat que serà emprada si responeu a aquest missatge.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
@@ -2377,7 +2377,7 @@
 ></term>
 <listitem>
 <para
->Establirà el mètode de transport (&pex;, &SMTP;) que s'usarà si responeu a aquest missatge.</para>
+>Establirà el mètode de transport (&pex;, &SMTP;) que s'utilitzarà si responeu a aquest missatge.</para>
 </listitem>
 </varlistentry
 > 
@@ -2436,7 +2436,7 @@
 > pàgina <guilabel
 >Seguretat</guilabel
 ></link
->), us recomanem que no els envieu a tothom, atès que poden usar-se per al rastreig, &pex;, per a enviar missatges no sol·licitats segons el remitent.</para>
+>), us recomanem que no els envieu a tothom, atès que poden emprar-se per al rastreig, &pex;, per a enviar missatges no sol·licitats segons el remitent.</para>
 </listitem>
 </varlistentry>
 <varlistentry>
@@ -2472,7 +2472,7 @@
 
 <tip
 ><para
->Aquí podeu introduir arbitràriament ordres complexes de shell, atès que el &kmail; usa una sub-shell per a executar la línia d'ordres, d'aquesta manera, funcionarà fins i tot quan ho faci aquesta ordre (dintre dels seus límits): <userinput
+>Aquí podeu introduir arbitràriament ordres complexes de shell, atès que el &kmail; utilitza un subintèrpret d'ordres per a executar la línia d'ordres, d'aquesta manera, funcionarà fins i tot quan ho faci aquesta ordre (dintre dels seus límits): <userinput
 ><command
 >uudecode</command
 ><option
@@ -2584,7 +2584,7 @@
 >urgent</quote
 > es marquin amb l'etiqueta <emphasis
 >important</emphasis
->, podeu usar un filtre:</para>
+>, podeu emprar un filtre:</para>
 
 <procedure>
 <title
@@ -2737,7 +2737,7 @@
 </procedure>
 
 <para
->Podria ser que us calgui usar un criteri de filtratge més agressiu per als vostres missatges. Per exemple, podria ser que tan sols desitgeu filtrar els missatges de la llista &kde; que ha escrit un amic vostre <replaceable
+>Podria ser que us calgui utilitzar un criteri de filtratge més agressiu per als vostres missatges. Per exemple, podria ser que tan sols desitgeu filtrar els missatges de la llista &kde; que ha escrit un amic vostre <replaceable
 >Jordi Exemple &lt;je@qualsevol.cat&gt;</replaceable
 >. Aquí és a on la resta de regles de criteri entren en acció:</para>
 
@@ -2814,7 +2814,7 @@
 >Considereu el cost de l'avaluació de les regles de filtratge:</term>
 <listitem>
 <para
->El temps necessari per avaluar una regla de filtratge dependrà de la forma en la que estigui construïda la regla. En particular, la cerca d'una subcadena que usa l'operació <guilabel
+>El temps necessari per avaluar una regla de filtratge dependrà de la forma en la que estigui construïda la regla. En particular, la cerca d'una subcadena que utilitza l'operació <guilabel
 >conté</guilabel
 > és més ràpida que una coincidència de patrons que usi l'operació <guilabel
 >casa amb expr. regular</guilabel
@@ -2839,9 +2839,9 @@
 >, perquè ambdues requereixen programes externs per executar-se. Posant els filtres que tinguin aquestes accions al darrere dels altres filtres podeu reduir el nombre de vegades que aquestes accions complexes són requerides, si la lògica del filtre ho permet.</para
 > 
 <para
->Un exemple seria filtrar missatges d'una llista de correu i detectar el correu brossa. Per a la detecció de correu brossa normalment usareu una eina externa via d'una acció <guilabel
+>Un exemple seria filtrar missatges d'una llista de correu i detectar el correu brossa. Per a la detecció de correu brossa normalment emprareu una eina externa via d'una acció <guilabel
 >Passa a través de</guilabel
->. El filtratge dels missatges per a la llista de correu es fa mitjançant la capçalera List-Id. Si no voleu comprovar els missatges de la llista de correu per a veure si hi ha correu brossa, és millor usar els filtres de missatges de les llistes de correu abans del filtre per a la detecció de correu brossa. D'aquesta manera evitareu costoses i lentes comprovacions de correu brossa per a tots els missatges que s'hagin identificat com a missatges de llistes de correu. </para>
+>. El filtratge dels missatges per a la llista de correu es fa mitjançant la capçalera List-Id. Si no voleu comprovar els missatges de la llista de correu per a veure si hi ha correu brossa, és millor emprar els filtres de missatges de les llistes de correu abans del filtre per a la detecció de correu brossa. D'aquesta manera evitareu costoses i lentes comprovacions de correu brossa per a tots els missatges que s'hagin identificat com a missatges de llistes de correu. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -3125,7 +3125,7 @@
 >.</para>
 
 <para
->Per a comprovar els missatges d'un compte en particular, usar el submenú <menuchoice
+>Per a comprovar els missatges d'un compte en particular, empreu el submenú <menuchoice
 ><guimenu
 >Fitxer</guimenu
 ><guimenuitem
@@ -3183,13 +3183,13 @@
 >GnuPG</application
 > i aquesta és substancialment diferent entre les diverses versions de <application
 >GnuPG</application
->, pel que és molt important que feu proves per a comprovar que l'encriptatge funciona correctament abans de començar a usar-lo activament. El &kmail; podria no avisar-vos d'algunes errades, pel que fora millor habilitar <guilabel
+>, pel que és molt important que feu proves per a comprovar que l'encriptatge funciona correctament abans de començar a utilitzar-lo activament. El &kmail; podria no avisar-vos d'algunes errades, pel que fora millor habilitar <guilabel
 >Mostra el text signat/encriptat després de l'edició</guilabel
 >. </para
 ></warning>
 
 <para
->Per a configurar i usar la implementació <application
+>Per a configurar i utilitzar la implementació <application
 >GnuPG</application
 > en el &kmail; és necessari tenir instal·lat i configurat adequadament <application
 >GnuPG</application
@@ -3221,7 +3221,7 @@
 >. Si aquest no fos el cas, haureu de crear un enllaç simbòlic.</para>
 
 <para
->Si no ho heu fet així, haureu de generar una parella de claus (la clau secreta i la pública) per a la vostra identitat. Haureu de fer-ho usant la línia d'ordres <userinput
+>Si no ho heu fet així, haureu de generar una parella de claus (la clau secreta i la pública) per a la vostra identitat. Haureu de fer-ho emprant la línia d'ordres <userinput
 ><command
 >gpg</command
 > <option
@@ -3302,7 +3302,7 @@
 ></term>
 <listitem>
 <para
->Obrirà un diàleg que us permetrà escollir les claus usades per a cada destinatari al que envieu un missatge encriptat. Si aquesta opció està desmarcada, el &kmail; tan sols mostrarà aquest diàleg si no troba una clau per a un destinatari o si hi ha conflictes o preferències d'encriptatge sense establir.</para
+>Obrirà un diàleg que us permetrà escollir les claus emprades per a cada destinatari al que envieu un missatge encriptat. Si aquesta opció està desmarcada, el &kmail; tan sols mostrarà aquest diàleg si no troba una clau per a un destinatari o si hi ha conflictes o preferències d'encriptatge sense establir.</para
 > 
 </listitem>
 </varlistentry>
@@ -3321,9 +3321,9 @@
 </variablelist>
 
 <para
->Ara que heu configurat l'eina d'encriptatge haureu de dir-li al &kmail; la clau OpenPGP que desitgeu usar per a signar i encriptar els missatges. Per a fer-ho aneu a la <link linkend="configure-identity"
+>Ara que heu configurat l'eina d'encriptatge haureu de dir-li al &kmail; la clau OpenPGP que desitgeu emprar per a signar i encriptar els missatges. Per a fer-ho aneu a la <link linkend="configure-identity"
 >configuració de les Identitats</link
-> i establiu la clau que s'haurà d'usar sobre la pestanya <guilabel
+> i establiu la clau que s'haurà d'emprar sobre la pestanya <guilabel
 >Criptografia</guilabel
 > de configuració de la identitat.</para>
 
@@ -3343,7 +3343,7 @@
 <para
 >Normalment editareu el vostre missatge en la finestra de l'editor del &kmail;. Abans d'enviar-lo, marqueu la icona <guiicon
 >Signa</guiicon
-> en la barra d'eines de la finestra de l'editor. Després, podeu enviar el missatge. La identitat que estigueu usant per editar el missatge necessitarà estar connectada a una <guilabel
+> en la barra d'eines de la finestra de l'editor. Després, podeu enviar el missatge. La identitat que estigueu emprant per editar el missatge necessitarà estar connectada a una <guilabel
 >clau OpenPGP</guilabel
 > en la secció <guilabel
 >Identitats</guilabel
@@ -3377,12 +3377,12 @@
 >Encripta</guilabel
 > i el &kmail; no troba una clau que cassi amb el destinatari, se us mostrarà una llista amb totes les claus disponibles en el diàleg <guilabel
 >Selecció de la clau d'encriptatge</guilabel
->. Si el &kmail; troba més d'una clau de confiança per a un destinatari, aquest us mostrarà una llista amb totes les claus per a aquest destinatari. En ambdós casos podreu seleccionar la/es clau/s que s'haurà/an d'usar per encriptar aquest missatge per al destinatari en qüestió. Usant la casella de selecció <guilabel
+>. Si el &kmail; troba més d'una clau de confiança per a un destinatari, aquest us mostrarà una llista amb totes les claus per a aquest destinatari. En ambdós casos podreu seleccionar la/es clau/s que s'haurà/an d'emprar per encriptar aquest missatge per al destinatari en qüestió. Utilitzant la casella de selecció <guilabel
 >Recorda la tria</guilabel
 > podreu desar la vostra selecció per als missatges futurs.</para>
 
 <para
->Si esteu usant una clau per primera vegada, si hi ha un conflicte en les Preferències de l'encriptatge o si heu seleccionat <guilabel
+>Si esteu emprant una clau per primera vegada, si hi ha un conflicte en les Preferències de l'encriptatge o si heu seleccionat <guilabel
 >Mostra sempre les claus d'encriptatge per aprovar-les</guilabel
 > en la secció <guilabel
 >Seguretat</guilabel
@@ -3414,7 +3414,7 @@
 ><guimenuitem
 >Adjunta la meva clau pública</guimenuitem
 ></menuchoice
-> en el menú de la finestra de l'editor: aquest adjuntarà la clau pública que tingueu definida per a la identitat que estigueu usant en el missatge. Ara ja el podeu enviar.</para>
+> en el menú de la finestra de l'editor: aquest adjuntarà la clau pública que tingueu definida per a la identitat que estigueu emprant en el missatge. Ara ja el podeu enviar.</para>
 
 <para
 >Recordeu que de cap manera això no és una caixa forta, encara que signeu el missatge per assegurar-vos que el destinatari rebrà la clau correcta. Hi pot haver un atac del tipus «algú-en-el-mig», que capturi el missatge i que en canviï la clau signant el missatge amb aquesta altra clau. Aquest és el motiu pel qual el destinatari haurà de verificar la clau adjuntada amb l'empremta digital amb la que li hagi arribat per un transport segur. Per a més detalls consultar la documentació de <application
@@ -3437,7 +3437,7 @@
 >Rebre una clau pública</title>
 
 <para
->Per a poder rebre una clau pública com a adjunt o via http, ftp o disquet. Abans de poder usar aquesta clau per a xifrar un missatge destinat al propietari d'aquesta clau, haureu de verificar la clau (comprovar la seva empremta digital o cercar signatures de confiança). En acabat podreu afegir aquesta clau pública al vostre anell públic escrivint <userinput
+>Per a poder rebre una clau pública com a adjunt o via http, ftp o disquet. Abans de poder emprar aquesta clau per a xifrar un missatge destinat al propietari d'aquesta clau, haureu de verificar la clau (comprovar la seva empremta digital o cercar signatures de confiança). En acabat podreu afegir aquesta clau pública al vostre anell públic escrivint <userinput
 ><command
 >gpg</command
 > <option
@@ -3445,7 +3445,7 @@
 > <replaceable
 >nomfitxer</replaceable
 ></userinput
-> a la línia d'ordres. Si la clau no està certificada amb una signatura de confiança no la podreu usar per a encriptar missatges a menys que la signeu amb la vostra clau. </para>
+> a la línia d'ordres. Si la clau no està certificada amb una signatura de confiança no la podreu emprar per a encriptar missatges a menys que la signeu amb la vostra clau. </para>
 
 </sect2>
 
@@ -3460,7 +3460,7 @@
 >Bàsics</title>
 
 <para
->El &kmail; no disposa d'una solució pròpia per a detectar el correu brossa: els desenvolupadors creuen que usar eines externes, però especialitzades, és la millor aproximació. El &kmail; usa aquestes eines amb la seva flexible arquitectura de filtratge. L'assistent contra el correu brossa us ajudarà amb la configuració inicial del filtratge. </para>
+>El &kmail; no disposa d'una solució pròpia per a detectar el correu brossa: els desenvolupadors creuen que emprar eines externes, però especialitzades, és la millor aproximació. El &kmail; utilitza aquestes eines amb la seva flexible arquitectura de filtratge. L'assistent contra el correu brossa us ajudarà amb la configuració inicial del filtratge. </para>
 
 <variablelist>
 <varlistentry>
@@ -3523,7 +3523,7 @@
 >GMX Spam Filter</term>
 <listitem>
 <para
->Si obteniu el correu del proveïdor de correu gratuït GMX, els vostres missatges ja es passen per un filtre de correu brossa. El resultat d'aquest procés està documentat en un camp especial de la capçalera de cada missatge. És possible usar el contingut d'aquest camp de capçalera per esbrinar quin missatge és correu brossa. Aquest filtratge no alentirà el sistema, perquè els missatges ja arriben processats. </para>
+>Si obteniu el correu del proveïdor de correu gratuït GMX, els vostres missatges ja es passen per un filtre de correu brossa. El resultat d'aquest procés està documentat en un camp especial de la capçalera de cada missatge. És possible emprar el contingut d'aquest camp de capçalera per esbrinar quin missatge és correu brossa. Aquest filtratge no alentirà el sistema, perquè els missatges ja arriben processats. </para>
 </listitem>
 </varlistentry>
 </variablelist>
@@ -3536,7 +3536,7 @@
 >Avançat</title>
 
 <para
->Aquí teniu els detalls a sobre de com funciona l'assistent: El &kmail; pot usar diverses eines externes per a detectar missatges amb correu brossa; intentarà esbrinar automàticament quines d'aquestes estan instal·lades al vostre sistema i us les mostrarà en una llista. Podeu marcar les eines que desitgeu usar al &kmail; per a detectar el correu brossa. Per descomptat, podeu tancar l'assistent, instal·lar una nova eina i tornar a iniciar una altra vegada l'assistent. </para>
+>Aquí teniu els detalls a sobre de com funciona l'assistent: El &kmail; pot utilitzar diverses eines externes per a detectar missatges amb correu brossa; intentarà esbrinar automàticament quines d'aquestes estan instal·lades al vostre sistema i us les mostrarà en una llista. Podeu marcar les eines que desitgeu utilitzar al &kmail; per a detectar el correu brossa. Per descomptat, podeu tancar l'assistent, instal·lar una nova eina i tornar a iniciar una altra vegada l'assistent. </para>
 
 <para
 >Si almenys heu marcat una eina, el &kmail; pot proporcionar filtres que permetin la classificació dels missatges com a correu brossa o no correu brossa. També proporciona accions per a permetre la classificació manual de missatges. Aquestes accions estaran disponibles mitjançant el menú i les icones a la barra d'eines. Si qualsevol de les eines que heu seleccionat admet el filtratge baiesià (&ead;, un mètode per a detectar correu brossa basat en l'anàlisi estadístic dels missatges), aquests missatges no tan sols seran marcats sinó que a més es podran transferir a les eines per a permetre que aprenguin i, d'aquesta manera, millorar la seva tassa de detecció. </para>
@@ -3560,9 +3560,9 @@
 >Alguns detalls més per a experts</title>
 
 <para
->L'assistent usa la informació emmagatzemada en un fitxer de configuració especial anomenat <filename
+>L'assistent utilitza la informació emmagatzemada en un fitxer de configuració especial anomenat <filename
 >kmail.antispamrc</filename
-> (emmagatzemat en el directori de configuració global o local del &kde;). En primer terme comprovarà la configuració global i després la local: si el fitxer de configuració local conté entrades amb números de versió per eina majors, llavors s'usaran les dades de configuració del fitxer local; d'aquesta manera, ambdós, administradors i usuaris podran actualitzar la configuració de l'assistent. </para>
+> (emmagatzemat en el directori de configuració global o local del &kde;). En primer terme comprovarà la configuració global i després la local: si el fitxer de configuració local conté entrades amb números de versió per eina majors, llavors s'utilitzaran les dades de configuració del fitxer local; d'aquesta manera, ambdós, administradors i usuaris podran actualitzar la configuració de l'assistent. </para>
 
 <para
 >La detecció de missatges de correu brossa és arxivada creant accions <guilabel
@@ -3592,7 +3592,7 @@
 >Bàsics</title>
 
 <para
->El &kmail; no disposa d'una solució pròpia per a detectar virus: els desenvolupadors creuen que usar eines externes, però especialitzades, és la millor aproximació. El &kmail; usa aquestes eines amb la seva flexible arquitectura de filtratge. L'assistent contra els virus us ajudarà amb la configuració inicial del filtratge. </para>
+>El &kmail; no disposa d'una solució pròpia per a detectar virus: els desenvolupadors creuen que emprar eines externes, però especialitzades, és la millor aproximació. El &kmail; utilitza aquestes eines amb la seva flexible arquitectura de filtratge. L'assistent contra els virus us ajudarà amb la configuració inicial del filtratge. </para>
 
 <variablelist>
 <varlistentry>
@@ -3631,7 +3631,7 @@
 <para
 >L'assistent contra els virus bàsicament funciona exactament com l'<link linkend="the-anti-spam-wizard"
 >assistent contra el correu brossa</link
->. Aquí teniu els detalls sobre com funciona l'assistent: El &kmail; pot usar diverses eines externes per a detectar missatges amb virus; intentarà trobar automàticament quines d'aquestes eines estan instal·lades al vostre sistema i us mostrarà el resultat de la cerca. Podeu marcar les eines que desitgeu que usi el &kmail; per a detectar virus. Per descomptat, podeu tancar l'assistent, instal·lar una nova eina i tornar a iniciar una altra vegada l'assistent. </para>
+>. Aquí teniu els detalls sobre com funciona l'assistent: El &kmail; pot emprar diverses eines externes per a detectar missatges amb virus; intentarà trobar automàticament quines d'aquestes eines estan instal·lades al vostre sistema i us mostrarà el resultat de la cerca. Podeu marcar les eines que desitgeu que usi el &kmail; per a detectar virus. Per descomptat, podeu tancar l'assistent, instal·lar una nova eina i tornar a iniciar una altra vegada l'assistent. </para>
 
 <para
 >Si almenys heu escollit una eina podreu seleccionar algunes accions per a ser fetes en el &kmail; respecte als missatges que continguin virus: Per a permetre que el &kmail; detecti missatges que continguin virus obligatòriament haureu de marcar l'opció <guilabel
@@ -3654,9 +3654,9 @@
 >Detalls</title>
 
 <para
->L'assistent usa la informació emmagatzemada en un fitxer de configuració especial anomenat <filename
+>L'assistent empra la informació emmagatzemada en un fitxer de configuració especial anomenat <filename
 >kmail.antivirusrc</filename
-> (emmagatzemat en el directori de configuració global o local del &kde;). En primer terme comprovarà la configuració global i després la local: si el fitxer de configuració local conté entrades amb números de versió per eina majors, llavors s'usaran les dades de configuració del fitxer local; d'aquesta manera, ambdós, administradors i usuaris podran actualitzar la configuració de l'assistent. </para>
+> (emmagatzemat en el directori de configuració global o local del &kde;). En primer terme comprovarà la configuració global i després la local: si el fitxer de configuració local conté entrades amb números de versió per eina majors, llavors s'utilitzaran les dades de configuració del fitxer local; d'aquesta manera, ambdós, administradors i usuaris podran actualitzar la configuració de l'assistent. </para>
 
 <para
 >La detecció de missatges que contenen virus és arxivada creant accions <guilabel
diff -Nru kmail-19.04.3/po/ca/kmail.po kmail-19.12.3/po/ca/kmail.po
--- kmail-19.04.3/po/ca/kmail.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/ca/kmail.po	2020-03-03 00:33:55.000000000 +0000
@@ -12,15 +12,15 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-04-01 21:27+0100\n"
-"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-12-20 14:31+0100\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.03.70\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Accelerator-Marker: &\n"
 
@@ -187,7 +187,7 @@
 #: aboutdata.cpp:339
 #, kde-format
 msgid "Timestamp for 'Transmission completed' status messages"
-msgstr "Marca temporal per als missatges d'estat de «Transmissió completa»"
+msgstr "Marca de temps per als missatges d'estat de «Transmissió completa»"
 
 #: aboutdata.cpp:347
 #, kde-format
@@ -195,8 +195,8 @@
 msgstr "Múltiples claus d'encriptatge per adreça"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -302,27 +302,27 @@
 "El KMail no ha pogut detectar del tot una llista de correu en aquesta "
 "carpeta. Ompliu les adreces a mà."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Ús:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Estat:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% ple"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "Usat %1 de %2"
@@ -345,7 +345,7 @@
 "associar amb aquesta carpeta.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Plantilles"
@@ -356,106 +356,106 @@
 msgstr "&Usa plantilles de missatge personalitzades en aquesta carpeta"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copia les plantilles globals"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Visualització"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Empra &icones personalitzades"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Sense llegir:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Mostra la columna Remitent/Destinatari a la llista de missatges"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Most&ra la columna:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Omissió"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Remitent"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatari"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Llista de missatges"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Usa l'agregació per omissió"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregació"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Usa el tema per omissió"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Format per omissió del missatge"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Prefereix HTML sobre text"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Prefereix text sobre HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Usa l'arranjament global"
@@ -465,100 +465,105 @@
 msgid "Retrieval Options"
 msgstr "Opcions de recuperació"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identitats"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Recepció"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Enviament"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Servidor LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Comptes de sortida (afegiu-ne un com a mínim):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opcions comunes"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Confirma abans d'&enviar"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Verifica l'ortografia abans d'enviar"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Mai automàticament"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "En les comprovacions de correu manuals"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "En totes les comprovacions de correu"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Envia ara"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Envia més tard"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Envia els missatges de la carpeta &sortida:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Mètode d'enviament &predeterminat:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Activa «Desfés l'enviament»"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Afegeix un compte de correu..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Personalitza el compte..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -567,30 +572,30 @@
 "No s'ha pogut iniciar l'assistent de comptes. Comproveu que l'AccountWizard "
 "estigui instal·lat correctament."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "No s'ha pogut iniciar l'assistent de comptes"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Inclou en la comprovació manual de correu"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Canvia a fora de línia en aturar el KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Comprova el correu en iniciar"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -648,7 +653,7 @@
 msgid "Fixed Width Font"
 msgstr "Tipus de lletra d'amplada fixa"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Editor"
@@ -956,61 +961,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "No s'ha pogut crear l'etiqueta. Ja n'existeix una amb el mateix nom."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "General"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Plantilles estàndard"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Plantilles personalitzades"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Assumpte"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Joc de caràcters"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Capçaleres"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Adjunts"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Correcció automàtica"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Redimensiona automàticament les imatges"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signatura"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1019,12 +1024,12 @@
 "Insereix automàticament la signatura configurada\n"
 "quan es comença a escriure un missatge"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Insereix la signatura dalt de qualsevol text citat"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1033,18 +1038,18 @@
 "Insereix el separador de la signatura compatible amb RFC\n"
 "(dos guions i un espai en una línia) abans de la signatura"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "En respondre, no citar cap signatura existent"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1055,7 +1060,7 @@
 "(en lloc del missatge sencer), si hi ha text\n"
 "seleccionat a la finestra de missatge."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1066,17 +1071,17 @@
 "les línies del text citat, encara que la línia s'hagi creat afegint\n"
 "un trencament de línia addicional quan el text s'hagi ajustat per paraules."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Activa l'ajust de línia automàtic a l'amplada especificada"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Estableix l'amplada del text per a l'ajust de línia automàtic"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1087,7 +1092,7 @@
 "original en el qual es va rebre. Si no està marcada, per omissió\n"
 "es respondrà com a text net."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1098,34 +1103,34 @@
 "marcat HTML. Està admès pel text en negreta, cursiva i subratllat,\n"
 "així com les llistes i les referències externes."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Inclòs"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Com a adjunt"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Estableix el format per omissió del missatge reenviat"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tipus de reenviament per defecte:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1136,17 +1141,17 @@
 "Podeu seleccionar aquesta opció segons cada missatge usant\n"
 "«Opcions - Notificacions de processament del missatge (MDN)»"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Avisa si s'especifiquen massa destinataris"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Estableix el nombre màxim de destinataris per a l'avís"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1163,7 +1168,7 @@
 "Tingueu en compte, però, que això no es té en compte per a les llistes\n"
 "de distribució o llistes de correu."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1172,18 +1177,18 @@
 "Recorda les últimes adreces introduïdes,\n"
 "i les ofereix per a la compleció del destinatari"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "No desis"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Nombre màxim d'adreces recents retingudes:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1192,23 +1197,23 @@
 "El nombre màxim d'adreces introduïdes recentment\n"
 "que serà recordat per a la compleció"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configura la compleció..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Desat automàtic"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "No desis automàticament"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1216,18 +1221,18 @@
 msgstr[0] " minut"
 msgstr[1] " minuts"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Desa automàticament el missatge en aquest interval especificat"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "P&refixos per a l'assumpte de la resposta"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1236,59 +1241,59 @@
 "Reconeix qualsevol seqüència dels següents prefixos\n"
 "(les entrades són expressions regulars insensibles a majúscules/minúscules):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "A&fegeix..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Elimina"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Introduïu un nou prefix de resposta:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "&Prefixos per a l'assumpte en reenviar"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Afegeix..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Elimina"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Introduïu un prefix nou per a reenviar:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1298,89 +1303,89 @@
 "missatge cercant un joc de caràcters amb tots els caràcters requerits."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Introduïu el joc de caràcters:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Ma&ntén el joc de caràcters original en respondre o reenviar (si és possible)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Aquest joc de caràcters no està admès."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Usa el sufix personalitzat d'identificador del missatge"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Sufix personalitzat d'&identificador del missatge:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Defineix els camps personalitzats per a la capçalera MIME:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nom"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valor"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&u"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nom:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 "«Content-Type» no és cap cadena autoritzada. Aquesta capçalera no es desarà."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Capçalera no vàlida"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Denominació dels adjunts compatible amb l'Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1389,40 +1394,40 @@
 "Activeu aquesta opció per fer que l'Outlook(tm) comprengui els noms dels "
 "adjunts que continguin caràcters no anglesos"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Ha&bilita la detecció de la falta d'adjunts"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Reconeix qualsevol de les següents paraules clau com a intenció d'afegir un "
 "adjunt:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Introduïu una paraula clau nova:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Mida màxima de l'adjunt:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Sense límit"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1508,7 +1513,7 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Connectors de conversió de text"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1623,7 +1628,7 @@
 msgid "Archive Folder"
 msgstr "Arxiva la carpeta"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1689,19 +1694,19 @@
 msgid "Notification"
 msgstr "Notificació"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 adjunt (%2)"
 msgstr[1] "%1 adjunts (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Oculta la llista d'adjunts"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Mostra la llista d'adjunts"
@@ -1718,334 +1723,334 @@
 msgid "Encoding"
 msgstr "Codificació"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Seleccioneu el diccionari a utilitzar en verificar l'ortografia d'aquest "
 "missatge"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Seleccioneu la carpeta per al correu enviat, on es desarà una còpia d'aquest "
 "missatge"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 "Seleccioneu el compte de sortida a utilitzar per enviar aquest missatge"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Indiqueu l'adreça de correu «Des de:» per aquest missatge"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Indiqueu un assumpte per aquest missatge"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitat:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Diccionari:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Carpeta per al correu envia&t:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Transport de correu:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&De:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Ass&umpte:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Envia el correu"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Envia el correu a través de"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Envia"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Envia més &tard"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Envia més &tard a través de"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "A la cua"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "&Desa com a esborrany"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Desa el correu a la carpeta d'esborranys"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Desa com a plan&tilla"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Desa el correu a la carpeta de plantilles"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Desa com a &fitxer"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Desa el correu com un fitxer de text o HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Insereix un fitxer de text..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Insereix un fitxer de text recent"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Llibreta d'&adreces"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Obre la llibreta d'adreces"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "Editor nou"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Tria els &destinataris..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Desa la llista de &distribució..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Enganxa com a ad&junt"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Neteja els &espais"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Usa un tipus de lletra d'amplada fi&xa"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgent"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Sol·licitud de notificació de p&rocessament (MDN)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Sol·licitud de confirmació d'ent&rega"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Talla les paraules"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Retalls"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Verificació &automàtica de l'ortografia"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Edició de text enriquit"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Text enriquit"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Alterna el mode d'edició de text enriquit"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Tots els camps"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitat"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Diccionari"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Carpeta per al c&orreu enviat"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Transport de &correu"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&De"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Ass&umpte"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Adjunta la s&ignatura"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Preposa la s&ignatura"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Adjunta la signatura a la posició del c&ursor"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Corrector ortogràfic..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Corrector ortogràfic"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Encripta el missatge"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Encripta"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Signa el missatge"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signa"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Format &criptogràfic dels missatges"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Selecciona un format criptogràfic per aquest missatge"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Crea un recordatori de seguiment..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configura el KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2054,53 +2059,53 @@
 "<qt>Això ocultarà la barra de menús completament. La podeu tornar a mostrar "
 "prement %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Oculta la barra de menús"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Línia: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Columna: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "SOB"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Verificació ortogràfica: activada"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Verificació ortogràfica: desactivada"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Torna a de&sar com a plantilla"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Desa com a esborrany"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2109,7 +2114,7 @@
 "Torna a desar aquest missatge a la carpeta de plantilles. Podrà ser usat més "
 "tard."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2118,82 +2123,82 @@
 "Desa aquest missatge a la carpeta d'esborranys. Podrà ser editat i enviat "
 "més tard."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Desitgeu desar el missatge per a més tard o descartar-lo?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Tanca l'editor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Ha fallat en desar automàticament el missatge"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Ha fallat en enviar el missatge"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Inserció d'un fitxer"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Afegeix com a &imatge inclosa"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Afegeix com a &adjunt"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nom de l'adjunt:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "El nom de l'adjunt no pot estar buit"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Nom no vàlid de l'adjunt"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Afegeix un URL al missatge"
 msgstr[1] "Afegeix alguns URL al missatge"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Afegeix un fitxer com a &adjunt"
 msgstr[1] "Afegeix alguns fitxers com a &adjunts"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Insereix el text del porta-retalls com a adjunt"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "sense nom"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2206,12 +2211,12 @@
 "per a usar-la amb aquest objectiu.</p><p>Seleccioneu la clau o claus a usar "
 "a la configuració de la identitat.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Clau d'encriptatge no definida"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2222,12 +2227,12 @@
 "de signatura a usar (OpenPGP o S/MIME).</p><p>Escolliu la clau a usar a la "
 "configuració de la identitat.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Clau de signatura no definida"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2238,7 +2243,7 @@
 "heu d'establir l'adreça de correu electrònic per a totes les identitats de "
 "forma que no hàgiu d'introduir-la per cada missatge."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2247,37 +2252,37 @@
 "Almenys cal especificar un destinatari ja sigui en el camp Per a: o com a CC "
 "o com a BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "El camp «A:» és buit. Voleu que enviï el missatge igualment?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "No s'ha especificat res a «A:»"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "No heu especificat un assumpte. Voleu que enviï el missatge igualment?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "No s'ha especificat l'assumpte"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Envia t&al qual"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Especifica l'assumpte"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2285,22 +2290,22 @@
 msgstr ""
 "Almenys haureu d'especificar un destinatari per tal d'encriptar un esborrany."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "A punt d'enviar el correu..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Envia la confirmació"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Envia ara"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2308,22 +2313,22 @@
 msgstr ""
 "Esteu intentant enviar el correu a més de %1 destinataris. L'envio igualment?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Massa destinataris"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Envia t&al qual"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Edita els destinataris"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2331,22 +2336,22 @@
 msgstr ""
 "Desactivar el mode HTML farà que el text perdi la formatació. Esteu segur?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Perdo el formatat?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perd la formatació"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Afegeix un marcador de text net"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2355,7 +2360,7 @@
 "S'emprarà encriptació d'alta seguretat per a aquest destinatari (la clau de "
 "l'encriptatge és de plena confiança). Feu clic a la icona per a més detalls."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2365,7 +2370,7 @@
 "de l'encriptatge és de confiança parcial). Feu clic a la icona per a més "
 "detalls."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2375,7 +2380,7 @@
 "de l'encriptatge és de confiança no fiable). Feu clic a la icona per a més "
 "detalls."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2386,7 +2391,7 @@
 "seguretat de l'encriptatge és desconeguda (la clau de l'encriptatge no s'ha "
 "pogut verificar). Feu clic a la icona per a més detalls."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Informació del connector d'edició"
@@ -2463,7 +2468,7 @@
 msgid "External editor was started."
 msgstr "S'ha iniciat l'editor extern."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2472,20 +2477,20 @@
 "No s'ha trobat el transport. Verifiqueu que esteu emprant un transport de "
 "correu correcte."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "No s'ha definit la carpeta d'enviats. Si us plau, establiu-la abans d'enviar "
 "el correu."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "No s'ha trobat la identitat. Verifiqueu que esteu emprant la correcta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2513,11 +2518,6 @@
 msgid "Message will not be encrypted"
 msgstr "El missatge no s'encriptarà"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Retalls de text"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2565,27 +2565,27 @@
 msgid "Cannot move messages."
 msgstr "No s'han pogut moure els missatges."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "No s'ha pogut recuperar la carpeta. Error notificat: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "No s'ha retornat la carpeta."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "No s'ha pogut recuperar la carpeta pare. Error notificat: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "No s'ha pogut retornar la llista de carpetes."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Missatges arxivats"
@@ -2626,48 +2626,48 @@
 msgid "&Existing identities:"
 msgstr "Identitats e&xistents:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Error en generar una nova parella de claus: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Error en generar la clau"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Sense clau"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Genera una nova parella de claus:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "S'està generant una parella de claus nova..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Edita la identitat"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "General"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "El &vostre nom:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2679,12 +2679,12 @@
 "p><p>Si el deixeu en blanc, el vostre nom real no apareixerà, tan sols "
 "l'adreça de correu electrònic.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organit&zació:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2696,12 +2696,12 @@
 "electrònic que envieu.</p><p>És segur (i normal) deixar aquest espai en "
 "blanc.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "A&dreça de correu:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2717,12 +2717,12 @@
 "p><p>Si deixeu això en blanc, o malament, la gent tindrà problemes per a "
 "respondre-us.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Àlies de correu electrònic:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2739,12 +2739,12 @@
 "tr><tr><th>Àlies:</th><td>nom@exemple.org<br>cognom@exemple.org</td></tr></"
 "table><p>Escriviu un àlies d'adreça per línia.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Criptografia"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2757,15 +2757,15 @@
 "digitalment els missatges. També podeu usar claus GnuPG.</p><p>Podeu deixar "
 "aquest camp en blanc, però el KMail no serà capaç de signar digitalment "
 "correus electrònics. Les funcions normals del correu no se'n veuran "
-"afectades.</p>Podeu trobar més informació quant a les claus a <a>https://www."
+"afectades.</p>Trobareu més informació quant a les claus a <a>https://www."
 "gnupg.org</a></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Clau de signatura OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2780,15 +2780,15 @@
 "pública» a l'editor. També podeu usar claus GnuPG.</p><p>Podeu deixar aquest "
 "camp en blanc, però el KMail no serà capaç d'encriptar els correus "
 "electrònics sortints. Les funcions normals del correu no se'n veuran "
-"afectades.</p><p>Podeu trobar més informació quant a les claus a <a>https://"
-"www.gnupg.org</a></p></qt>"
+"afectades.</p><p>Trobareu més informació quant a les claus a <a>https://www."
+"gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Clau d'encriptatge OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2801,12 +2801,12 @@
 "KMail no serà capaç de signar digitalment correus electrònics usant S/MIME. "
 "Les funcions normals del correu no se'n veuran afectades.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificat de signatura S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2821,39 +2821,39 @@
 "dels missatges de sortida a vós mateix usant S/MIME. Les funcions normals "
 "del correu no es veuran afectades.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificat d'encriptatge S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Format preferit:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Signa els missatges automàticament"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Encripta els missatges automàticament sempre que sigui possible"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avançat"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Adreça de &Respon-a:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2871,12 +2871,12 @@
 "<tt>From:</tt>, però que qualsevol resposta es dirigeixi a un grup d'adreces."
 "</p><p>Si en dubteu, deixeu aquest camp en blanc.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adre&ces CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2893,12 +2893,12 @@
 "adreça useu comes per separar la llista de destinataris CC</p><p>Si en "
 "dubteu, deixeu aquest camp en blanc.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Adre&ça BCC:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2915,57 +2915,57 @@
 "p> <p>Per especificar més d'una adreça useu comes per separar la llista de "
 "destinataris BCC</p><p>Si en dubteu, deixeu aquest camp en blanc.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&iccionari:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Carpeta per al correu &enviat:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Carpeta pels esb&orranys:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Carpeta per a les plan&tilles:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Compte sortint:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Adjunta la meva vCard al missatge"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Crea..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Idioma de correcció automàtica:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Restaura el nom de domini per omissió"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "&Domini predeterminat:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2974,33 +2974,33 @@
 "<qt><p>El nom de domini per omissió s'empra per a la compleció de les "
 "adreces de correu que tan sols consisteixin en un nom d'usuari.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Usa plantilles de missatge personalitzades per aquesta identitat"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signatura"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Imatge"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Àlies de correu no vàlid «%1»"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Adreça de correu no vàlida"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3013,7 +3013,7 @@
 "Això pot provocar missatges d'avís a la banda receptora en provar de "
 "verificar signatures fetes amb aquesta configuració."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3022,7 +3022,7 @@
 "Una de les claus d'encriptatge configurades a l'OpenPGP no conté cap ID de "
 "l'usuari amb l'adreça de correu configurada per a aquesta identitat (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3035,7 +3035,7 @@
 "Això pot provocar missatges d'avís a la banda receptora en provar de "
 "verificar signatures fetes amb aquesta configuració."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3044,22 +3044,22 @@
 "Un dels certificats d'encriptatge configurats a l'S/MIME no conté l'adreça "
 "de correu configurada per a aquesta identitat (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "No s'ha trobat l'adreça de correu a la clau/certificat"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "El fitxer de signatura no és vàlid"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Edita la identitat «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3068,7 +3068,7 @@
 "No hi ha cap carpeta personalitzada per a la identitat, per tant s'usarà la "
 "carpeta d'esborranys predeterminada."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Edita..."
@@ -3099,6 +3099,18 @@
 msgid "We cannot delete vCard file."
 msgstr "No s'ha pogut suprimir el fitxer de vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Realment voleu cancel·lar?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmació"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3263,7 +3275,7 @@
 "Hi ha exemples disponibles a <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Imatge"
@@ -3297,7 +3309,7 @@
 msgstr[0] "La llista de distribució «%2» és buida, no es pot usar."
 msgstr[1] "Les llistes de distribució «%2» són buides, no es poden usar."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Afegeix a la llibreta d'adreces"
@@ -3307,22 +3319,22 @@
 msgid "Contact created successfully"
 msgstr "El contacte s'ha creat correctament"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "El contacte no s'ha pogut emmagatzemar: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Ha fallat en emmagatzemar el contacte"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Desitgeu adjuntar aquesta carpeta «%1»?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Adjunta la carpeta"
@@ -3536,14 +3548,14 @@
 msgstr "&Carpeta"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Aplica els filtres sobre la carpeta"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3569,7 +3581,7 @@
 msgstr "Reen&via"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Aplica el filtratge"
@@ -3594,7 +3606,7 @@
 msgstr "A&juda"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barra d'eines principal"
@@ -3648,13 +3660,13 @@
 msgid "The file does not contain a message."
 msgstr "El fitxer no conté un missatge."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "El fitxer conté múltiples missatges. Només es mostra el primer missatge."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3663,32 +3675,32 @@
 "Voleu reenviar els missatges seleccionats com a adjunts en un missatge (com "
 "a un resum MIME) o com a missatges individuals?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Envia com a un resum"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Envia individualment"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtratge de missatges"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "S'està filtrant el missatge %1 de %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "S'estan movent els missatges"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "S'estan suprimint els missatges"
@@ -3717,31 +3729,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Barra d'eines de direcció del text"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "S'ha establert que el KMail estigui desconnectat; s'han suspès tots els "
 "treballs de xarxa"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Envia el correu"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "És impossible enviar el correu"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "S'ha establert que el KMail estigui connectat; s'han reprès tots els "
 "treballs de xarxa"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3750,40 +3762,40 @@
 "S'ha establert que el KMail estigui connectat; es reprendran tots els "
 "treballs de xarxa en detectar-se una connexió de xarxa"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "El KMail està actualment en el mode desconnectat. Com voleu continuar?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Connectat/desconnectat"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Treballa en línia"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Treballa desconnectat"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "S'ha detectat una connexió de xarxa, s'han reprès tots els treballs de xarxa"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "No s'ha detectat cap connexió de xarxa, s'han suspès tots els treballs de "
 "xarxa"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3792,12 +3804,12 @@
 "Ha fallat en obrir el fitxer de desament automàtic a %1.\n"
 "Motiu: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Ha fallat l'obertura del fitxer de desament automàtic"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3806,7 +3818,7 @@
 msgstr[1] ""
 "Aquestes %1 identitats s'han canviat per usar el transport per omissió:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3815,43 +3827,47 @@
 msgstr[1] ""
 "Aquestes %1 identitats s'han canviat per usar el transport modificat:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "S'estan enviant els missatges"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "S'està iniciant el procés d'enviament..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "El recurs %1 està trencat."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"El recurs %1 està trencat.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "L'agent per arxivar el correu no està registrat."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "L'agent per enviar més tard no està registrat."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "L'agent per recordatoris de seguiment no està registrat."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3860,12 +3876,12 @@
 "No s'ha pogut iniciar el gestor de certificats. Comproveu que el Kleopatra "
 "estigui instal·lat correctament."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "S'ha produït un error al KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3874,26 +3890,26 @@
 "No s'ha pogut iniciar l'assistent d'importació. Comproveu que l'ImportWizard "
 "estigui instal·lat correctament."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "No s'ha pogut iniciar l'assistent d'importació"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"No s'ha pogut iniciar el programa «Exportador de la configuració PIM». "
-"Comproveu la vostra instal·lació."
+"No s'ha pogut iniciar el programa «Exportador de dades PIM». Comproveu la "
+"vostra instal·lació."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "No s'ha pogut iniciar el programa «Exportador de la configuració PIM»"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "No s'ha pogut iniciar el programa «Exportador de dades PIM»"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3902,71 +3918,71 @@
 "No s'ha pogut iniciar l'ImportWizard. Comproveu que l'ImportWizard estigui "
 "instal·lat correctament."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "No s'ha pogut iniciar l'ImportWizard"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "S'ha trobat un altre programa de correu en el sistema. Voleu importar-ne les "
 "dades?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "No s'ha pogut iniciar l'assistent d'importació. Comproveu la vostra "
 "instal·lació."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Sense assumpte"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(sense plantilles)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Aquesta carpeta no té configurada cap opció de caducitat"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Realment voleu fer que caduqui la carpeta <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Fes que caduqui la carpeta"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Fes que &caduqui"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Buida la paperera"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Mou a la paperera"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Realment voleu buidar la paperera?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3975,27 +3991,27 @@
 "<qt>Realment voleu moure tots els missatges de la carpeta <b>%1</b> a la "
 "paperera?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "S'han mogut tots els missatges a la paperera"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Realment voleu que caduquin tots els missatges antics?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Voleu que caduquin els missatges antics?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Fes que caduqui"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4006,17 +4022,17 @@
 "podeu estar incrementant la possibilitat que el sistema es vegi compromès "
 "per altres forats de seguretat presents i futurs."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Carrega les referències externes"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4031,533 +4047,533 @@
 "<qt>Realment voleu suprimir els %1 missatges seleccionats?<br />Una vegada "
 "els hàgiu suprimit no es podran restaurar.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Suprimeix els missatges"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Suprimeix el missatge"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "S'estan movent els missatges..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "S'estan suprimint els missatges..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Els missatges s'han suprimit correctament."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Els missatges s'han mogut correctament."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "L'acció de suprimir els missatges ha fallat."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "S'ha cancel·lat la supressió dels missatges."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "L'acció de moure els missatges ha fallat."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "L'acció de moure els missatges s'ha cancel·lat."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Mou els missatges a la carpeta"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "S'estan copiant els missatges..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Els missatges s'han copiat correctament."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "L'acció de copiar els missatges ha fallat."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "S'ha cancel·lat l'acció de copiar els missatges."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copia els missatges a una carpeta"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "S'estan movent els missatges a la paperera..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "S'estan suprimint i movent els missatges a la paperera..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Els missatges s'han mogut a la paperera correctament."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Els missatges s'han mogut a la paperera o suprimit correctament"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "L'acció de moure els missatges a la paperera ha fallat."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Ha fallat en suprimir o moure els missatges a la paperera."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "S'ha cancel·lat l'acció de moure els missatges a la paperera."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr ""
 "S'ha cancel·lat l'acció de suprimir o moure els missatges a la paperera."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Salta a la carpeta"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "&Desa com a..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Fes que caduquin &totes les carpetes"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Compro&va el correu"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Comprova el correu a"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Comprova el correu"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Envia la cua de missatges"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Estat de la connexió (desconegut)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Envia la cua de missatges via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gestor de certificats"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importa els missatges..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Depura el «sieve»..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visor del &registre de filtratge..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importa des d'un altre client de correu..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Edita les respostes «fora de l'oficina»..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configura l'arxivat automàtic..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Missatges ajornats..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Missatges de recordatori de seguiment..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Su&primeix"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Mou el &fil a la paperera"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Mou el fil a la paperera"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Suprimeix el &fil"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Cerca als missatges..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Selecciona &tots els missatges"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Gestiona la llista de correu..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Assigna una drecera..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Arranjament de la caducitat"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arxiva la carpeta..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Carrega les referències e&xternes"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copia el missatge a..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Mou el missatge a..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Missatge &nou..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nou"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Missatge des d'una plan&tilla"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Missatg&e nou a una llista de correu..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Crea un filtre"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtra per l'&Assumpte..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtra pel &De..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtra pel &Per a..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtra pel &CC..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marca la &conversa"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marca la conversa com a &llegida"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marca tots els missatges en la conversa seleccionada com a llegits"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marca la conversa com a &sense llegir"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr ""
 "Marca tots els missatges en la conversa seleccionada com a sense llegir"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marca la conversa com a &important"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Elimina la marca d'&important de la conversa"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marca la conversa com un element d'&acció"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Elimina la marca d'element d'&acció de la conversa"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Vigila la conversa"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignora la conversa"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Desa els ad&junts..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copia'l desencriptat a..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Aplica tots els &filtres"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expandeix la conversa/grup"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expandeix la conversa o grup actual"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Redueix la conversa/grup"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Redueix la conversa o grup actual"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ex&pandeix totes les converses"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expandeix totes les converses a la carpeta actual"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Redueix totes les converses"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Redueix totes les converses a la carpeta actual"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "M&ostra el missatge"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Missatge se&güent"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Vés al missatge següent"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Missatge següent &sense llegir"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Següent"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Vés al missatge següent sense llegir"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Missatge &anterior"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Vés al missatge anterior"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Missatge anterior sense llegir"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Anterior"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Vés al missatge anterior sense llegir"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Ca&rpeta següent sense llegir"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Vés a la carpeta següent que tingui missatges sense llegir"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "&Carpeta anterior sense llegir"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Vés a la carpeta anterior que tingui missatges sense llegir"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "&Text següent sense llegir"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Vés al text següent sense llegir"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4566,225 +4582,230 @@
 "Descendeix en el missatge actual. Si s'arriba al final del missatge, anirà "
 "cap al missatge següent sense llegir."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configura els &filtres..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
-msgstr "Gestiona els scripts «&sieve»..."
+msgstr "Gestiona els scripts de «&Sieve»..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Afegeix un compte..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "I&ntroducció al KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Mostra la pàgina de benvinguda del KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configura les &notificacions..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configura el KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Fes que caduqui..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Afegeix una carpeta preferida..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Subscripció de la banda del servidor..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Aplica tots els filtres"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importa/Exporta les dades del KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Contacte nou a la llibreta d'adreces..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copia el missatge a la carpeta"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Salta a la carpeta..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Interromp l'operació actual"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Apunta a la carpeta següent"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Apunta a la carpeta anterior"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Selecciona la carpeta on apuntar"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Apunta a la primera carpeta"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Apunta a l'última carpeta"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Apunta al missatge següent"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Apunta al missatge anterior"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Selecciona el primer missatge"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Selecciona l'últim missatge"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Selecciona el missatge amb el focus"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Estableix el focus a la cerca ràpida"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Amplia la selecció al missatge anterior"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Amplia la selecció al missatge següent"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Mou el missatge a la carpeta"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Usa menys amplada de banda"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 "Marca tots els missatges com a llegits en aquesta carpeta i totes les "
 "subcarpetes"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Elimina els duplicats en aquesta carpeta i totes les seves subcarpetes"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "A&rranjament del compte"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Reinicia el compte"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Afegeix una carpeta preferida"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Buida la &paperera"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Mou tots els missatges a la paperera"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Su&primeix la cerca"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Edita la cerca..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Desfés"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Desfés: «%1»"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtre %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Cerca... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4795,12 +4816,12 @@
 "podeu estar incrementant la possibilitat que el sistema es vegi compromès "
 "per altres forats de seguretat presents i futurs."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Usa HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4816,119 +4837,119 @@
 "desactivar completament la característica als ajustaments del connector del "
 "KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Activo les bústies unificades?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Activació de les bústies unificades"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "S'està iniciant..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Mou a la paperera"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Mou a la paperera"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Mou el missatge a la paperera"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "No s'ha pogut copiar l'element. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Missatge nou a..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Respon a..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Reenvia a..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Afegeix a un contacte existent"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Obre a la llibreta d'adreces"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Apunta aquest enllaç"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Edita el contacte..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Desa l'enllaç com a..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
-msgstr "C&erca al missatge..."
+msgstr "&Cerca al missatge..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Desa la imatge al disc..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Mostra en format HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Mostra el format HTML quan el correu provingui d'aquest contacte"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Carrega les referències externes quan el correu provingui d'aquest contacte"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Comparteix la imatge..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4937,63 +4958,63 @@
 "El KMail ara està basat en el marc de treball per a la gestió de la "
 "informació personal Akonadi, el qual incorpora molts canvis per tot arreu."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Correu electrònic per enviament (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Millora a les cerques"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Implementació per afegir notes (anotacions) als correus"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Menys immobilitzacions de la IGU, la comprovació de correu es fa en segon pla"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Admet connectors"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Representador HTML nou (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "S'ha afegit la comprovació d'URL de pesca"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "El client de correu del KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "S'està rebent el contingut de la carpeta"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Espereu un moment..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Desconnectat"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5002,7 +5023,7 @@
 "El KMail ara està en mode desconnectat. Cliqueu <a href=\"kmail:goOnline"
 "\">aquí</a> per a connectar-vos...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5011,22 +5032,22 @@
 "El compte ara està en mode desconnectat. Cliqueu <a href=\"kmail:"
 "goResourceOnline\">aquí</a> per a connectar-vos...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "El contacte s'ha modificat correctament"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Missatges nous a"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "No hi ha missatges sense llegir"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5049,8 +5070,8 @@
 msgstr "Copyright © 2004–2010, Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5145,17 +5166,17 @@
 msgstr ""
 "Seleccioneu els connectors de resum a visualitzar a la pàgina de resum."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Resum del Kontact pel KDE"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5201,27 +5222,27 @@
 msgid "All"
 msgstr "Tot"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Resum del Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Visualitza el resum del Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(C) 2003-2019, els desenvolupadors del Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5250,7 +5271,7 @@
 msgid "&Reply"
 msgstr "&Respon"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Respon..."
@@ -5260,12 +5281,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Respon a l'a&utor..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Respon a &tots..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Respon a la &llista de correu..."
@@ -5295,7 +5316,7 @@
 msgid "&Edit As New"
 msgstr "&Edita com a nou"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5486,82 +5507,82 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "La cerca ha fallat i s'han trobat alguns errors: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Cerca als missatges"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Cerca"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Inclou..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Com a &adjunt..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Desa els adjunts..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Neteja la selecció"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Salta a la carpeta original"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 coincidència"
 msgstr[1] "%1 coincidències"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Última cerca"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "No heu seleccionat una carpeta vàlida."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Heu oblidat seleccionar les col·leccions."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Heu oblidat definir la condició."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Totes les carpetes seleccionades estan buides o sense indexar."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Heu oblidat afegir les condicions."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5569,57 +5590,57 @@
 "Conté una condició que no es pot usar amb un nombre de caràcters inferior a "
 "4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "S'està cercant..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "La cerca no ha pogut obtenir cap resultat. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "La cerca ha fallat."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "S'ha finalitzat la cerca."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "S'ha aturat la cerca."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
 "that another search folder with the same name already exists. Error returned "
 "\"%1\"."
 msgstr ""
-"S'ha produït un problema en reanomenar la carpeta de cerques. Un motiu "
+"S'ha produït un problema en reanomenar la carpeta de cerca. Un motiu "
 "freqüent per això és que ja existeix una altra carpeta de cerca amb el "
 "mateix nom. Error retornat «%1»."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copia un missatge"
 msgstr[1] "Copia %1 missatges"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Retalla un missatge"
 msgstr[1] "Retalla %1 missatges"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "S'està verificant l'estat de l'índex..."
@@ -5755,7 +5776,7 @@
 "per a ús intern)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5765,7 +5786,7 @@
 "detectar més d'un compte de correu electrònic. Només es farà una vegada."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5774,26 +5795,26 @@
 "Aquest valor s'usa per a decidir si s'ha de mostrar la introducció del KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Mostra la línia d'edició de cerca ràpida de carpeta"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Reenvia inclòs per defecte."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Avisa si el nombre de destinataris és més gran que:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5804,19 +5825,19 @@
 "i demanarà la confirmació abans d'enviar el correu. L'avís es pot desactivar."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Verifica l'ortografia abans d'enviar"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Petició automàtica de les notificacions de processament del &missatge"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5834,13 +5855,13 @@
 "p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Desa automàticament cada:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5852,86 +5873,86 @@
 "desactivar el desament automàtic establint el valor a 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Mostra el plafó de gestió de retalls de text i inserció a l'editor."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "En comprovar, els missatges enviats s'emmagatzemaran en el format encriptat"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Una llista de tots els URL usats recentment"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Una llista de totes les codificacions usades recentment"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Mostra l'indicador de l'etiqueta de criptografia"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Valida la drecera per omissió per enviar"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "La mida del diàleg d'identitat (només per a ús intern)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "L'amplada de la finestra de cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "L'alçada de la finestra de cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "L'amplada del diàleg de configuració del KMail (només per a ús intern)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "L'alçada del diàleg de configuració del KMail (només per a ús intern)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Subfinestra de vista prèvia del missatge"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "No mostris la subfinestra de vista prèvia de missatges"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
@@ -5939,7 +5960,7 @@
 "missatges"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
@@ -5947,61 +5968,61 @@
 "llista de missatges"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Llista de carpetes"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Llista de carpetes llarga"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Llista de carpetes curta"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Plantilla de missatge pels missatges nous"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Plantilla de missatge per a les respostes"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Plantilla de missatge per a les respostes a tots"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Plantilla de missatge pels reenviaments"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Caràcters de citació"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Especifica la política usada en mostrar la política"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6011,7 +6032,7 @@
 "cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6021,7 +6042,7 @@
 "(només per a ús intern)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6031,7 +6052,7 @@
 "(només per a ús intern)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6041,7 +6062,7 @@
 "cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6051,7 +6072,7 @@
 "(només per a ús intern)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6324,7 +6345,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6360,7 +6381,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6529,7 +6550,7 @@
 #: ui/searchwindow.ui:133
 #, kde-format
 msgid "Open &Search Folder"
-msgstr "Obr&e la carpeta de cerques"
+msgstr "Obr&e la carpeta de cerca"
 
 #. i18n: ectx: property (text), widget (QPushButton, mSearchResultOpenBtn)
 #: ui/searchwindow.ui:143
@@ -6690,8 +6711,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Comprova el seguiment en l'URL del correu"
+msgid "Scan emails for tracking URLs"
+msgstr "Explora els correus per als URL de seguiment"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7311,6 +7332,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Torna a activar tots els avisos «No ho tornis a preguntar»"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 segons"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Desfés l'enviament"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7365,1551 +7396,3 @@
 #, kde-format
 msgid "Zoom: %1%"
 msgstr "Zoom: %1%"
-
-#~ msgid "Folder Name and Size When Close to Quota"
-#~ msgstr "Nom i mida de la carpeta quan s'apropi a la quota"
-
-#~ msgid "Set the \"Reply-To:\" email address for this message"
-#~ msgstr "Indiqueu l'adreça de correu «Respon a:» per aquest missatge"
-
-#~ msgid "&Reply to:"
-#~ msgstr "&Respon a:"
-
-#~ msgid "&Reply To"
-#~ msgstr "&Respon a"
-
-#~ msgid "&Use inline link style"
-#~ msgstr "&Usa l'estil de l'enllaç inclòs"
-
-#~ msgid "Check to be warned if the address is not in the certificate"
-#~ msgstr "Marqueu-ho perquè se us avisi si l'adreça no és al certificat"
-
-#~ msgid ""
-#~ "<qt>\n"
-#~ "<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of "
-#~ "the receiver is not contained in the certificate used for encrypting.\n"
-#~ "<p>\n"
-#~ "It is recommended to leave this option turned on for maximum security.\n"
-#~ "</p></qt>"
-#~ msgstr ""
-#~ "<qt>\n"
-#~ "<h1>Avisa si l'adreça de correu d'un destinatari no és al certificat</"
-#~ "h1>\n"
-#~ "Si es marca aquesta opció, se us avisarà si l'adreça de correu del "
-#~ "destinatari no es troba al certificat emprat per encriptar.\n"
-#~ "<p>\n"
-#~ "Per tal d'augmentar la seguretat es recomana deixar marcada aquesta "
-#~ "opció.\n"
-#~ "</p></qt>"
-
-#~ msgid "Warn if &receiver's email address is not in certificate"
-#~ msgstr "Avisa si l'adreça de correu del &destinatari no és al certificat"
-
-#~ msgid "Zoom"
-#~ msgstr "Amplia"
-
-#~ msgid ""
-#~ "Specifies the version of the application that was last used (for internal "
-#~ "use only)"
-#~ msgstr ""
-#~ "Especifica la darrera versió de l'aplicació que es va usar (només per a "
-#~ "ús intern)"
-
-#~ msgid "Always sign/encrypt when sa&ving as draft"
-#~ msgstr "No signis/encriptis mai en desar com a es&borrany"
-
-#~ msgid "Close message window after replying or forwarding"
-#~ msgstr "Tanca la finestra de missatge després de contestar o reenviar"
-
-#~ msgid ""
-#~ "Could not start GnuPG LogViewer (kwatchgnupg); please check your "
-#~ "installation."
-#~ msgstr ""
-#~ "No s'ha pogut iniciar el Visor del registre de GnuPG (kwatchgnupg). "
-#~ "Comproveu la vostra instal·lació."
-
-#~ msgid "GnuPG Log Viewer"
-#~ msgstr "Visor del registre de GnuPG"
-
-#~ msgid "Select an identity for this message"
-#~ msgstr "Selecciona una identitat per aquest missatge"
-
-#~ msgid "Image (%1)"
-#~ msgstr "Imatge (%1)"
-
-#~ msgid "Message (*.mbox)"
-#~ msgstr "Missatge (*.mbox)"
-
-#~ msgid "Thank you,<br/>The KMail Team"
-#~ msgstr "Gràcies,<br/>L'equip del KMail"
-
-#~ msgctxt "sync everything"
-#~ msgid "All"
-#~ msgstr "Tot"
-
-#~ msgid ""
-#~ "*.vcf|vCard (*.vcf)\n"
-#~ "*|all files (*)"
-#~ msgstr ""
-#~ "*.vcf|vCard (*.vcf)\n"
-#~ "*|Tots els fitxers (*)"
-
-#~ msgid "Follow Up Mail..."
-#~ msgstr "Correu de seguiment..."
-
-#~ msgid "Maintenance"
-#~ msgstr "Manteniment"
-
-#~ msgid "Files"
-#~ msgstr "Fitxers"
-
-#~ msgid "Folder type:"
-#~ msgstr "Tipus de carpeta:"
-
-#~ msgctxt "folder size"
-#~ msgid "Not available"
-#~ msgstr "No disponible"
-
-#~ msgid "Size:"
-#~ msgstr "Mida:"
-
-#~ msgid "Messages"
-#~ msgstr "Missatges"
-
-#~ msgid "Total messages:"
-#~ msgstr "Total de missatges:"
-
-#~ msgid "Unread messages:"
-#~ msgstr "Missatges sense llegir:"
-
-#~ msgid "Enable Full Text Indexing"
-#~ msgstr "Activa la indexació de text complet"
-
-#~ msgid "Still not indexed."
-#~ msgstr "Encara no està indexat."
-
-#~ msgid "Reindex current Collection"
-#~ msgstr "Torna a indexar la col·lecció actual"
-
-#~ msgid "Remember that indexing can take some minutes."
-#~ msgstr "Recordeu que la indexació pot trigar uns minuts."
-
-#~ msgid "Indexed %1 item of this collection"
-#~ msgid_plural "Indexed %1 items of this collection"
-#~ msgstr[0] "S'ha indexat %1 element d'aquesta col·lecció"
-#~ msgstr[1] "S'han indexat %1 elements d'aquesta col·lecció"
-
-#~ msgid "&Account Wizard..."
-#~ msgstr "Assistent de &comptes..."
-
-#~ msgid "Offer to share for files larger than:"
-#~ msgstr "Ofereix compartir per a fitxers majors que:"
-
-#~ msgid "kmail2"
-#~ msgstr "kmail2"
-
-#~ msgid "Modify Archive Mail"
-#~ msgstr "Modifica un arxiu de correu"
-
-#~ msgid "Format:"
-#~ msgstr "Format:"
-
-#~ msgid "Path:"
-#~ msgstr "Camí:"
-
-#~ msgid "Backup each:"
-#~ msgstr "Fes una còpia de seguretat cada:"
-
-#~ msgid "Maximum number of archive:"
-#~ msgstr "Nombre màxim d'arxius:"
-
-#~ msgid "unlimited"
-#~ msgstr "sense límit"
-
-#~ msgid "Configure Archive Mail Agent"
-#~ msgstr "Configura l'agent per arxivar el correu"
-
-#~ msgid "Archive Mail Agent"
-#~ msgstr "Agent per arxivar el correu"
-
-#~ msgid "Archive emails automatically."
-#~ msgstr "Arxiva els correus electrònics automàticament."
-
-#~ msgid "Copyright (C) 2012-2017 Laurent Montel"
-#~ msgstr "Copyright (C) 2012-2017 Laurent Montel"
-
-#~ msgid "Laurent Montel"
-#~ msgstr "Laurent Montel"
-
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgid "Last archive"
-#~ msgstr "Darrer arxivament"
-
-#~ msgid "Next archive in"
-#~ msgstr "Proper arxivament d'aquí a"
-
-#~ msgid "Storage directory"
-#~ msgstr "Directori d'emmagatzematge"
-
-#~ msgid "Open Containing Folder..."
-#~ msgstr "Obre la carpeta contenidora..."
-
-#~ msgid "Archive now"
-#~ msgstr "Arxiva ara"
-
-#~ msgid "Folder: %1"
-#~ msgstr "Carpeta: %1"
-
-#~ msgid "Tomorrow"
-#~ msgid_plural "%1 days"
-#~ msgstr[0] "Demà"
-#~ msgstr[1] "%1 dies"
-
-#~ msgid "Archive will be done %1"
-#~ msgstr "L'arxivament es farà %1"
-
-#~ msgid "Do you want to delete selected items? Do you want to continue?"
-#~ msgstr "Suprimeixo els elements seleccionats? Voleu continuar?"
-
-#~ msgid "Remove items"
-#~ msgstr "Elimina els elements"
-
-#~ msgid ""
-#~ "Cannot add a second archive for this folder. Modify the existing one "
-#~ "instead."
-#~ msgstr ""
-#~ "No s'ha pogut afegir un segon arxiu per aquesta carpeta. En lloc d'això, "
-#~ "modifiqueu l'arxiu existent."
-
-#~ msgid "Directory does not exist. Please verify settings. Archive postponed."
-#~ msgstr ""
-#~ "El directori no existeix. Si us plau, verifiqueu els ajustaments. "
-#~ "L'arxivat s'ha posposat."
-
-#~ msgid "Start to archive %1"
-#~ msgstr "Comença a arxivar %1"
-
-#~ msgid "Days"
-#~ msgstr "Dies"
-
-#~ msgid "Weeks"
-#~ msgstr "Setmanes"
-
-#~ msgid "Months"
-#~ msgstr "Mesos"
-
-#~ msgid "Years"
-#~ msgstr "Anys"
-
-#~ msgid "Configure"
-#~ msgstr "Configura"
-
-#~ msgid "Follow Up Reminder Agent"
-#~ msgstr "Agent per a recordatoris de seguiment"
-
-#~ msgid "Follow Up Mail."
-#~ msgstr "Correu de seguiment."
-
-#~ msgid "Copyright (C) 2014-2017 Laurent Montel"
-#~ msgstr "Copyright (C) 2014-2017 Laurent Montel"
-
-#~ msgid "To"
-#~ msgstr "A"
-
-#~ msgid "Subject"
-#~ msgstr "Assumpte"
-
-#~ msgid "Dead Line"
-#~ msgstr "Data límit"
-
-#~ msgid "Answer"
-#~ msgstr "Respon"
-
-#~ msgid "Received"
-#~ msgstr "S'han rebut"
-
-#~ msgid "On hold"
-#~ msgstr "A l'espera"
-
-#~ msgid "Show Message"
-#~ msgstr "Mostra el missatge"
-
-#~ msgid "Do you want to remove selected item?"
-#~ msgstr "Voleu eliminar l'element seleccionat?"
-
-#~ msgid "Answer from %1 received"
-#~ msgstr "S'ha rebut resposta de %1"
-
-#~ msgid "Follow Up Mail"
-#~ msgstr "Correu de seguiment"
-
-#~ msgid "You still wait an answer about this mail:"
-#~ msgstr "Encara resteu a l'espera d'una resposta sobre aquest correu:"
-
-#~ msgid "Filter Log Viewer"
-#~ msgstr "Visor del registre de filtratge"
-
-#~ msgid "&Log filter activities"
-#~ msgstr "&Registra les activitats de filtratge"
-
-#~ msgid ""
-#~ "You can turn logging of filter activities on and off here. Of course, log "
-#~ "data is collected and shown only when logging is turned on. "
-#~ msgstr ""
-#~ "Aquí podeu activar i desactivar el registre de les activitats de "
-#~ "filtratge. Naturalment, només es recullen i es mostren les dades de "
-#~ "registre quan s'activa el registre. "
-
-#~ msgid "Log pattern description"
-#~ msgstr "Descripció del patró de registre"
-
-#~ msgid "Log filter &rule evaluation"
-#~ msgstr "Registra l'avaluació de les &regles de filtratge"
-
-#~ msgid ""
-#~ "You can control the feedback in the log concerning the evaluation of the "
-#~ "filter rules of applied filters: having this option checked will give "
-#~ "detailed feedback for each single filter rule; alternatively, only "
-#~ "feedback about the result of the evaluation of all rules of a single "
-#~ "filter will be given."
-#~ msgstr ""
-#~ "Podeu controlar la informació al registre referent a l'avaluació de les "
-#~ "regles de filtratge dels filtres aplicats: tenir marcada aquesta opció "
-#~ "donarà informació detallada per a cada regla de filtratge. "
-#~ "Alternativament, només es donarà informació quant al resultat de "
-#~ "l'avaluació de totes les regles d'un sol filtre."
-
-#~ msgid "Log filter pattern evaluation"
-#~ msgstr "Registra l'avaluació del patró de filtratge"
-
-#~ msgid "Log filter actions"
-#~ msgstr "Registra les accions de filtratge"
-
-#~ msgid "Log size limit:"
-#~ msgstr "Límit de mida de la bitàcola:"
-
-#~ msgid " KB"
-#~ msgstr " KB"
-
-#~ msgctxt "@label:spinbox Set the size of the logfile to unlimited."
-#~ msgid "unlimited"
-#~ msgstr "sense límit"
-
-#~ msgid ""
-#~ "Collecting log data uses memory to temporarily store the log data; here "
-#~ "you can limit the maximum amount of memory to be used: if the size of the "
-#~ "collected log data exceeds this limit then the oldest data will be "
-#~ "discarded until the limit is no longer exceeded. "
-#~ msgstr ""
-#~ "En recollir dades de registre s'usa memòria per a desar-les temporalment. "
-#~ "Aquí podeu limitar la quantitat màxima de memòria a usar: si la mida de "
-#~ "les dades de registre recollides excedeix aquest límit, llavors es "
-#~ "descartaran les dades més antigues fins que ja no s'excedeixi el límit. "
-
-#~ msgid ""
-#~ "Could not write the file %1:\n"
-#~ "\"%2\" is the detailed error description."
-#~ msgstr ""
-#~ "No s'ha pogut escriure el fitxer %1:\n"
-#~ "«%2» és la descripció detallada de l'error."
-
-#~ msgid "Error applying mail filter move"
-#~ msgstr "Error en aplicar el moviment del filtre de correu"
-
-#~ msgid "Error applying mail filter delete"
-#~ msgstr "Error en aplicar la supressió del filtre de correu"
-
-#~ msgid "Error applying mail filter modifications"
-#~ msgstr "Error en aplicar les modificacions del filtre de correu"
-
-#~ msgid "<b>Evaluating filter rules:</b> "
-#~ msgstr "<b>S'estan avaluant les regles del filtre:</b> "
-
-#~ msgid "<b>Filter rules have matched.</b>"
-#~ msgstr "<b>Les regles del filtre han coincidit.</b>"
-
-#~ msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
-#~ msgstr "<b>Comença el filtratge en el missatge «%1» des de «%2» a «%3»:</b>"
-
-#~ msgctxt "Notification when the filter log was enabled"
-#~ msgid "Mail Filter Log Enabled"
-#~ msgstr "Activat el registre pel filtratge de correu"
-
-#~ msgid "Ready"
-#~ msgstr "Preparat"
-
-#~ msgid "Filtering in %1"
-#~ msgstr "Filtratge en %1"
-
-#~ msgid "Send Later Agent"
-#~ msgstr "Agent per enviar més tard"
-
-#~ msgid "Send emails later agent."
-#~ msgstr "Agent per enviar correus més tard."
-
-#~ msgid "Copyright (C) 2013-2017 Laurent Montel"
-#~ msgstr "Copyright (C) 2013-2017 Laurent Montel"
-
-#~ msgid "Send around"
-#~ msgstr "Envia al voltant de"
-
-#~ msgid "Recurrent"
-#~ msgstr "Recurrència"
-
-#~ msgid "Message Id"
-#~ msgstr "ID del missatge"
-
-#~ msgid "No messages waiting..."
-#~ msgstr "No hi ha missatges en espera..."
-
-#~ msgid "Send now"
-#~ msgstr "Envia ara"
-
-#~ msgid "Yes"
-#~ msgstr "Sí"
-
-#~ msgid "No"
-#~ msgstr "No"
-
-#~ msgid "Do you want to delete selected item? Do you want to continue?"
-#~ msgid_plural ""
-#~ "Do you want to delete selected items? Do you want to continue?"
-#~ msgstr[0] "Suprimeixo l'element seleccionat? Voleu continuar?"
-#~ msgstr[1] "Suprimeixo els elements seleccionats? Voleu continuar?"
-
-#~ msgid "Do you want to remove messages as well?"
-#~ msgstr "Voleu eliminar també els missatges?"
-
-#~ msgid "Remove messages"
-#~ msgstr "Elimina els missatges"
-
-#~ msgid "Not message found."
-#~ msgstr "No s'ha trobat el missatge."
-
-#~ msgid "No message found."
-#~ msgstr "No s'ha trobat el missatge."
-
-#~ msgid "Error during fetching message."
-#~ msgstr "Error mentre s'obtenia el missatge."
-
-#~ msgid "Cannot fetch message. %1"
-#~ msgstr "No s'ha pogut obtenir el missatge. %1"
-
-#~ msgid "We can't create transport"
-#~ msgstr "No s'ha pogut crear el transport"
-
-#~ msgid "Message is not a real message"
-#~ msgstr "El missatge no és un missatge real"
-
-#~ msgid "Cannot send message."
-#~ msgstr "No s'ha pogut enviar el missatge."
-
-#~ msgid "Message sent"
-#~ msgstr "El missatge s'ha enviat"
-
-#~ msgid "An error was found. Do you want to resend it?"
-#~ msgstr "S'ha trobat un error. Voleu tornar-lo a enviar?"
-
-#~ msgid "Error found"
-#~ msgstr "S'ha trobat un error"
-
-#~ msgid "Save..."
-#~ msgstr "Desa..."
-
-#~ msgctxt "@title:window"
-#~ msgid "Properties for Attachment %1"
-#~ msgstr "Propietats de l'adjunt %1"
-
-#~ msgid " bytes"
-#~ msgstr " bytes"
-
-#~ msgctxt "@label"
-#~ msgid "TNEF Attributes"
-#~ msgstr "Atributs del TNEF"
-
-#~ msgctxt "@info"
-#~ msgid "Must select an item first."
-#~ msgstr "Primer, cal que seleccioneu un element."
-
-#~ msgctxt "@info"
-#~ msgid "The selected item cannot be saved because it has an empty tag."
-#~ msgstr "L'element seleccionat no es pot desar perquè té una etiqueta buida."
-
-#~ msgctxt "@info"
-#~ msgid "Unable to open file for writing, check file permissions."
-#~ msgstr ""
-#~ "No es pot obrir el fitxer per escriure-hi, repasseu-ne els permisos."
-
-#~ msgctxt "@info:whatsthis"
-#~ msgid ""
-#~ "You will be presented with a dialog where you can configure the "
-#~ "application-wide shortcuts."
-#~ msgstr ""
-#~ "Se us presentarà un diàleg a on podreu configurar les dreceres de "
-#~ "l'aplicació."
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "View"
-#~ msgstr "Visualitza"
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "View With..."
-#~ msgstr "Visualitza amb..."
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "Extract"
-#~ msgstr "Extreu"
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "Extract To..."
-#~ msgstr "Extreu a..."
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "Extract All To..."
-#~ msgstr "Extreu-ho tot a..."
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "Properties"
-#~ msgstr "Propietats"
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "Message Properties"
-#~ msgstr "Propietats del missatge"
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "Show Message Text"
-#~ msgstr "Mostra el text del missatge"
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "Save Message Text As..."
-#~ msgstr "Desa el text del missatge com a..."
-
-#~ msgctxt "@action:inmenu"
-#~ msgid "Default Folder..."
-#~ msgstr "Carpeta per defecte..."
-
-#~ msgctxt "@info:status"
-#~ msgid "No file loaded"
-#~ msgstr "No s'ha carregat cap fitxer"
-
-#~ msgctxt "@info"
-#~ msgid "Unable to open file \"%1\"."
-#~ msgstr "No s'ha pogut obrir el fitxer «%1»."
-
-#~ msgctxt "@info:status"
-#~ msgid "%1 attachment found"
-#~ msgid_plural "%1 attachments found"
-#~ msgstr[0] "S'ha trobat %1 adjunt"
-#~ msgstr[1] "S'han trobat %1 adjunts"
-
-#~ msgctxt "@title:window"
-#~ msgid "Open TNEF File"
-#~ msgstr "Obertura del fitxer TNEF"
-
-#~ msgctxt "@info"
-#~ msgid "There is no file selected. Please select a file an try again."
-#~ msgstr ""
-#~ "No s'ha seleccionat cap fitxer. Seleccioneu un fitxer i torneu a provar-"
-#~ "ho."
-
-#~ msgctxt "@info"
-#~ msgid "Unable to extract file \"%1\"."
-#~ msgstr "No s'ha pogut extreure el fitxer «%1»."
-
-#~ msgctxt "@info"
-#~ msgid "The message does not contain any Rich Text data."
-#~ msgstr "El missatge no conté cap dada de text enriquit."
-
-#~ msgctxt "@info"
-#~ msgid "Unable to open file \"%1\" for writing, check file permissions."
-#~ msgstr ""
-#~ "No es pot obrir el fitxer «%1» per escriure-hi, repasseu-ne els permisos."
-
-#~ msgid "Open &with %1"
-#~ msgstr "Obre a&mb %1"
-
-#~ msgctxt "@item:inmenu Open With, %1 is application name"
-#~ msgid "%1"
-#~ msgstr "%1"
-
-#~ msgctxt "@title:menu"
-#~ msgid "&Open With"
-#~ msgstr "&Obre amb"
-
-#~ msgctxt "@action:inmenu Open With"
-#~ msgid "&Other..."
-#~ msgstr "&Altres..."
-
-#~ msgctxt "@title:menu"
-#~ msgid "&Open With..."
-#~ msgstr "&Obre amb..."
-
-#~ msgid "&Action"
-#~ msgstr "&Acció"
-
-#~ msgctxt "@title:column file name"
-#~ msgid "File Name"
-#~ msgstr "Nom de fitxer"
-
-#~ msgctxt "@title:column file type"
-#~ msgid "File Type"
-#~ msgstr "Tipus de fitxer"
-
-#~ msgctxt "@title:column file size"
-#~ msgid "Size"
-#~ msgstr "Mida"
-
-#~ msgid "KTnef"
-#~ msgstr "KTnef"
-
-#~ msgid "Viewer for mail attachments using TNEF format"
-#~ msgstr "Visor d'adjunts de correu que usin el format TNEF"
-
-#~ msgid ""
-#~ "Copyright 2000 Michael Goffioul\n"
-#~ "Copyright 2012  Allen Winter"
-#~ msgstr ""
-#~ "Copyright 2000 Michael Goffioul\n"
-#~ "Copyright 2012  Allen Winter"
-
-#~ msgid "Michael Goffioul"
-#~ msgstr "Michael Goffioul"
-
-#~ msgid "Author"
-#~ msgstr "Autor"
-
-#~ msgid "Allen Winter"
-#~ msgstr "Allen Winter"
-
-#~ msgid "Author, Ported to Qt4/KDE4"
-#~ msgstr "Autor, adaptació a Qt4/KDE4"
-
-#~ msgid "An optional argument 'file' "
-#~ msgstr "Un argument «file» opcional "
-
-#~ msgid "Message Properties"
-#~ msgstr "Propietats del missatge"
-
-#~ msgctxt "@title:column property name"
-#~ msgid "Name"
-#~ msgstr "Nom"
-
-#~ msgctxt "@title:column property value"
-#~ msgid "Value"
-#~ msgstr "Valor"
-
-#~ msgid "Description:"
-#~ msgstr "Descripció:"
-
-#~ msgid "Index:"
-#~ msgstr "Índex:"
-
-#~ msgid "Comment:"
-#~ msgstr "Comentari:"
-
-#~ msgid "File size:"
-#~ msgstr "Mida del fitxer:"
-
-#~ msgid "MIME type:"
-#~ msgstr "Tipus MIME:"
-
-#~ msgid "Improved virtual folders"
-#~ msgstr "Millora de les carpetes virtuals"
-
-#~ msgid "Tag folders"
-#~ msgstr "Etiquetes de les carpetes"
-
-#~| msgid "Check Mail"
-#~ msgid "Check Url"
-#~ msgstr "Comprova l'URL"
-
-#~ msgid "Ask for confirmation before moving all messages to trash"
-#~ msgstr "Demana confirmació abans de moure tots els missatges a la paperera"
-
-#~ msgctxt "Corresponds to Folder->Move All Messages to Trash"
-#~ msgid "Ask for co&nfirmation before moving all messages to trash"
-#~ msgstr "Demana co&nfirmació abans de moure tots els missatges a la paperera"
-
-#~ msgid "Border Around Warning Prepending HTML Messages"
-#~ msgstr "Vora del missatge d'avís que hi ha abans dels missatges HTML"
-
-#~ msgid "Plugins Settings"
-#~ msgstr "Arranjament dels connectors"
-
-#~ msgid "Plugins"
-#~ msgstr "Connectors"
-
-#~ msgid "Broken Account - Folder Text Color"
-#~ msgstr "Compte no vàlid - Color del text de la carpeta"
-
-#~ msgid "Misspelled Words"
-#~ msgstr "Paraules mal escrites"
-
-#~ msgid "External Editor"
-#~ msgstr "Editor extern"
-
-#~ msgid ""
-#~ "<b>%f</b> will be replaced with the filename to edit.<br /><b>%w</b> will "
-#~ "be replaced with the window id.<br /><b>%l</b> will be replaced with the "
-#~ "line number."
-#~ msgstr ""
-#~ "<b>%f</b> se substituirà amb el nom del fitxer a editar.<br /><b>%w</b> "
-#~ "se substituirà amb la «id» de la finestra.<br /><b>%l</b> se substituirà "
-#~ "amb el número de línia."
-
-#~ msgid "Restart is necessary for applying the changes."
-#~ msgstr "Cal reiniciar per aplicar els canvis."
-
-#~ msgid "System Tray Mode"
-#~ msgstr "Mode de la safata del sistema"
-
-#~ msgid "Always show KMail in system tray"
-#~ msgstr "Mostra sempre el KMail a la safata del sistema"
-
-#~ msgid "Only show KMail in system tray if there are unread messages"
-#~ msgstr ""
-#~ "Mostra el KMail a la safata del sistema només si hi ha missatges sense "
-#~ "llegir"
-
-#~ msgid "Policy for showing the system tray icon"
-#~ msgstr "Política per mostrar la icona de la safata del sistema"
-
-#~ msgid "Chang&e..."
-#~ msgstr "Ca&nvia..."
-
-#~ msgid "Your OpenPGP Signature Key"
-#~ msgstr "La vostra clau de signatura OpenPGP"
-
-#~ msgid ""
-#~ "Select the OpenPGP key which should be used to digitally sign your "
-#~ "messages."
-#~ msgstr "Seleccioneu la clau OpenPGP per signar digitalment els missatges."
-
-#~ msgid "Your OpenPGP Encryption Key"
-#~ msgstr "La vostra clau d'encriptatge OpenPGP"
-
-#~ msgid ""
-#~ "Select the OpenPGP key which should be used when encrypting to yourself "
-#~ "and for the \"Attach My Public Key\" feature in the composer."
-#~ msgstr ""
-#~ "Seleccioneu la clau OpenPGP per encriptar a vós mateix i per a la "
-#~ "característica «Adjunta la meva clau pública» a l'editor."
-
-#~ msgid "Your S/MIME Signature Certificate"
-#~ msgstr "El vostre certificat de la signatura S/MIME"
-
-#~ msgid ""
-#~ "Select the S/MIME certificate which should be used to digitally sign your "
-#~ "messages."
-#~ msgstr ""
-#~ "Seleccioneu el certificat S/MIME que desitgeu usar per a signar "
-#~ "digitalment els missatges."
-
-#~ msgid "Your S/MIME Encryption Certificate"
-#~ msgstr "El vostre certificat d'encriptatge S/MIME"
-
-#~ msgid ""
-#~ "Select the S/MIME certificate which should be used when encrypting to "
-#~ "yourself and for the \"Attach My Certificate\" feature in the composer."
-#~ msgstr ""
-#~ "Seleccioneu el certificat S/MIME que desitgeu usar per a encriptar-vos a "
-#~ "vós mateix i per a la característica «Adjunta la meva clau pública» a "
-#~ "l'editor."
-
-#~ msgid "Show unread mail in tray icon"
-#~ msgstr "Mostra els correus sense llegir a la icona de la safata"
-
-#~ msgid ""
-#~ "When this option is enabled, every message you send will be encrypted "
-#~ "whenever encryption is possible and desired; of course, it is still "
-#~ "possible to disable the automatic encryption for each message "
-#~ "individually."
-#~ msgstr ""
-#~ "Quan aquesta opció està activada s'encriptaran tots els missatges que "
-#~ "envieu que puguin encriptar-se. Evidentment, tot i això és possible "
-#~ "desactivar l'encriptatge individualment per a cada missatge."
-
-#~ msgid "Form"
-#~ msgstr "Formulari"
-
-#~ msgid "Mail Merge"
-#~ msgstr "Fusiona el correu"
-
-#~ msgid "Source:"
-#~ msgstr "Font:"
-
-#~ msgid "Address Book"
-#~ msgstr "Llibreta d'adreces"
-
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Attachment"
-#~ msgstr "Adjunt"
-
-#~ msgid "Select attachment:"
-#~ msgstr "Seleccioneu l'adjunt:"
-
-#~ msgid "Manage Storage Service"
-#~ msgstr "Gestiona el servei d'emmagatzematge"
-
-#~ msgid ""
-#~ "Could not start storage service manager; please check your installation."
-#~ msgstr ""
-#~ "No s'ha pogut iniciar el gestor del servei d'emmagatzematge. Comproveu la "
-#~ "vostra instal·lació."
-
-#~ msgid "There is %1 file upload in progress."
-#~ msgid_plural "There are %1 file uploads in progress."
-#~ msgstr[0] "Hi ha %1 baixada de fitxer en curs."
-#~ msgstr[1] "Hi ha %1 baixades de fitxer en curs."
-
-#~ msgid "An error occurred while sending the file."
-#~ msgstr "S'ha produït un error mentre s'enviava el fitxer."
-
-#~ msgid "Upload file"
-#~ msgstr "Puja el fitxer"
-
-#~ msgid "%1 return an error '%2'"
-#~ msgstr "%1 ha retornat un error «%2»"
-
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#~ msgid "Ad block"
-#~ msgstr "Bloqueig publicitari"
-
-#~ msgctxt "@option:check Sticky identity."
-#~ msgid "Sticky"
-#~ msgstr "Fixa"
-
-#~ msgid ""
-#~ "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
-#~ "therefore, the default sent-mail folder will be used."
-#~ msgstr ""
-#~ "La carpeta personalitzada de correu enviat per a la identitat «%1» no "
-#~ "existeix, per tant s'usarà la carpeta de correu enviat predeterminada."
-
-#~ msgid ""
-#~ "The custom templates folder for identity \"%1\" does not exist (anymore); "
-#~ "therefore, the default templates folder will be used."
-#~ msgstr ""
-#~ "La carpeta personalitzada de plantilles per a la identitat «%1» no "
-#~ "existeix; per tant s'usarà la carpeta de plantilles predeterminada."
-
-#~ msgid "Send Mail Using Shortcut"
-#~ msgstr "Envia el correu usant una drecera"
-
-#~ msgid "Zoom..."
-#~ msgstr "Zoom..."
-
-#~ msgid "&Zoom In"
-#~ msgstr "A&propa"
-
-#~ msgid "Zoom &Out"
-#~ msgstr "A&llunya"
-
-#~ msgid "Reset"
-#~ msgstr "Inicialitza"
-
-#~ msgid "Uppercase"
-#~ msgstr "Majúscules"
-
-#~ msgid "Insert Special Character..."
-#~ msgstr "Insereix un caràcter especial..."
-
-#~ msgid "Insert Special Character"
-#~ msgstr "Inserció d'un caràcter especial"
-
-#~ msgid "Insert"
-#~ msgstr "Insereix"
-
-#~ msgid "Background Color"
-#~ msgstr "Color de fons"
-
-#~ msgid "Use the selected value as your identity for future messages"
-#~ msgstr "Usa el valor seleccionat com a identitat per a missatges futurs"
-
-#~ msgid "Use the selected value as your sent-mail folder for future messages"
-#~ msgstr ""
-#~ "Usa el valor seleccionat com a carpeta per al correu enviat per a "
-#~ "missatges futurs"
-
-#~ msgid "Use the selected value as your outgoing account for future messages"
-#~ msgstr ""
-#~ "Usa el valor seleccionat com a compte de sortida per a missatges futurs"
-
-#~ msgid "Use the selected value as your dictionary for future messages"
-#~ msgstr "Usa el valor seleccionat com a diccionari per a missatges futurs"
-
-#~ msgid "Select Font"
-#~ msgstr "Tria un tipus de lletra"
-
-#~ msgid "Select Size"
-#~ msgstr "Tria la mida"
-
-#~ msgid ""
-#~ "Remember this identity, so that it will be used in future composer "
-#~ "windows as well.\n"
-#~ "        "
-#~ msgstr ""
-#~ "Recorda aquesta identitat, de manera que també s'usarà en futures "
-#~ "finestres de l'editor.\n"
-#~ "        "
-
-#~ msgid ""
-#~ "Remember this folder for sent items, so that it will be used in future "
-#~ "composer windows as well."
-#~ msgstr ""
-#~ "Recorda aquesta carpeta per als elements enviats, de manera que també "
-#~ "s'usarà en futures finestres de l'editor."
-
-#~ msgid ""
-#~ "Remember this mail transport, so that it will be used in future composer "
-#~ "windows as well."
-#~ msgstr ""
-#~ "Recorda aquest transport de correu, de manera que també s'usarà en "
-#~ "futures finestres de l'editor."
-
-#~ msgid ""
-#~ "Remember this dictionary, so that it will be used in future composer "
-#~ "windows as well.\n"
-#~ "        "
-#~ msgstr ""
-#~ "Recorda aquest diccionari, de manera que també s'usarà en futures "
-#~ "finestres de l'editor.\n"
-#~ "        "
-
-#~ msgid "Followed Link"
-#~ msgstr "Enllaç visitat"
-
-#~ msgid "&Import Wizard..."
-#~ msgstr "&Assistent d'importació..."
-
-#~ msgid "Prefer Html To Text"
-#~ msgstr "Prefereix HTML sobre text"
-
-#~ msgid "Prefer Text To Html"
-#~ msgstr "Prefereix text sobre HTML"
-
-#~ msgid "Anti-Spam Wizard"
-#~ msgstr "Assistent contra el correu brossa"
-
-#~ msgid "Anti-Virus Wizard"
-#~ msgstr "Assistent contra els virus"
-
-#~ msgid "Options to fine-tune the handling of spam messages"
-#~ msgstr "Opcions per a l'afinament en la gestió del correu brossa"
-
-#~ msgid "Summary of changes to be made by this wizard"
-#~ msgstr "Resum dels canvis que farà aquest assistent"
-
-#~ msgid "Options to fine-tune the handling of virus messages"
-#~ msgstr "Opcions per a l'afinament en la gestió del correu amb virus"
-
-#~ msgid "Virus handling"
-#~ msgstr "Gestió dels virus"
-
-#~ msgid "Spam Handling"
-#~ msgstr "Gestió del correu brossa"
-
-#~ msgid "Semi spam (unsure) handling"
-#~ msgstr "Gestió del correu semibrossa (no segur)"
-
-#~ msgid "Classify as Spam"
-#~ msgstr "Classifica com a correu brossa"
-
-#~ msgid "Spam"
-#~ msgstr "Correu brossa"
-
-#~ msgid "Classify as NOT Spam"
-#~ msgstr "Classifica com a correu NO brossa"
-
-#~ msgid "Ham"
-#~ msgstr "Correu legítim"
-
-#~ msgid "Scanning for %1..."
-#~ msgstr "S'està cercant %1..."
-
-#~ msgid "Scanning for anti-spam tools finished."
-#~ msgstr "La cerca d'eines contra el correu brossa ha acabat."
-
-#~ msgid "Scanning for anti-virus tools finished."
-#~ msgstr "La cerca d'eines contra els virus ha acabat."
-
-#~ msgid ""
-#~ "<p>Sorry, no spam detection tools have been found. Install your spam "
-#~ "detection software and re-run this wizard.</p>"
-#~ msgstr ""
-#~ "<p>No s'han trobat eines per a la detecció del correu brossa. Instal·leu "
-#~ "el programari de detecció i torneu a executar aquest assistent.</p>"
-
-#~ msgid "Scanning complete. No anti-virus tools found."
-#~ msgstr "Cerca finalitzada: No s'ha trobat cap eina contra els virus."
-
-#~ msgid ""
-#~ "<p>Messages classified as spam are marked as read.<br />Spam messages are "
-#~ "moved into the folder named <i>%1</i>.</p>"
-#~ msgstr ""
-#~ "<p>Els missatges classificats com a brossa es marquen com a llegits.<br /"
-#~ ">Els missatges brossa es mouen a la carpeta anomenada <i>%1</i>.</p>"
-
-#~ msgid ""
-#~ "<p>Messages classified as spam are marked as read.<br />Spam messages are "
-#~ "not moved into a certain folder.</p>"
-#~ msgstr ""
-#~ "<p>Els missatges classificats com a brossa es marquen com a llegits.<br /"
-#~ ">Els missatges brossa no es mouen a cap carpeta.</p>"
-
-#~ msgid ""
-#~ "<p>Messages classified as spam are not marked as read.<br />Spam messages "
-#~ "are moved into the folder named <i>%1</i>.</p>"
-#~ msgstr ""
-#~ "<p>Els missatges classificats com a brossa no es marquen com a llegits."
-#~ "<br />Els missatges brossa es mouen a la carpeta anomenada <i>%1</i>.</p>"
-
-#~ msgid ""
-#~ "<p>Messages classified as spam are not marked as read.<br />Spam messages "
-#~ "are not moved into a certain folder.</p>"
-#~ msgstr ""
-#~ "<p>Els missatges classificats com a brossa no es marquen com a llegits."
-#~ "<br />Els missatges brossa no es mouen a cap carpeta.</p>"
-
-#~ msgid ""
-#~ "<p>The folder for messages classified as unsure (probably spam) is <i>%1</"
-#~ "i>.</p>"
-#~ msgstr ""
-#~ "<p>La carpeta pels missatges classificats com a dubtosos (probable "
-#~ "brossa) és <i>%1</i>.</p>"
-
-#~ msgid "<p>The wizard will create the following filters:<ul>%1</ul></p>"
-#~ msgstr "<p>L'assistent crearà els següents filtres:<ul>%1</ul></p>"
-
-#~ msgid "<p>The wizard will replace the following filters:<ul>%1</ul></p>"
-#~ msgstr "<p>L'assistent substituirà els següents filtres:<ul>%1</ul></p>"
-
-#~ msgid ""
-#~ "The wizard will search for any tools to do spam detection\n"
-#~ "and setup KMail to work with them."
-#~ msgstr ""
-#~ "L'assistent cercarà eines que facin la detecció del correu brossa\n"
-#~ "i arranjarà el KMail perquè les faci servir."
-
-#~ msgid ""
-#~ "<p>Here you can get some assistance in setting up KMail's filter rules to "
-#~ "use some commonly-known anti-virus tools.</p><p>The wizard can detect "
-#~ "those tools on your computer as well as create filter rules to classify "
-#~ "messages using these tools and to separate messages containing viruses. "
-#~ "The wizard will not take any existing filter rules into consideration: it "
-#~ "will always append the new rules.</p><p><b>Warning:</b> As KMail appears "
-#~ "to be frozen during the scan of the messages for viruses, you may "
-#~ "encounter problems with the responsiveness of KMail because anti-virus "
-#~ "tool operations are usually time consuming; please consider deleting the "
-#~ "filter rules created by the wizard to get back to the former behavior.</p>"
-#~ msgstr ""
-#~ "<p>Aquí podeu obtenir ajuda per configurar les regles de filtratge del "
-#~ "KMail per usar algunes de les eines més comunes contra els virus.</"
-#~ "p><p>L'assistent pot detectar aquestes eines a l'ordinador així com crear "
-#~ "regles de filtratge per classificar els missatges i separar els missatges "
-#~ "que continguin virus. L'assistent no tindrà en compte cap regla existent: "
-#~ "sempre adjuntarà les regles noves.</p><p><b>Atenció:</b> Com el KMail es "
-#~ "bloqueja mentre es comprova si els correus tenen virus, podeu trobar "
-#~ "problemes amb la resposta del KMail, ja que les eines contra els virus "
-#~ "normalment consumeixen bastant de temps. Considereu eliminar les regles "
-#~ "de filtratge creades per l'assistent per recuperar el comportament "
-#~ "anterior.</p>"
-
-#~ msgid ""
-#~ "<p>Please select the tools to be used for the detection and go to the "
-#~ "next page.</p>"
-#~ msgstr ""
-#~ "<p>Seleccioneu les eines a usar per a la detecció i aneu a la pàgina "
-#~ "següent.</p>"
-
-#~ msgid "&Mark detected spam messages as read"
-#~ msgstr "&Marca els missatges detectats com a correu brossa com a llegits"
-
-#~ msgid "Mark messages which have been classified as spam as read."
-#~ msgstr ""
-#~ "Marca els missatges que s'hagin classificat com a correu brossa com a "
-#~ "llegits."
-
-#~ msgid "Move &known spam to:"
-#~ msgstr "Mou el correu brossa &segur a:"
-
-#~ msgid ""
-#~ "The default folder for spam messages is the trash folder, but you may "
-#~ "change that in the folder view below."
-#~ msgstr ""
-#~ "La carpeta per omissió per als missatges brossa és la paperera, però "
-#~ "podeu canviar-ho a la vista de carpetes inferior."
-
-#~ msgid "Move &probable spam to:"
-#~ msgstr "Mou el correu brossa &probable a:"
-
-#~ msgid ""
-#~ "The default folder is the inbox folder, but you may change that in the "
-#~ "folder view below.<p>Not all tools support a classification as unsure. If "
-#~ "you have not selected a capable tool, you cannot select a folder as well."
-#~ "</p>"
-#~ msgstr ""
-#~ "La carpeta per omissió és la d'entrada, però podeu canviar-ho a la vista "
-#~ "de carpetes inferior.<p>No totes les eines admeten classificacions "
-#~ "dubtoses. Si no heu seleccionat una eina que ho admeti, tampoc podreu "
-#~ "seleccionar una carpeta.</p>"
-
-#~ msgid "Check messages using the anti-virus tools"
-#~ msgstr "Comprova els missatges usant les eines contra els virus"
-
-#~ msgid ""
-#~ "Let the anti-virus tools check your messages. The wizard will create "
-#~ "appropriate filters. The messages are usually marked by the tools so that "
-#~ "following filters can react on this and, for example, move virus messages "
-#~ "to a special folder."
-#~ msgstr ""
-#~ "Permet que les eines contra els virus comprovin els missatges. "
-#~ "L'assistent crearà els filtres apropiats. Les eines solen marcar els "
-#~ "missatges per tal que els filtres posteriors hi puguin reaccionar i, per "
-#~ "exemple, moure els missatges amb virus a una carpeta especial."
-
-#~ msgid "Move detected viral messages to the selected folder"
-#~ msgstr "Mou els missatges amb virus detectats a la carpeta seleccionada"
-
-#~ msgid ""
-#~ "A filter to detect messages classified as virus-infected and to move "
-#~ "those messages into a predefined folder is created. The default folder is "
-#~ "the trash folder, but you may change that in the folder view."
-#~ msgstr ""
-#~ "Es crea un filtre per detectar els missatges infectats per virus i "
-#~ "moure'ls a una carpeta determinada. La carpeta per omissió és la "
-#~ "paperera, però podeu canviar-la a la vista de carpetes."
-
-#~ msgid "Additionally, mark detected viral messages as read"
-#~ msgstr "A més a més, marca els missatges amb virus detectats com a llegits"
-
-#~ msgid ""
-#~ "Mark messages which have been classified as virus-infected as read, as "
-#~ "well as moving them to the selected folder."
-#~ msgstr ""
-#~ "Marca els missatges que s'hagin classificat com a infectats per virus com "
-#~ "a llegits a més a més de moure'ls a la carpeta seleccionada."
-
-#~ msgid "&Anti-Spam Wizard..."
-#~ msgstr "Assistent contra el correu &brossa..."
-
-#~ msgid "&Anti-Virus Wizard..."
-#~ msgstr "Assistent contra els &virus..."
-
-#~ msgid "Proxy"
-#~ msgstr "Servidor intermediari"
-
-#~ msgid ""
-#~ "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
-#~ "wait . . .</p>&nbsp;"
-#~ msgstr ""
-#~ "<h2 style='margin-top: 0px;'>S'està recuperant el contingut de la "
-#~ "carpeta</h2><p>Paciència...</p>&nbsp;"
-
-#~ msgid ""
-#~ "<p><span style='font-size:125%; font-weight:bold;'>Important changes</"
-#~ "span> (compared to KMail %1):</p>\n"
-#~ msgstr ""
-#~ "<p><span style='font-size:125%; font-weight:bold;'>Canvis importants</"
-#~ "span> (comparat amb el KMail %1):</p>\n"
-
-#~ msgid "<li>%1</li>\n"
-#~ msgstr "<li>%1</li>\n"
-
-#~ msgid "OpenPGP Message - Encrypted"
-#~ msgstr "Missatge OpenPGP - Encriptat"
-
-#~ msgid "OpenPGP Message - Valid Signature with Trusted Key"
-#~ msgstr "Missatge OpenPGP - Signatura vàlida amb una clau de confiança"
-
-#~ msgid "OpenPGP Message - Valid Signature with Untrusted Key"
-#~ msgstr "Missatge OpenPGP - Signatura vàlida sense clau de confiança"
-
-#~ msgid "OpenPGP Message - Unchecked Signature"
-#~ msgstr "Missatge OpenPGP - Signatura sense comprovar"
-
-#~ msgid "OpenPGP Message - Bad Signature"
-#~ msgstr "Missatge OpenPGP - Signatura dolenta"
-
-#~ msgid "The size of the filter dialog (for internal use only)"
-#~ msgstr "La mida del diàleg de filtre (només per a ús intern)"
-
-#~ msgid "Send Message Disposition Notifications with an empty sender."
-#~ msgstr ""
-#~ "Envia notificacions de processament del missatge (MDN) amb un remitent "
-#~ "buit."
-
-#~ msgid ""
-#~ "Send Message Disposition Notifications with an empty sender string. Some "
-#~ "servers might be configure to reject such messages, so if you are "
-#~ "experiencing problems sending MDNs, uncheck this option."
-#~ msgstr ""
-#~ "Envia notificacions de processament del missatge (MDN) amb un remitent "
-#~ "buit. Alguns servidors poden haver-se configurat per a rebutjar aquests "
-#~ "missatges, per tant, si experimenteu problemes en enviar les MDN, "
-#~ "desmarqueu aquesta opció."
-
-#~ msgid "Specifies the number of updates to perform (for internal use only)"
-#~ msgstr ""
-#~ "Especifica el nombre d'actualitzacions a realitzar (només per a ús intern)"
-
-#~ msgid ""
-#~ "Close the application when the main window is closed, even if there is a "
-#~ "system tray icon active."
-#~ msgstr ""
-#~ "Tanca l'aplicació quan es tanqui la finestra principal, inclús si hi ha "
-#~ "una icona activa a la safata del sistema."
-
-#~ msgid "Hide local inbox if unused"
-#~ msgstr "Oculta la bústia local si no s'usa"
-
-#~ msgid ""
-#~ "<p>...that you can go to the next and previous message by using the\n"
-#~ "right and left arrow keys respectively?</p>\n"
-#~ msgstr ""
-#~ "<p>...que podeu anar al missatge següent i previ usant les\n"
-#~ "fletxes dreta i esquerra respectivament?</p>\n"
-
-#~ msgid ""
-#~ "<p>...that you can rapidly create filters on sender, recipient,\n"
-#~ "subject and mailing lists with <em>Message-&gt;Create Filter</em>?</p>\n"
-#~ msgstr ""
-#~ "<p>...que podeu crear ràpidament filtres segons el destinatari,\n"
-#~ "remitent, assumpte i llista de correu amb <em>Missatge-&gt;Crea un "
-#~ "filtre</em>?</p>\n"
-
-#~ msgid ""
-#~ "<p>...that you can associate mailing lists with folders in the\n"
-#~ "<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-#~ "<em>Message-&gt;New Message to Mailing List...</em>\n"
-#~ "to open the composer with the mailing list address preset.\n"
-#~ "Alternatively, you can click with the middle mouse button on the folder.</"
-#~ "p>\n"
-#~ msgstr ""
-#~ "<p>...que podeu associar llistes de correu amb les carpetes\n"
-#~ "en el diàleg <em>Carpeta-&gt;Gestió de les llistes de correu</em>? "
-#~ "Llavors podreu usar\n"
-#~ "<em>Missatge-&gt;Missatge nou a la llista de correu...</em>\n"
-#~ "per obrir l'editor amb la llista de correu preseleccionada.\n"
-#~ "Alternativament, podeu prémer el botó central del ratolí sobre la carpeta."
-#~ "</p>\n"
-
-#~ msgid ""
-#~ "<p>...that you can assign custom icons to each folder individually?\n"
-#~ "See <em>Folder-&gt;Properties</em></p>\n"
-#~ msgstr ""
-#~ "<p>...que podeu assignar icones personalitzades individualment per a\n"
-#~ "cada carpeta? Mireu en <em>Carpeta-&gt;Propietats...</em></p>\n"
-
-#~ msgid ""
-#~ "<p>...that KMail can show a color bar indicating the type of message\n"
-#~ "(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-#~ "<p>This thwarts attempts to fake successful signature verification by\n"
-#~ "sending HTML mails mimicking KMail's signature status frames.</p>\n"
-#~ msgstr ""
-#~ "<p>...que el KMail pot emprar una barra de color per a indicar el tipus "
-#~ "de missatge (text net/HTML/OpenPGP) que es mostra?</p>\n"
-#~ "<p>Això evita els intents de simular una signatura correcta enviant "
-#~ "missatges\n"
-#~ "HTML que simulin l'aspecte dels marcs d'estat de la signatura del KMail.</"
-#~ "p>\n"
-
-#~ msgid ""
-#~ "<p>...that you can filter on any header by simply entering its name\n"
-#~ "in the first edit field of a search rule?</p>\n"
-#~ msgstr ""
-#~ "<p>...que podeu filtrar qualsevol capçalera simplement introduint\n"
-#~ "el seu nom en el primer camp editable d'una cadena de cerca?</p>\n"
-
-#~ msgid ""
-#~ "<p>...that you can filter out HTML only messages with the rule\n"
-#~ "<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-#~ "</p>\n"
-#~ msgstr ""
-#~ "<p>...que podeu filtrar la sortida dels missatges HTML amb la regla\n"
-#~ "<pre>&quot;Content-type&quot; conté &quot;text/html&quot;?</pre>\n"
-#~ "</p>\n"
-
-#~ msgid ""
-#~ "<p>...that when replying, only the selected part of the message is quoted?"
-#~ "</p>\n"
-#~ "<p>If nothing is selected, the full message is quoted.</p>\n"
-#~ "<p>This even works with text of attachments when\n"
-#~ "<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-#~ "<p>This feature is available with all reply commands except\n"
-#~ "<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-#~ "<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-#~ msgstr ""
-#~ "<p>...que en respondre, tan sols se citaran les parts seleccionades del "
-#~ "missatge?</p>\n"
-#~ "<p>Si no hi ha res seleccionat, se citarà tot el missatge.</p>\n"
-#~ "<p>Això fins i tot funciona amb el text dels adjunts quan heu "
-#~ "seleccionat\n"
-#~ "<em>Visualitza-&gt;Adjunts-&gt;Inclosos</em>.</p>\n"
-#~ "<p>Aquesta característica està disponible per a totes les ordres de\n"
-#~ "respondre excepte per a <em>Missatge-&gt;Respon sense citar</em>.</p>\n"
-#~ "<p align=\"right\"><em>col·laboració de David F. Newman</em></p>\n"
-
-#~ msgid "&Beep"
-#~ msgstr "&Timbre"
-
-#~ msgid "kmail"
-#~ msgstr "kmail"
-
-#~ msgid ""
-#~ "IMAP server not configured yet. Please configure the server in the IMAP "
-#~ "account before setting up server-side subscription."
-#~ msgstr ""
-#~ "El servidor IMAP encara no està configurat. Si us plau, configureu el "
-#~ "servidor en el compte IMAP abans de definir la subscripció de la banda "
-#~ "del servidor."
-
-#~ msgid ""
-#~ "Log in failed, please configure the IMAP account before setting up server-"
-#~ "side subscription."
-#~ msgstr ""
-#~ "L'inici de sessió ha fallat. Si us plau, configureu el servidor en el "
-#~ "compte IMAP abans de definir la subscripció de la banda del servidor."
-
-#~ msgid "Search for '%1' with"
-#~ msgstr "Cerca «%1» amb"
-
-#~ msgid "Configure Web Shortcuts..."
-#~ msgstr "Configura les dreceres web..."
-
-#~ msgid "Edit Recent Addresses..."
-#~ msgstr "Edita les adreces recents..."
-
-#~ msgid "Edit, add or remove recent addresses"
-#~ msgstr "Edita, afegeix o elimina les adreces recents"
-
-#~ msgid ""
-#~ "Configure the order in which address books\n"
-#~ "will be used when doing address completion"
-#~ msgstr ""
-#~ "Configura l'ordre en el qual s'utilitzaran les llibretes d'adreces\n"
-#~ "quan s'usa la compleció de l'adreça"
-
-#~ msgid "Configure Email Blacklist..."
-#~ msgstr "Configura la llista negra pel correu electrònic..."
-
-#~ msgid "Help"
-#~ msgstr "Ajuda"
-
-#~ msgid "Pa&ste as Quotation"
-#~ msgstr "Enganxa com a &citació"
-
-#~ msgid "Add &Quote Characters"
-#~ msgstr "Afegeix els caràcters de &citació"
-
-#~ msgid "Re&move Quote Characters"
-#~ msgstr "E&limina els caràcters de citació"
-
-#~ msgid "Paste Without Formatting"
-#~ msgstr "Enganxa sense formatat"
-
-#~ msgid "Activate"
-#~ msgstr "Activa"
-
-#~ msgid "Sentence case"
-#~ msgstr "Caixa de la frase"
-
-#~ msgid "Lowercase"
-#~ msgstr "Minúscules"
-
-#~ msgid "Change Case"
-#~ msgstr "Canvia la caixa"
-
-#~ msgid "Wait answer from \"%1\" send to \"%2\""
-#~ msgstr "Espera resposta de «%1» enviat a «%2»"
-
-#~ msgid "Select Date"
-#~ msgstr "Selecciona la data"
-
-#~ msgid "Date:"
-#~ msgstr "Data:"
-
-#~ msgid "Store ToDo in:"
-#~ msgstr "Emmagatzema les pendents a:"
-
-#~ msgid "The selected date must be greater than the current date."
-#~ msgstr "La data seleccionada ha de ser més gran que la data actual."
-
-#~ msgid "Force reindexing"
-#~ msgstr "Força la reindexació"
-
-#~ msgid "Show signed/encrypted text after composing"
-#~ msgstr "Mostra el text signat/encriptat després de l'edició"
-
-#~ msgid ""
-#~ "When this option is enabled, the signed/encrypted text will be shown in a "
-#~ "separate window, enabling you to know how it will look before it is sent. "
-#~ "This is a good idea when you are verifying that your encryption system "
-#~ "works."
-#~ msgstr ""
-#~ "Quan s'habilita aquesta opció, el text signat/encriptat es mostrarà en "
-#~ "una finestra separada, facilitant-vos saber quin aspecte tindrà abans "
-#~ "d'enviar-lo. Això és una bona idea quan esteu verificant que funciona el "
-#~ "sistema d'encriptatge."
-
-#~ msgid "Show s&igned/encrypted text after composing"
-#~ msgstr "Mostra el text s&ignat/encriptat després de l'edició"
-
-#~ msgid "Chiasmus Settings..."
-#~ msgstr "Arranjament de Chiasmus..."
-
-#, fuzzy
-#~| msgid "Rename"
-#~ msgid "name"
-#~ msgstr "Reanomena"
-
-#~ msgid "Encrypt Message with Chiasmus..."
-#~ msgstr "Encripta el missatge amb Chiasmus..."
-
-#~ msgid ""
-#~ "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-#~ "You can do this in the Crypto Backends tab of the configure dialog's "
-#~ "Security page."
-#~ msgstr ""
-#~ "Per a usar l'encriptatge Chiasmus configureu primer un dorsal "
-#~ "criptogràfic.\n"
-#~ "Podeu fer-ho a la pestanya de dorsals criptogràfics del diàleg de "
-#~ "configuració a la pàgina Seguretat."
-
-#~ msgid ""
-#~ "It looks as though libkleopatra was compiled without Chiasmus support. "
-#~ "You might want to recompile libkleopatra with --enable-chiasmus."
-#~ msgstr ""
-#~ "Sembla com si libkleopatra es va compilar sense acceptar el Chiasmus. "
-#~ "Potser heu de recompilar libkleopatra amb --enable-chiasmus."
-
-#~ msgid "No Chiasmus Backend Configured"
-#~ msgstr "No hi ha cap dorsal Chiasmus configurat"
-
-#~ msgid ""
-#~ "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
-#~ "report this bug."
-#~ msgstr ""
-#~ "El dorsal Chiasmus no ofereix la funció «x-obtain-keys». Si us plau, "
-#~ "informeu d'aquest error."
-
-#~ msgid "Chiasmus Backend Error"
-#~ msgstr "Error al dorsal Chiasmus"
-
-#~ msgid ""
-#~ "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
-#~ "function did not return a string list. Please report this bug."
-#~ msgstr ""
-#~ "Valor de retorn inesperat des del dorsal Chiasmus: la funció «x-obtain-"
-#~ "keys» no ha retornat una llista de cadenes. Si us plau, informeu d'aquest "
-#~ "error."
-
-#~ msgid ""
-#~ "No keys have been found. Please check that a valid key path has been set "
-#~ "in the Chiasmus configuration."
-#~ msgstr ""
-#~ "No s'han trobat claus. Comproveu que s'ha establert un camí de claus "
-#~ "vàlid a la configuració de Chiasmus."
-
-#~ msgid "No Chiasmus Keys Found"
-#~ msgstr "No s'han trobat claus Chiasmus"
-
-#~ msgid "Chiasmus Encryption Key Selection"
-#~ msgstr "Selecció de la clau d'encriptatge Chiasmus"
-
-#~ msgid "Test for KMail D-Bus interface"
-#~ msgstr "Prova per a la interfície D-Bus del KMail"
-
-#~ msgid ""
-#~ "<b>Thanks for using KMail2!</b><p>KMail2 uses a new storage technology "
-#~ "that requires migration of your current KMail data and configuration.</"
-#~ "p>\n"
-#~ "<p>The conversion process can take a lot of time (depending on the amount "
-#~ "of email you have) and it <em>must not be interrupted</em>.</p>\n"
-#~ "<p>You can:</p><ul><li>Migrate now (be prepared to wait)</li><li>Skip the "
-#~ "migration and start with fresh data and configuration</li><li>Cancel and "
-#~ "exit KMail2.</li></ul><p><a href=\"http://userbase.kde.org/Akonadi\">More "
-#~ "Information...</a></p>"
-#~ msgstr ""
-#~ "<b>Gràcies per usar el KMail2!</b><p>El KMail2 usa una nova tecnologia "
-#~ "d'emmagatzematge que requereix la migració de les vostres dades i de la "
-#~ "configuració actual del KMail.</p>\n"
-#~ "<p>El procés de conversió pot trigar molt temps (depenent de la quantitat "
-#~ "de correus que tingueu) i <em>no s'ha d'interrompre</em>.</p>\n"
-#~ "<p>Podeu:</p><ul><li>Migrar ara (prepareu-vos per esperar)</li><li>Ometre "
-#~ "la migració i iniciar amb dades i configuració noves</li><li>Cancel·lar i "
-#~ "sortir del KMail2.</li></ul><p><a href=\"http://userbase.kde.org/Akonadi"
-#~ "\">Més informació...</a></p>"
-
-#~ msgid "KMail Migration"
-#~ msgstr "Migració del KMail"
-
-#~ msgid "Migrate Now"
-#~ msgstr "Migra ara"
-
-#~ msgid "Skip Migration"
-#~ msgstr "Omet la migració"
-
-#~ msgid ""
-#~ "Migration to KMail 2 failed. In case you want to try again, run 'kmail-"
-#~ "migrator --interactive' manually."
-#~ msgstr ""
-#~ "Ha fallat la migració al KMail 2. En el cas que vulgueu tornar-ho a "
-#~ "intentar, executeu «kmail-migrator --interactive» manualment."
-
-#~ msgid "Migration Failed"
-#~ msgstr "Ha fallat la migració"
-
-#~ msgid " Spellcheck: %1 "
-#~ msgstr " Corrector ortogràfic: %1 "
-
-#~ msgid "New Main &Window"
-#~ msgstr "&Finestra principal nova"
-
-#~ msgid "New &Window"
-#~ msgstr "&Finestra nova"
-
-#~ msgid "Do you want to remove account '%1'?"
-#~ msgstr "Voleu eliminar el compte: «%1»?"
-
-#~ msgid "Remove account?"
-#~ msgstr "Elimino el compte?"
-
-#~ msgid "Incoming accounts (add at least one):"
-#~ msgstr "Comptes d'entrada (afegiu-ne un com a mínim):"
-
-#~ msgid "R&emove"
-#~ msgstr "E&limina"
-
-#~ msgid "Restart"
-#~ msgstr "Reinicia"
-
-#~ msgid "Message Delayed..."
-#~ msgstr "Missatge ajornat..."
-
-#~| msgid "Add new tag..."
-#~ msgid "Addnewtag..."
-#~ msgstr "Afegeix una etiqueta nova..."
-
-#~ msgid "Edit Accounts Order"
-#~ msgstr "Edita l'ordre dels comptes"
-
-#, fuzzy
-#~| msgid "&Use custom colors"
-#~ msgid "Use custom order"
-#~ msgstr "&Usa colors personalitzats"
-
-#~ msgctxt "Move selected account up."
-#~ msgid "Up"
-#~ msgstr "Amunt"
-
-#~ msgctxt "Move selected account down."
-#~ msgid "Down"
-#~ msgstr "Avall"
diff -Nru kmail-19.04.3/po/ca/kmail-refresh-settings.po kmail-19.12.3/po/ca/kmail-refresh-settings.po
--- kmail-19.04.3/po/ca/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/ca/kmail-refresh-settings.po	2020-03-03 00:33:55.000000000 +0000
@@ -0,0 +1,106 @@
+# Translation of kmail-refresh-settings.po to Catalan
+# Copyright (C) 2019 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
+#
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2019.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail-refresh-settings\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-07 10:25+0200\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 19.07.70\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Antoni Bella"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "antonibella5@yahoo.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Assistent del KMail per a actualitzar els ajustaments"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Actualització dels ajustaments del KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Avís"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Neteja l'arranjament"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Acaba"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Neteja"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Elimina l'ajustament «TipOfDay»: Fet"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Eliminació de l'arranjament de diàlegs al fitxer «%1»: Fet"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Eliminació de l'arranjament de filtres al fitxer «%1»: Fet"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Neteja de la carpeta d'arranjament al fitxer de configuració «%1»: Fet"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Neteja la mida del diàleg al fitxer de configuració «%1»: Fet"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Tanqueu el KMail/Kontact abans d'usar-lo."
diff -Nru kmail-19.04.3/po/ca/ktnef.po kmail-19.12.3/po/ca/ktnef.po
--- kmail-19.04.3/po/ca/ktnef.po	2019-07-09 00:20:17.000000000 +0000
+++ kmail-19.12.3/po/ca/ktnef.po	2020-03-03 00:33:55.000000000 +0000
@@ -1,24 +1,24 @@
 # Translation of ktnef.po to Catalan
-# Copyright (C) 2004-2017 This_file_is_part_of_KDE
+# Copyright (C) 2004-2020 This_file_is_part_of_KDE
 #
 #
 # Orestes Mas i Casals <orestes@tsc.upc.es>, 2004.
 # Albert Astals Cid <aacid@kde.org>, 2004.
 # Josep Ma. Ferrer <txemaq@gmail.com>, 2012, 2016, 2017.
-# Antoni Bella Pérez <antonibella5@yahoo.com>, 2013, 2014, 2015, 2016.
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2013, 2014, 2015, 2016, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2017-12-30 17:35+0100\n"
-"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
+"PO-Revision-Date: 2020-02-21 19:09+0100\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.03.70\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Accelerator-Marker: &\n"
 
@@ -296,7 +296,7 @@
 #: main.cpp:54
 #, kde-format
 msgid "Author, Ported to Qt4/KDE4"
-msgstr "Autor, adaptació a Qt4/KDE4"
+msgstr "Autor, adaptació a les Qt4/KDE 4"
 
 #: main.cpp:61
 #, kde-format
@@ -349,7 +349,3 @@
 #, kde-format
 msgid "MIME type:"
 msgstr "Tipus MIME:"
-
-#~ msgctxt "@info:status"
-#~ msgid "100 attachments found"
-#~ msgstr "S'han trobat 100 adjunts"
diff -Nru kmail-19.04.3/po/ca@valencia/akonadi_archivemail_agent.po kmail-19.12.3/po/ca@valencia/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ca@valencia/akonadi_archivemail_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/ca@valencia/akonadi_archivemail_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-29 16:07+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -180,14 +180,14 @@
 "No s'ha pogut afegir un segon arxiu per aquesta carpeta. En lloc d'això, "
 "modifiqueu l'arxiu existent."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "El directori no existeix. Per favor, verifiqueu els ajustaments. L'arxivat "
 "s'ha posposat."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Comença a arxivar %1"
@@ -243,9 +243,3 @@
 #, kde-format
 msgid "Years"
 msgstr "Anys"
-
-#~ msgid "Archive now"
-#~ msgstr "Arxiva ara"
-
-#~ msgid "Configure Archive Mail Agent"
-#~ msgstr "Configura l'agent per arxivar el correu"
diff -Nru kmail-19.04.3/po/ca@valencia/akonadi_followupreminder_agent.po kmail-19.12.3/po/ca@valencia/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/ca@valencia/akonadi_followupreminder_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/ca@valencia/akonadi_followupreminder_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_followupreminder_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-29 16:07+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -21,106 +21,97 @@
 "X-Accelerator-Marker: &\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agent per a recordatoris de seguiment"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Recordatori de seguiment"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Mantenidor"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Antoni Bella"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "antonibella5@yahoo.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Assumpte"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Data límit"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Resposta"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "S'ha rebut"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "A l'espera"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Mostra el missatge"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Voleu eliminar aquest element seleccionat?"
 msgstr[1] "Voleu eliminar aquests %1 elements seleccionats?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "S'ha rebut resposta de %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Encara resteu a l'espera d'una resposta sobre aquest correu:"
-
-#~ msgid "Configure"
-#~ msgstr "Configura"
-
-#~ msgid "Follow Up Mail."
-#~ msgstr "Correu de seguiment."
-
-#~ msgid "Follow Up Mail"
-#~ msgstr "Correu de seguiment"
diff -Nru kmail-19.04.3/po/ca@valencia/akonadi_mailfilter_agent.po kmail-19.12.3/po/ca@valencia/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ca@valencia/akonadi_mailfilter_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/ca@valencia/akonadi_mailfilter_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-09-29 13:55+0100\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -27,17 +27,17 @@
 msgid "Filter Log Viewer"
 msgstr "Visor del registre de filtratge"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Comparteix..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Registra les activitats de filtratge"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -47,23 +47,23 @@
 "Naturalment, només es recullen i es mostren les dades de registre quan "
 "s'activa el registre. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalls del registre"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Descripció del patró de registre"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Registra l'avaluació de les &regles de filtratge"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -78,34 +78,34 @@
 "només es donarà informació quant al resultat de l'avaluació de totes les "
 "regles d'un sol filtre."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Registra l'avaluació del patró de filtratge"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Registra les accions de filtratge"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Límit de mida de la bitàcola:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " kB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "sense límit"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -118,7 +118,7 @@
 "dades de registre recollides excedeix aquest límit, llavors es descartaran "
 "les dades més antigues fins que ja no s'excedisca el límit. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -127,63 +127,63 @@
 "No s'ha pogut escriure el fitxer %1:\n"
 "«%2» és la descripció detallada de l'error."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "S'ha produït un error al KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "S'està filtrant el missatge %1 de %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Error en aplicar el moviment del filtre de correu"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Error en aplicar la supressió del filtre de correu"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Error en aplicar les modificacions del filtre de correu"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>S'estan avaluant les regles del filtre:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Les regles del filtre han coincidit.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Comença el filtratge en el missatge «%1» des de «%2» a «%3»:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtratge de missatges"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Activat el registre de filtratge de correu"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Preparat"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtratge en %1"
diff -Nru kmail-19.04.3/po/ca@valencia/akonadi_sendlater_agent.po kmail-19.12.3/po/ca@valencia/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ca@valencia/akonadi_sendlater_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/ca@valencia/akonadi_sendlater_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-12-29 16:07+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -63,124 +63,124 @@
 msgid "Your emails"
 msgstr "antonibella5@yahoo.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Assumpte"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Envia al voltant de"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Recurrència"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID del missatge"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "No hi ha missatges en espera..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Envia ara"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Sí"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "No"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Suprimeixo l'element seleccionat?"
 msgstr[1] "Suprimeixo els elements seleccionats?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Elimina els elements"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Voleu eliminar també els missatges?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Elimina els missatges"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "No s'ha trobat el missatge."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "No s'ha trobat el missatge."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Error mentre s'obtenia el missatge."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "No s'ha pogut obtindre el missatge. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "No s'ha pogut crear el transport"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "El missatge no és un missatge real"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "No s'ha pogut enviar el missatge."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "El missatge s'ha enviat"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "S'ha trobat un error. Voleu tornar-lo a enviar?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "S'ha trobat un error"
@@ -196,38 +196,3 @@
 #, kde-format
 msgid "Remove"
 msgstr "Elimina"
-
-#~ msgctxt "@title:window"
-#~ msgid "Send Later"
-#~ msgstr "Envia més tard"
-
-#~ msgid "Send Later"
-#~ msgstr "Envia més tard"
-
-#~ msgid "Delay"
-#~ msgstr "Retard"
-
-#~ msgid "Days"
-#~ msgstr "Dies"
-
-#~ msgid "Weeks"
-#~ msgstr "Setmanes"
-
-#~ msgid "Months"
-#~ msgstr "Mesos"
-
-#~ msgid "Years"
-#~ msgstr "Anys"
-
-#~ msgid "You cannot select a date prior to the current date."
-#~ msgstr "No podeu seleccionar una data anterior a l'actual."
-
-#~ msgid "Send at:"
-#~ msgstr "Envia el:"
-
-#~ msgid "Repeat every:"
-#~ msgstr "Repeteix cada:"
-
-#~| msgid "Send Later"
-#~ msgid "SendLater"
-#~ msgstr "Envia més tard"
diff -Nru kmail-19.04.3/po/ca@valencia/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/ca@valencia/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/ca@valencia/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/ca@valencia/akonadi_unifiedmailbox_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_unifiedmailbox_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-08 12:02+0100\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -54,37 +54,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "S'està sincronitzant la bústia unificada %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Afig una bústia unificada"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nom:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Tria la icona..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Icona:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Entrada"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Enviat"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Esborranys"
diff -Nru kmail-19.04.3/po/ca@valencia/kmail.po kmail-19.12.3/po/ca@valencia/kmail.po
--- kmail-19.04.3/po/ca@valencia/kmail.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/ca@valencia/kmail.po	2020-03-03 00:33:56.000000000 +0000
@@ -12,15 +12,15 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-04-01 21:27+0100\n"
-"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-12-20 14:31+0100\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca@valencia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.03.70\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Accelerator-Marker: &\n"
 
@@ -187,7 +187,7 @@
 #: aboutdata.cpp:339
 #, kde-format
 msgid "Timestamp for 'Transmission completed' status messages"
-msgstr "Marca temporal per als missatges d'estat de «Transmissió completa»"
+msgstr "Marca de temps per als missatges d'estat de «Transmissió completa»"
 
 #: aboutdata.cpp:347
 #, kde-format
@@ -195,8 +195,8 @@
 msgstr "Múltiples claus d'encriptatge per adreça"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -302,27 +302,27 @@
 "El KMail no ha pogut detectar del tot una llista de correu en aquesta "
 "carpeta. Ompliu les adreces a mà."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Ús:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Estat:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% ple"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "Usat %1 de %2"
@@ -345,7 +345,7 @@
 "associar amb aquesta carpeta.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Plantilles"
@@ -356,106 +356,106 @@
 msgstr "&Usa plantilles de missatge personalitzades en aquesta carpeta"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copia les plantilles globals"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Visualització"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Empra &icones personalitzades"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Sense llegir:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Mostra la columna Remitent/Destinatari a la llista de missatges"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Most&ra la columna:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Omissió"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Remitent"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatari"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Llista de missatges"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Usa l'agregació per omissió"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregació"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Usa el tema per omissió"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Format per omissió del missatge"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Prefereix HTML sobre text"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Prefereix text sobre HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Usa l'arranjament global"
@@ -465,100 +465,105 @@
 msgid "Retrieval Options"
 msgstr "Opcions de recuperació"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identitats"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Recepció"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Enviament"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Servidor LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Comptes d'eixida (afegiu-ne un com a mínim):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opcions comunes"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Confirma abans d'&enviar"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Verifica l'ortografia abans d'enviar"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Mai automàticament"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "En les comprovacions de correu manuals"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "En totes les comprovacions de correu"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Envia ara"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Envia més tard"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Envia els missatges de la carpeta &sortida:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Mètode d'enviament &predeterminat:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Activa «Desfés l'enviament»"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Afig un compte de correu..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Personalitza el compte..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -567,30 +572,30 @@
 "No s'ha pogut iniciar l'assistent de comptes. Comproveu que l'AccountWizard "
 "estiga instal·lat correctament."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "No s'ha pogut iniciar l'assistent de comptes"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Inclou en la comprovació manual de correu"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Canvia a fora de línia en aturar el KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Comprova el correu en iniciar"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -648,7 +653,7 @@
 msgid "Fixed Width Font"
 msgstr "Tipus de lletra d'amplària fixa"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Editor"
@@ -956,61 +961,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "No s'ha pogut crear l'etiqueta. Ja n'existeix una amb el mateix nom."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "General"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Plantilles estàndard"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Plantilles personalitzades"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Assumpte"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Joc de caràcters"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Capçaleres"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Adjunts"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Correcció automàtica"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Redimensiona automàticament les imatges"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signatura"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1019,12 +1024,12 @@
 "Insereix automàticament la signatura configurada\n"
 "quan es comença a escriure un missatge"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Insereix la signatura dalt de qualsevol text citat"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1033,18 +1038,18 @@
 "Insereix el separador de la signatura compatible amb RFC\n"
 "(dos guions i un espai en una línia) abans de la signatura"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "En respondre, no citar cap signatura existent"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1055,7 +1060,7 @@
 "(en lloc del missatge sencer), si hi ha text\n"
 "seleccionat a la finestra de missatge."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1066,17 +1071,17 @@
 "les línies del text citat, encara que la línia s'haja creat afegint\n"
 "un trencament de línia addicional quan el text s'haja ajustat per paraules."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Activa l'ajust de línia automàtic a l'amplària especificada"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Estableix l'amplària del text per a l'ajust de línia automàtic"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1087,7 +1092,7 @@
 "original en el qual es va rebre. Si no està marcada, per omissió\n"
 "es respondrà com a text net."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1098,34 +1103,34 @@
 "marcat HTML. Està admés pel text en negreta, cursiva i subratllat,\n"
 "així com les llistes i les referències externes."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Inclòs"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Com a adjunt"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Estableix el format per omissió del missatge reenviat"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tipus de reenviament per defecte:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1136,17 +1141,17 @@
 "Podeu seleccionar aquesta opció segons cada missatge usant\n"
 "«Opcions - Notificacions de processament del missatge (MDN)»"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Avisa si s'especifiquen massa destinataris"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Estableix el nombre màxim de destinataris per a l'avís"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1163,7 +1168,7 @@
 "Tingueu en compte, però, que això no es té en compte per a les llistes\n"
 "de distribució o llistes de correu."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1172,18 +1177,18 @@
 "Recorda les últimes adreces introduïdes,\n"
 "i les ofereix per a la compleció del destinatari"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "No guardes"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Nombre màxim d'adreces recents retingudes:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1192,23 +1197,23 @@
 "El nombre màxim d'adreces introduïdes recentment\n"
 "que serà recordat per a la compleció"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configura la compleció..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Guardat automàtic"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "No guardes automàticament"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1216,18 +1221,18 @@
 msgstr[0] " minut"
 msgstr[1] " minuts"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Guarda automàticament el missatge en aquest interval especificat"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "P&refixos per a l'assumpte de la resposta"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1236,59 +1241,59 @@
 "Reconeix qualsevol seqüència dels següents prefixos\n"
 "(les entrades són expressions regulars insensibles a majúscules/minúscules):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "A&fig..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Elimina"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Introduïu un nou prefix de resposta:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "&Prefixos per a l'assumpte en reenviar"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Afig..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Elimina"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Introduïu un prefix nou per a reenviar:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1298,72 +1303,72 @@
 "missatge cercant un joc de caràcters amb tots els caràcters requerits."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Introduïu el joc de caràcters:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Ma&ntén el joc de caràcters original en respondre o reenviar (si és possible)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Aquest joc de caràcters no està admés."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Usa el sufix personalitzat d'identificador del missatge"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Sufix personalitzat d'&identificador del missatge:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Defineix els camps personalitzats per a la capçalera MIME:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nom"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valor"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&u"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nom:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
@@ -1371,17 +1376,17 @@
 "«Content-Type» no és cap cadena autoritzada. Aquesta capçalera no es "
 "guardarà."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Capçalera no vàlida"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Denominació dels adjunts compatible amb l'Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1390,40 +1395,40 @@
 "Activeu aquesta opció per fer que l'Outlook(tm) comprengui els noms dels "
 "adjunts que continguen caràcters no anglesos"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Ha&bilita la detecció de la falta d'adjunts"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Reconeix qualsevol de les següents paraules clau com a intenció d'afegir un "
 "adjunt:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Introduïu una paraula clau nova:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Mida màxima de l'adjunt:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Sense límit"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1509,7 +1514,7 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Connectors de conversió de text"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1624,7 +1629,7 @@
 msgid "Archive Folder"
 msgstr "Arxiva la carpeta"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1690,19 +1695,19 @@
 msgid "Notification"
 msgstr "Notificació"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 adjunt (%2)"
 msgstr[1] "%1 adjunts (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Oculta la llista d'adjunts"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Mostra la llista d'adjunts"
@@ -1719,333 +1724,333 @@
 msgid "Encoding"
 msgstr "Codificació"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Seleccioneu el diccionari a utilitzar en verificar l'ortografia d'aquest "
 "missatge"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Seleccioneu la carpeta per al correu enviat, on es guardarà una còpia "
 "d'aquest missatge"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Seleccioneu el compte d'eixida a utilitzar per enviar aquest missatge"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Indiqueu l'adreça de correu «Des de:» per aquest missatge"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Indiqueu un assumpte per aquest missatge"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitat:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Diccionari:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Carpeta per al correu envia&t:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Transport de correu:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&De:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Ass&umpte:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Envia el correu"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Envia el correu a través de"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Envia"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Envia més &tard"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Envia més &tard a través de"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "A la cua"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Guar&da com a esborrany"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Guarda el correu a la carpeta d'esborranys"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Guarda com a plan&tilla"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Guarda el correu a la carpeta de plantilles"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Guarda com a &fitxer"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Guarda el correu com un fitxer de text o HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Insereix un fitxer de text..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Insereix un fitxer de text recent"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Llibreta d'&adreces"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Obri la llibreta d'adreces"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "Editor nou"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Tria els &destinataris..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Guarda la llista de &distribució..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Enganxa com a ad&junt"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Neteja els &espais"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Usa un tipus de lletra d'amplària fi&xa"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgent"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Sol·licitud de notificació de p&rocessament (MDN)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Sol·licitud de confirmació d'ent&rega"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Talla les paraules"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Retalls"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Verificació &automàtica de l'ortografia"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Edició de text enriquit"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Text enriquit"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Alterna el mode d'edició de text enriquit"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Tots els camps"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitat"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Diccionari"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Carpeta per al c&orreu enviat"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Transport de &correu"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&De"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Ass&umpte"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Adjunta la s&ignatura"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Preposa la s&ignatura"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Adjunta la signatura a la posició del c&ursor"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Corrector ortogràfic..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Corrector ortogràfic"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Encripta el missatge"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Encripta"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Signa el missatge"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signa"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Format &criptogràfic dels missatges"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Selecciona un format criptogràfic per aquest missatge"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Crea un recordatori de seguiment..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configura el KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2054,53 +2059,53 @@
 "<qt>Això ocultarà la barra de menús completament. La podeu tornar a mostrar "
 "prement %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Oculta la barra de menús"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Línia: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Columna: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "SOB"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Verificació ortogràfica: activada"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Verificació ortogràfica: desactivada"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Torna a de&sar com a plantilla"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Guar&da com a esborrany"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2109,7 +2114,7 @@
 "Torna a guardar aquest missatge a la carpeta de plantilles. Podrà ser usat "
 "més tard."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2118,82 +2123,82 @@
 "Guarda aquest missatge a la carpeta d'esborranys. Podrà ser editat i enviat "
 "més tard."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Desitgeu guardar el missatge per a més tard o descartar-lo?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Tanca l'editor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Ha fallat en guardar automàticament el missatge"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Ha fallat en enviar el missatge"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Inserció d'un fitxer"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Afig com a &imatge inclosa"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Afig com a &adjunt"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nom de l'adjunt:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "El nom de l'adjunt no pot estar buit"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Nom no vàlid de l'adjunt"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Afig un URL al missatge"
 msgstr[1] "Afig alguns URL al missatge"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Afig un fitxer com a &adjunt"
 msgstr[1] "Afig alguns fitxers com a &adjunts"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Insereix el text del porta-retalls com a adjunt"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "sense nom"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2206,12 +2211,12 @@
 "per a usar-la amb aquest objectiu.</p><p>Seleccioneu la clau o claus a usar "
 "a la configuració de la identitat.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Clau d'encriptatge no definida"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2222,12 +2227,12 @@
 "de signatura a usar (OpenPGP o S/MIME).</p><p>Escolliu la clau a usar a la "
 "configuració de la identitat.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Clau de signatura no definida"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2238,7 +2243,7 @@
 "heu d'establir l'adreça de correu electrònic per a totes les identitats de "
 "forma que no hàgeu d'introduir-la per cada missatge."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2247,37 +2252,37 @@
 "Almenys cal especificar un destinatari ja siga en el camp Per a: o com a CC "
 "o com a BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "El camp «A:» és buit. Voleu que envie el missatge igualment?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "No s'ha especificat res a «A:»"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "No heu especificat un assumpte. Voleu que envie el missatge igualment?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "No s'ha especificat l'assumpte"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Envia t&al qual"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Especifica l'assumpte"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2285,22 +2290,22 @@
 msgstr ""
 "Almenys haureu d'especificar un destinatari per tal d'encriptar un esborrany."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "A punt d'enviar el correu..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Envia la confirmació"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Envia ara"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2308,22 +2313,22 @@
 msgstr ""
 "Esteu intentant enviar el correu a més de %1 destinataris. L'envio igualment?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Massa destinataris"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Envia t&al qual"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Edita els destinataris"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2331,22 +2336,22 @@
 msgstr ""
 "Desactivar el mode HTML farà que el text perdi la formatació. Esteu segur?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Perdo el formatat?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perd la formatació"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Afig un marcador de text net"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2355,7 +2360,7 @@
 "S'emprarà encriptació d'alta seguretat per a aquest destinatari (la clau de "
 "l'encriptatge és de plena confiança). Feu clic a la icona per a més detalls."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2365,7 +2370,7 @@
 "de l'encriptatge és de confiança parcial). Feu clic a la icona per a més "
 "detalls."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2375,7 +2380,7 @@
 "de l'encriptatge és de confiança no fiable). Feu clic a la icona per a més "
 "detalls."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2386,7 +2391,7 @@
 "seguretat de l'encriptatge és desconeguda (la clau de l'encriptatge no s'ha "
 "pogut verificar). Feu clic a la icona per a més detalls."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Informació del connector d'edició"
@@ -2463,7 +2468,7 @@
 msgid "External editor was started."
 msgstr "S'ha iniciat l'editor extern."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2472,20 +2477,20 @@
 "No s'ha trobat el transport. Verifiqueu que esteu emprant un transport de "
 "correu correcte."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "No s'ha definit la carpeta d'enviats. Per favor, establiu-la abans d'enviar "
 "el correu."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "No s'ha trobat la identitat. Verifiqueu que esteu emprant la correcta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2513,11 +2518,6 @@
 msgid "Message will not be encrypted"
 msgstr "El missatge no s'encriptarà"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Retalls de text"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2565,27 +2565,27 @@
 msgid "Cannot move messages."
 msgstr "No s'han pogut moure els missatges."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "No s'ha pogut recuperar la carpeta. Error notificat: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "No s'ha retornat la carpeta."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "No s'ha pogut recuperar la carpeta pare. Error notificat: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "No s'ha pogut retornar la llista de carpetes."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Missatges arxivats"
@@ -2626,48 +2626,48 @@
 msgid "&Existing identities:"
 msgstr "Identitats e&xistents:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Error en generar una nova parella de claus: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Error en generar la clau"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Sense clau"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Genera una nova parella de claus:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "S'està generant una parella de claus nova..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Edita la identitat"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "General"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "El &vostre nom:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2679,12 +2679,12 @@
 "p><p>Si el deixeu en blanc, el vostre nom real no apareixerà, tan sols "
 "l'adreça de correu electrònic.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organit&zació:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2696,12 +2696,12 @@
 "electrònic que envieu.</p><p>És segur (i normal) deixar aquest espai en "
 "blanc.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "A&dreça de correu:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2717,12 +2717,12 @@
 "p><p>Si deixeu això en blanc, o malament, la gent tindrà problemes per a "
 "respondre-vos.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Àlies de correu electrònic:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2739,12 +2739,12 @@
 "tr><tr><th>Àlies:</th><td>nom@exemple.org<br>cognom@exemple.org</td></tr></"
 "table><p>Escriviu un àlies d'adreça per línia.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Criptografia"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2757,15 +2757,15 @@
 "els missatges. També podeu usar claus GnuPG.</p><p>Podeu deixar aquest camp "
 "en blanc, però el KMail no serà capaç de signar digitalment correus "
 "electrònics. Les funcions normals del correu no se'n veuran afectades.</"
-"p>Podeu trobar més informació quant a les claus a <a>https://www.gnupg.org</"
-"a></qt>"
+"p>Trobareu més informació quant a les claus a <a>https://www.gnupg.org</a></"
+"qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Clau de signatura OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2780,15 +2780,15 @@
 "pública» a l'editor. També podeu usar claus GnuPG.</p><p>Podeu deixar aquest "
 "camp en blanc, però el KMail no serà capaç d'encriptar els correus "
 "electrònics eixints. Les funcions normals del correu no se'n veuran "
-"afectades.</p><p>Podeu trobar més informació quant a les claus a <a>https://"
-"www.gnupg.org</a></p></qt>"
+"afectades.</p><p>Trobareu més informació quant a les claus a <a>https://www."
+"gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Clau d'encriptatge OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2801,12 +2801,12 @@
 "KMail no serà capaç de signar digitalment correus electrònics usant S/MIME. "
 "Les funcions normals del correu no se'n veuran afectades.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificat de signatura S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2821,39 +2821,39 @@
 "dels missatges d'eixida a vós mateix usant S/MIME. Les funcions normals del "
 "correu no es veuran afectades.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificat d'encriptatge S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Format preferit:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Signa els missatges automàticament"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Encripta els missatges automàticament sempre que siga possible"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avançat"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Adreça de &Respon-a:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2871,12 +2871,12 @@
 "camp <tt>From:</tt>, però que qualsevol resposta es dirigisca a un grup "
 "d'adreces.</p><p>Si en dubteu, deixeu aquest camp en blanc.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adre&ces CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2893,12 +2893,12 @@
 "adreça useu comes per separar la llista de destinataris CC</p><p>Si en "
 "dubteu, deixeu aquest camp en blanc.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Adre&ça BCC:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2915,57 +2915,57 @@
 "p> <p>Per especificar més d'una adreça useu comes per separar la llista de "
 "destinataris BCC</p><p>Si en dubteu, deixeu aquest camp en blanc.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&iccionari:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Carpeta per al correu &enviat:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Carpeta pels esb&orranys:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Carpeta per a les plan&tilles:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Compte eixint:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Adjunta la meua vCard al missatge"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Crea..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Idioma de correcció automàtica:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Restaura el nom de domini per omissió"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "&Domini predeterminat:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2974,33 +2974,33 @@
 "<qt><p>El nom de domini per omissió s'empra per a la compleció de les "
 "adreces de correu que tan sols consistisquen en un nom d'usuari.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Usa plantilles de missatge personalitzades per aquesta identitat"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signatura"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Imatge"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Àlies de correu no vàlid «%1»"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Adreça de correu no vàlida"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3013,7 +3013,7 @@
 "Això pot provocar missatges d'avís a la banda receptora en provar de "
 "verificar signatures fetes amb aquesta configuració."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3022,7 +3022,7 @@
 "Una de les claus d'encriptatge configurades a l'OpenPGP no conté cap ID de "
 "l'usuari amb l'adreça de correu configurada per a aquesta identitat (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3035,7 +3035,7 @@
 "Això pot provocar missatges d'avís a la banda receptora en provar de "
 "verificar signatures fetes amb aquesta configuració."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3044,22 +3044,22 @@
 "Un dels certificats d'encriptatge configurats a l'S/MIME no conté l'adreça "
 "de correu configurada per a aquesta identitat (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "No s'ha trobat l'adreça de correu a la clau/certificat"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "El fitxer de signatura no és vàlid"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Edita la identitat «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3068,7 +3068,7 @@
 "No hi ha cap carpeta personalitzada per a la identitat, per tant s'usarà la "
 "carpeta d'esborranys predeterminada."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Edita..."
@@ -3099,6 +3099,18 @@
 msgid "We cannot delete vCard file."
 msgstr "No s'ha pogut suprimir el fitxer de vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Realment voleu cancel·lar?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmació"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3264,7 +3276,7 @@
 "Hi ha exemples disponibles a <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Imatge"
@@ -3298,7 +3310,7 @@
 msgstr[0] "La llista de distribució «%2» és buida, no es pot usar."
 msgstr[1] "Les llistes de distribució «%2» són buides, no es poden usar."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Afig a la llibreta d'adreces"
@@ -3308,22 +3320,22 @@
 msgid "Contact created successfully"
 msgstr "El contacte s'ha creat correctament"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "El contacte no s'ha pogut emmagatzemar: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Ha fallat en emmagatzemar el contacte"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Desitgeu adjuntar aquesta carpeta «%1»?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Adjunta la carpeta"
@@ -3537,14 +3549,14 @@
 msgstr "&Carpeta"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Aplica els filtres sobre la carpeta"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3570,7 +3582,7 @@
 msgstr "Reen&via"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Aplica el filtratge"
@@ -3595,7 +3607,7 @@
 msgstr "A&juda"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barra d'eines principal"
@@ -3649,13 +3661,13 @@
 msgid "The file does not contain a message."
 msgstr "El fitxer no conté un missatge."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "El fitxer conté múltiples missatges. Només es mostra el primer missatge."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3664,32 +3676,32 @@
 "Voleu reenviar els missatges seleccionats com a adjunts en un missatge (com "
 "a un resum MIME) o com a missatges individuals?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Envia com a un resum"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Envia individualment"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtratge de missatges"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "S'està filtrant el missatge %1 de %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "S'estan movent els missatges"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "S'estan suprimint els missatges"
@@ -3718,31 +3730,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Barra d'eines de direcció del text"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "S'ha establit que el KMail estiga desconnectat; s'han suspès tots els "
 "treballs de xarxa"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Envia el correu"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "És impossible enviar el correu"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "S'ha establit que el KMail estiga connectat; s'han représ tots els treballs "
 "de xarxa"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3751,40 +3763,40 @@
 "S'ha establit que el KMail estiga connectat; es reprendran tots els treballs "
 "de xarxa en detectar-se una connexió de xarxa"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "El KMail està actualment en el mode desconnectat. Com voleu continuar?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Connectat/desconnectat"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Treballa en línia"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Treballa desconnectat"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "S'ha detectat una connexió de xarxa, s'han représ tots els treballs de xarxa"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "No s'ha detectat cap connexió de xarxa, s'han suspès tots els treballs de "
 "xarxa"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3793,12 +3805,12 @@
 "Ha fallat en obrir el fitxer de desament automàtic a %1.\n"
 "Motiu: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Ha fallat l'obertura del fitxer de desament automàtic"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3807,7 +3819,7 @@
 msgstr[1] ""
 "Aquestes %1 identitats s'han canviat per usar el transport per omissió:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3816,43 +3828,47 @@
 msgstr[1] ""
 "Aquestes %1 identitats s'han canviat per usar el transport modificat:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "S'estan enviant els missatges"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "S'està iniciant el procés d'enviament..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "El recurs %1 està trencat."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"El recurs %1 està trencat.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "L'agent per arxivar el correu no està registrat."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "L'agent per enviar més tard no està registrat."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "L'agent per recordatoris de seguiment no està registrat."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3861,12 +3877,12 @@
 "No s'ha pogut iniciar el gestor de certificats. Comproveu que el Kleopatra "
 "estiga instal·lat correctament."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "S'ha produït un error al KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3875,26 +3891,26 @@
 "No s'ha pogut iniciar l'assistent d'importació. Comproveu que l'ImportWizard "
 "estiga instal·lat correctament."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "No s'ha pogut iniciar l'assistent d'importació"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"No s'ha pogut iniciar el programa «Exportador de la configuració PIM». "
-"Comproveu la vostra instal·lació."
+"No s'ha pogut iniciar el programa «Exportador de dades PIM». Comproveu la "
+"vostra instal·lació."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "No s'ha pogut iniciar el programa «Exportador de la configuració PIM»"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "No s'ha pogut iniciar el programa «Exportador de dades PIM»"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3903,71 +3919,71 @@
 "No s'ha pogut iniciar l'ImportWizard. Comproveu que l'ImportWizard estiga "
 "instal·lat correctament."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "No s'ha pogut iniciar l'ImportWizard"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "S'ha trobat un altre programa de correu en el sistema. Voleu importar-ne les "
 "dades?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "No s'ha pogut iniciar l'assistent d'importació. Comproveu la vostra "
 "instal·lació."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Sense assumpte"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(sense plantilles)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Aquesta carpeta no té configurada cap opció de caducitat"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Realment voleu fer que caduqui la carpeta <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Fes que caduqui la carpeta"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Fes que &caduqui"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Buida la paperera"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Mou a la paperera"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Realment voleu buidar la paperera?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3976,27 +3992,27 @@
 "<qt>Realment voleu moure tots els missatges de la carpeta <b>%1</b> a la "
 "paperera?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "S'han mogut tots els missatges a la paperera"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Realment voleu que caduquin tots els missatges antics?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Voleu que caduquin els missatges antics?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Fes que caduqui"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4007,17 +4023,17 @@
 "podeu estar incrementant la possibilitat que el sistema es veja compromés "
 "per altres forats de seguretat presents i futurs."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Carrega les referències externes"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4032,533 +4048,533 @@
 "<qt>Realment voleu suprimir els %1 missatges seleccionats?<br />Una vegada "
 "els hàgeu suprimit no es podran restaurar.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Suprimeix els missatges"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Suprimeix el missatge"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "S'estan movent els missatges..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "S'estan suprimint els missatges..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Els missatges s'han suprimit correctament."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Els missatges s'han mogut correctament."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "L'acció de suprimir els missatges ha fallat."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "S'ha cancel·lat la supressió dels missatges."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "L'acció de moure els missatges ha fallat."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "L'acció de moure els missatges s'ha cancel·lat."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Mou els missatges a la carpeta"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "S'estan copiant els missatges..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Els missatges s'han copiat correctament."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "L'acció de copiar els missatges ha fallat."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "S'ha cancel·lat l'acció de copiar els missatges."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copia els missatges a una carpeta"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "S'estan movent els missatges a la paperera..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "S'estan suprimint i movent els missatges a la paperera..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Els missatges s'han mogut a la paperera correctament."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Els missatges s'han mogut a la paperera o suprimit correctament"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "L'acció de moure els missatges a la paperera ha fallat."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Ha fallat en suprimir o moure els missatges a la paperera."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "S'ha cancel·lat l'acció de moure els missatges a la paperera."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr ""
 "S'ha cancel·lat l'acció de suprimir o moure els missatges a la paperera."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Salta a la carpeta"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Guar&da com a..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Fes que caduquin &totes les carpetes"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Compro&va el correu"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Comprova el correu a"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Comprova el correu"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Envia la cua de missatges"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Estat de la connexió (desconegut)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Envia la cua de missatges via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gestor de certificats"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importa els missatges..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Depura el «sieve»..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visor del &registre de filtratge..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importa des d'un altre client de correu..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Edita les respostes «fora de l'oficina»..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configura l'arxivat automàtic..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Missatges ajornats..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Missatges de recordatori de seguiment..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Su&primeix"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Mou el &fil a la paperera"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Mou el fil a la paperera"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Suprimeix el &fil"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Cerca als missatges..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Selecciona &tots els missatges"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Gestiona la llista de correu..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Assigna una drecera..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Arranjament de la caducitat"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arxiva la carpeta..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Carrega les referències e&xternes"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copia el missatge a..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Mou el missatge a..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Missatge &nou..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nou"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Missatge des d'una plan&tilla"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Missatg&e nou a una llista de correu..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Crea un filtre"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtra per l'&Assumpte..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtra pel &De..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtra pel &Per a..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtra pel &CC..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marca la &conversa"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marca la conversa com a &llegida"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marca tots els missatges en la conversa seleccionada com a llegits"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marca la conversa com a &sense llegir"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr ""
 "Marca tots els missatges en la conversa seleccionada com a sense llegir"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marca la conversa com a &important"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Elimina la marca d'&important de la conversa"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marca la conversa com un element d'&acció"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Elimina la marca d'element d'&acció de la conversa"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Vigila la conversa"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignora la conversa"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Guarda els ad&junts..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copia'l desencriptat a..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Aplica tots els &filtres"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expandeix la conversa/grup"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expandeix la conversa o grup actual"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Redueix la conversa/grup"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Redueix la conversa o grup actual"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ex&pandeix totes les converses"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expandeix totes les converses a la carpeta actual"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Redueix totes les converses"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Redueix totes les converses a la carpeta actual"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "M&ostra el missatge"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Missatge se&güent"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Vés al missatge següent"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Missatge següent &sense llegir"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Següent"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Vés al missatge següent sense llegir"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Missatge &anterior"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Vés al missatge anterior"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Missatge anterior sense llegir"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Anterior"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Vés al missatge anterior sense llegir"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Ca&rpeta següent sense llegir"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Vés a la carpeta següent que tinga missatges sense llegir"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "&Carpeta anterior sense llegir"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Vés a la carpeta anterior que tinga missatges sense llegir"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "&Text següent sense llegir"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Vés al text següent sense llegir"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4567,225 +4583,230 @@
 "Descendeix en el missatge actual. Si s'arriba al final del missatge, anirà "
 "cap al missatge següent sense llegir."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configura els &filtres..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
-msgstr "Gestiona els scripts «&sieve»..."
+msgstr "Gestiona els scripts de «&Sieve»..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Afig un compte..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "I&ntroducció al KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Mostra la pàgina de benvinguda del KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configura les &notificacions..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configura el KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Fes que caduqui..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Afig una carpeta preferida..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Subscripció de la banda del servidor..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Aplica tots els filtres"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importa/Exporta les dades del KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Contacte nou a la llibreta d'adreces..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copia el missatge a la carpeta"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Salta a la carpeta..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Interromp l'operació actual"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Apunta a la carpeta següent"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Apunta a la carpeta anterior"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Selecciona la carpeta on apuntar"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Apunta a la primera carpeta"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Apunta a l'última carpeta"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Apunta al missatge següent"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Apunta al missatge anterior"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Selecciona el primer missatge"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Selecciona l'últim missatge"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Selecciona el missatge amb el focus"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Estableix el focus a la cerca ràpida"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Amplia la selecció al missatge anterior"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Amplia la selecció al missatge següent"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Mou el missatge a la carpeta"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Usa menys amplada de banda"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 "Marca tots els missatges com a llegits en aquesta carpeta i totes les "
 "subcarpetes"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Elimina els duplicats en aquesta carpeta i totes les seues subcarpetes"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "A&rranjament del compte"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Reinicia el compte"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Afig una carpeta preferida"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Buida la &paperera"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Mou tots els missatges a la paperera"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Su&primeix la cerca"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Edita la cerca..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Desfés"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Desfés: «%1»"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtre %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Cerca... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4796,12 +4817,12 @@
 "podeu estar incrementant la possibilitat que el sistema es veja compromés "
 "per altres forats de seguretat presents i futurs."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Usa HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4817,119 +4838,119 @@
 "desactivar completament la característica als ajustaments del connector del "
 "KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Activo les bústies unificades?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Activació de les bústies unificades"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "S'està iniciant..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Mou a la paperera"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Mou a la paperera"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Mou el missatge a la paperera"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "No s'ha pogut copiar l'element. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Missatge nou a..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Respon a..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Reenvia a..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Afig a un contacte existent"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Obri a la llibreta d'adreces"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Apunta aquest enllaç"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Edita el contacte..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Guarda l'enllaç com a..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
-msgstr "C&erca al missatge..."
+msgstr "&Cerca al missatge..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Guarda la imatge al disc..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Mostra en format HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Mostra el format HTML quan el correu provingui d'aquest contacte"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Carrega les referències externes quan el correu provingui d'aquest contacte"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Comparteix la imatge..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4938,63 +4959,63 @@
 "El KMail ara està basat en el marc de treball per a la gestió de la "
 "informació personal Akonadi, el qual incorpora molts canvis per tot arreu."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Correu electrònic per enviament (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Millora a les cerques"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Implementació per afegir notes (anotacions) als correus"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Menys immobilitzacions de la IGU, la comprovació de correu es fa en segon pla"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Admet connectors"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Representador HTML nou (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "S'ha afegit la comprovació d'URL de pesca"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "El client de correu del KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "S'està rebent el contingut de la carpeta"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Espereu un moment..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Desconnectat"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5003,7 +5024,7 @@
 "El KMail ara està en mode desconnectat. Cliqueu <a href=\"kmail:goOnline"
 "\">ací</a> per a connectar-vos...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5012,22 +5033,22 @@
 "El compte ara està en mode desconnectat. Cliqueu <a href=\"kmail:"
 "goResourceOnline\">ací</a> per a connectar-vos...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "El contacte s'ha modificat correctament"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Missatges nous a"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "No hi ha missatges sense llegir"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5050,8 +5071,8 @@
 msgstr "Copyright © 2004–2010, Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5146,17 +5167,17 @@
 msgstr ""
 "Seleccioneu els connectors de resum a visualitzar a la pàgina de resum."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Resum del Kontact pel KDE"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5202,27 +5223,27 @@
 msgid "All"
 msgstr "Tot"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Resum del Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Visualitza el resum del Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(C) 2003-2019, els desenvolupadors del Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5251,7 +5272,7 @@
 msgid "&Reply"
 msgstr "&Respon"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Respon..."
@@ -5261,12 +5282,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Respon a l'a&utor..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Respon a &tots..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Respon a la &llista de correu..."
@@ -5296,7 +5317,7 @@
 msgid "&Edit As New"
 msgstr "&Edita com a nou"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5487,82 +5508,82 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "La cerca ha fallat i s'han trobat alguns errors: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Cerca als missatges"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Cerca"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Inclou..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Com a &adjunt..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Guarda els adjunts..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Neteja la selecció"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Salta a la carpeta original"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 coincidència"
 msgstr[1] "%1 coincidències"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Última cerca"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "No heu seleccionat una carpeta vàlida."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Heu oblidat seleccionar les col·leccions."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Heu oblidat definir la condició."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Totes les carpetes seleccionades estan buides o sense indexar."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Heu oblidat afegir les condicions."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5570,57 +5591,57 @@
 "Conté una condició que no es pot usar amb un nombre de caràcters inferior a "
 "4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "S'està cercant..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "La cerca no ha pogut obtindre cap resultat. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "La cerca ha fallat."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "S'ha finalitzat la cerca."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "S'ha aturat la cerca."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
 "that another search folder with the same name already exists. Error returned "
 "\"%1\"."
 msgstr ""
-"S'ha produït un problema en reanomenar la carpeta de cerques. Un motiu "
+"S'ha produït un problema en reanomenar la carpeta de cerca. Un motiu "
 "freqüent per això és que ja existeix una altra carpeta de cerca amb el "
 "mateix nom. Error retornat «%1»."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copia un missatge"
 msgstr[1] "Copia %1 missatges"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Retalla un missatge"
 msgstr[1] "Retalla %1 missatges"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "S'està verificant l'estat de l'índex..."
@@ -5756,7 +5777,7 @@
 "per a ús intern)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5766,7 +5787,7 @@
 "detectar més d'un compte de correu electrònic. Només es farà una vegada."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5775,26 +5796,26 @@
 "Aquest valor s'usa per a decidir si s'ha de mostrar la introducció del KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Mostra la línia d'edició de cerca ràpida de carpeta"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Reenvia inclòs per defecte."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Avisa si el nombre de destinataris és més gran que:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5805,19 +5826,19 @@
 "i demanarà la confirmació abans d'enviar el correu. L'avís es pot desactivar."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Verifica l'ortografia abans d'enviar"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Petició automàtica de les notificacions de processament del &missatge"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5835,13 +5856,13 @@
 "p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Guarda automàticament cada:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5853,87 +5874,87 @@
 "desactivar el desament automàtic establint el valor a 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Mostra el plafó de gestió de retalls de text i inserció a l'editor."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "En comprovar, els missatges enviats s'emmagatzemaran en el format encriptat"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Una llista de tots els URL usats recentment"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Una llista de totes les codificacions usades recentment"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Mostra l'indicador de l'etiqueta de criptografia"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Valida la drecera per omissió per enviar"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "La mida del diàleg d'identitat (només per a ús intern)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "L'amplària de la finestra de cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "L'alçària de la finestra de cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "L'amplària del diàleg de configuració del KMail (només per a ús intern)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "L'alçària del diàleg de configuració del KMail (només per a ús intern)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Subfinestra de vista prèvia del missatge"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "No mostres la subfinestra de vista prèvia de missatges"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
@@ -5941,7 +5962,7 @@
 "missatges"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
@@ -5949,61 +5970,61 @@
 "llista de missatges"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Llista de carpetes"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Llista de carpetes llarga"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Llista de carpetes curta"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Plantilla de missatge pels missatges nous"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Plantilla de missatge per a les respostes"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Plantilla de missatge per a les respostes a tots"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Plantilla de missatge pels reenviaments"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Caràcters de citació"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Especifica la política usada en mostrar la política"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6013,7 +6034,7 @@
 "cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6023,7 +6044,7 @@
 "(només per a ús intern)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6033,7 +6054,7 @@
 "cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6043,7 +6064,7 @@
 "cerca (només per a ús intern)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6053,7 +6074,7 @@
 "(només per a ús intern)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6326,7 +6347,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6362,7 +6383,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6531,7 +6552,7 @@
 #: ui/searchwindow.ui:133
 #, kde-format
 msgid "Open &Search Folder"
-msgstr "Obr&i la carpeta de cerques"
+msgstr "Obr&i la carpeta de cerca"
 
 #. i18n: ectx: property (text), widget (QPushButton, mSearchResultOpenBtn)
 #: ui/searchwindow.ui:143
@@ -6692,8 +6713,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Comprova el seguiment en l'URL del correu"
+msgid "Scan emails for tracking URLs"
+msgstr "Explora els correus per als URL de seguiment"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7313,6 +7334,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Torna a activar tots els avisos «No ho tornes a preguntar»"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 segons"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Desfés l'enviament"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
diff -Nru kmail-19.04.3/po/ca@valencia/kmail-refresh-settings.po kmail-19.12.3/po/ca@valencia/kmail-refresh-settings.po
--- kmail-19.04.3/po/ca@valencia/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/ca@valencia/kmail-refresh-settings.po	2020-03-03 00:33:56.000000000 +0000
@@ -0,0 +1,106 @@
+# Translation of kmail-refresh-settings.po to Catalan (Valencian)
+# Copyright (C) 2019 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
+#
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2019.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail-refresh-settings\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-07 10:25+0200\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca@valencia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 19.07.70\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Antoni Bella"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "antonibella5@yahoo.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Assistent del KMail per a actualitzar els ajustaments"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Actualització dels ajustaments del KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Avís"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Neteja l'arranjament"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Acaba"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Neteja"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Elimina l'ajustament «TipOfDay»: Fet"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Eliminació de l'arranjament de diàlegs al fitxer «%1»: Fet"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Eliminació de l'arranjament de filtres al fitxer «%1»: Fet"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Neteja de la carpeta d'arranjament al fitxer de configuració «%1»: Fet"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Neteja la mida del diàleg al fitxer de configuració «%1»: Fet"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Tanqueu el KMail/Kontact abans d'usar-lo."
diff -Nru kmail-19.04.3/po/ca@valencia/ktnef.po kmail-19.12.3/po/ca@valencia/ktnef.po
--- kmail-19.04.3/po/ca@valencia/ktnef.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/ca@valencia/ktnef.po	2020-03-03 00:33:55.000000000 +0000
@@ -1,24 +1,24 @@
 # Translation of ktnef.po to Catalan (Valencian)
-# Copyright (C) 2004-2017 This_file_is_part_of_KDE
+# Copyright (C) 2004-2020 This_file_is_part_of_KDE
 #
 #
 # Orestes Mas i Casals <orestes@tsc.upc.es>, 2004.
 # Albert Astals Cid <aacid@kde.org>, 2004.
 # Josep Ma. Ferrer <txemaq@gmail.com>, 2012, 2016, 2017.
-# Antoni Bella Pérez <antonibella5@yahoo.com>, 2013, 2014, 2015, 2016.
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2013, 2014, 2015, 2016, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2017-12-30 17:35+0100\n"
-"Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
+"PO-Revision-Date: 2020-02-21 19:09+0100\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca@valencia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.03.70\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Accelerator-Marker: &\n"
 
@@ -296,7 +296,7 @@
 #: main.cpp:54
 #, kde-format
 msgid "Author, Ported to Qt4/KDE4"
-msgstr "Autor, adaptació a Qt4/KDE4"
+msgstr "Autor, adaptació a les Qt4/KDE 4"
 
 #: main.cpp:61
 #, kde-format
@@ -349,7 +349,3 @@
 #, kde-format
 msgid "MIME type:"
 msgstr "Tipus MIME:"
-
-#~ msgctxt "@info:status"
-#~ msgid "100 attachments found"
-#~ msgstr "S'han trobat 100 adjunts"
diff -Nru kmail-19.04.3/po/cs/akonadi_archivemail_agent.po kmail-19.12.3/po/cs/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/cs/akonadi_archivemail_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/cs/akonadi_archivemail_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Vit Pelcak <vit@pelcak.org>, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Vit Pelcak <vit@pelcak.org>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
-"PO-Revision-Date: 2018-01-09 14:37+0100\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2019-09-09 15:57+0200\n"
 "Last-Translator: Vit Pelcak <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.0\n"
 
 #: addarchivemaildialog.cpp:44
 #, kde-format
@@ -101,7 +101,7 @@
 #: archivemailwidget.cpp:106
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
-msgstr ""
+msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
 #: archivemailwidget.cpp:107
 #, kde-format
@@ -175,12 +175,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr ""
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Adresář neexistuje. Prosím, ověřte nastavení. Archivace byla odložena."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Spustit archivaci %1"
diff -Nru kmail-19.04.3/po/cs/akonadi_followupreminder_agent.po kmail-19.12.3/po/cs/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/cs/akonadi_followupreminder_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/cs/akonadi_followupreminder_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák <vit@pelcak.org>, 2014, 2015, 2016, 2017, 2018.
+# Vít Pelčák <vit@pelcak.org>, 2014, 2015, 2016, 2017, 2018, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2018-04-03 17:19+0100\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
+"PO-Revision-Date: 2019-09-09 15:56+0200\n"
 "Last-Translator: Vit Pelcak <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -15,87 +15,87 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
-msgstr ""
+msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Správce"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Vít Pelčák"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "vit@pelcak.org"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Komu"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Předmět"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Nejzazší termín"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Odpověď"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Přijato"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Pozastaveno"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Zobrazit zprávu"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Smazat"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
@@ -103,12 +103,12 @@
 msgstr[1] "Přejete si odstranit tyto %1 vybrané položky?"
 msgstr[2] "Přejete si odstranit těchto %1 vybraných položek?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Přijata odpověď od %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr ""
diff -Nru kmail-19.04.3/po/cs/akonadi_mailfilter_agent.po kmail-19.12.3/po/cs/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/cs/akonadi_mailfilter_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/cs/akonadi_mailfilter_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2014-11-07 08:52+0100\n"
 "Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -22,17 +22,17 @@
 msgid "Filter Log Viewer"
 msgstr "Prohlížeč záznamů filtru"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Sdílet..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Zaznamenávat činnost fi&ltrů"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -41,23 +41,23 @@
 "Zde můžete zapnout a vypnout záznam aktivit filtrů. Záznamy jsou pořizovány "
 "jen při zapnutí této funkce. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Podrobnosti záznamů"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Zaznamenávat popis vzorku"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Zaznamenávat vyhodnocení p&ravidla filtru"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -67,34 +67,34 @@
 "given."
 msgstr ""
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Zaznamenávat vyhodnocení vzorku filtru"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Zaznamenávat činnosti filtru"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Limit velikosti záznamu:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "neomezená"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -106,7 +106,7 @@
 "velikost paměti, která se pro tento účel použije. Jestliže záznamy dosáhnou "
 "zde stanové velikosti, starší data se smažou a bude se pokračovat v záznamu. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -115,63 +115,63 @@
 "Nelze zapsat soubor %1:\n"
 "Podrobný popis chyby: %2."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Chyba KMailu"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtruje se zpráva %1 z %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Chyba při aplikování filtru pošty \"přesun\""
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Chyba při aplikování filtru pošty \"mazání\""
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Chyba při aplikování filtru pošty \"úpravy\""
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Vyhodnocuji pravidla filtru:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Pravidla filtru odpovídají.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Začít filtrování na zprávě \"%1\" od \"%2\" v \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrování zpráv"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Záznam filtrování pošty povolen"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Připraven"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrování v %1"
diff -Nru kmail-19.04.3/po/cs/akonadi_sendlater_agent.po kmail-19.12.3/po/cs/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/cs/akonadi_sendlater_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/cs/akonadi_sendlater_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Vit Pelcak <vit@pelcak.org>, 2013, 2014, 2015, 2016, 2017, 2018.
+# Vit Pelcak <vit@pelcak.org>, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2018-01-09 14:44+0100\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
+"PO-Revision-Date: 2019-09-09 13:50+0200\n"
 "Last-Translator: Vit Pelcak <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.0\n"
 
 #: sendlaterconfiguredialog.cpp:37
 #, kde-format
@@ -25,7 +25,7 @@
 #: sendlaterconfiguredialog.cpp:57
 #, kde-format
 msgid "Send Later Agent"
-msgstr ""
+msgstr "Agent pro odeslání později"
 
 #: sendlaterconfiguredialog.cpp:59
 #, kde-format
@@ -35,7 +35,7 @@
 #: sendlaterconfiguredialog.cpp:61
 #, kde-format
 msgid "Copyright (C) 2013-2019 Laurent Montel"
-msgstr ""
+msgstr "Copyright (C) 2013-2019 Laurent Montel"
 
 #: sendlaterconfiguredialog.cpp:63
 #, kde-format
@@ -59,57 +59,57 @@
 msgid "Your emails"
 msgstr "vit@pelcak.org"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Komu"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Předmět"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
-msgstr ""
+msgstr "Poslat okolo"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Opakující se"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID zprávy"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Odeslat nyní"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Smazat"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Ano"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Ne"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
@@ -117,67 +117,67 @@
 msgstr[1] "Přejete si smazat zvolené položky?"
 msgstr[2] "Přejete si smazat zvolen0 položky?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Odstranit položky"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Chcete rovněž odstranit zprávy?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Odstranit zprávy"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Nenalezena žádná zpráva."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Nenalezena žádná zpráva."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Chyba při stahování zprávy."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Zprávu nelze stáhnout. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Transport nelze vytvořit"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Nejedná se o zkutečnou zprávu"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Zprávu nelze odeslat."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Zpráva byla odeslána"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Byla nalezena chyba. Chcete ji znovu poslat?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Nalezena chyba"
diff -Nru kmail-19.04.3/po/cs/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/cs/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/cs/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/cs/akonadi_unifiedmailbox_agent.po	2020-03-03 00:33:56.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the kmail package.
-# Vit Pelcak <vit@pelcak.org>, 2018.
+# Vit Pelcak <vit@pelcak.org>, 2018, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2018-09-13 12:32+0100\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2019-09-09 13:51+0200\n"
 "Last-Translator: Vit Pelcak <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.0\n"
 
 #: settingsdialog.cpp:63
 #, kde-format
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
-msgstr ""
+msgstr "Přidat sjednocenou schránku"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Název:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Vyberte ikonu..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Příchozí"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Odesláno: "
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Koncepty"
diff -Nru kmail-19.04.3/po/cs/kmail.po kmail-19.12.3/po/cs/kmail.po
--- kmail-19.04.3/po/cs/kmail.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/cs/kmail.po	2020-03-03 00:33:56.000000000 +0000
@@ -1,15 +1,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # Lukáš Tinkl <ltinkl@redhat.com>, 2010, 2011, 2012.
-# Vít Pelčák <vit@pelcak.org>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Vít Pelčák <vit@pelcak.org>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2018-09-04 13:06+0100\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-11-07 11:54+0100\n"
 "Last-Translator: Vit Pelcak <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: en_US\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.2\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -116,7 +116,7 @@
 #: aboutdata.cpp:110
 #, kde-format
 msgid "System tray notification"
-msgstr "Oznámení v systémové části panelu"
+msgstr "Upozornění v systémové části panelu"
 
 #: aboutdata.cpp:142
 #, kde-format
@@ -179,8 +179,8 @@
 msgstr "Více šifrovacích klíčů na adresu"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -193,7 +193,7 @@
 #: aboutdata.cpp:365
 #, kde-format
 msgid "Copyright © 1997–2019, KMail authors"
-msgstr ""
+msgstr "Copyright © 1997–2019, Vývojáři KMailu"
 
 #: collectionpage/collectionmailinglistpage.cpp:51
 #, kde-format
@@ -286,27 +286,27 @@
 "KMail nebyl schopen kompletně zjistit diskuzní skupinu v této složce. Prosím "
 "vyplňte adresy ručně."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvóta"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Použití:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Stav:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% plné"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 z %2 použito"
@@ -328,7 +328,7 @@
 "tlačítko a stisknutím požadované kombinace kláves.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Šablony"
@@ -339,106 +339,106 @@
 msgstr "Po&užít vlastní šablony zpráv pro tuto složku"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopírovat globální šablony"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Zobrazit"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Použít &vlastní ikony"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normální:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "N&epřečteno:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Zobrazit sloupec odesílatele/příjemce v seznamu zpráv"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Zo&brazit sloupec:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Výchozí"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Odesílatel"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Příjemce"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Seznam zpráv"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Použít výchozí agregaci"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregace"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Použít výchozí motiv"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Motiv"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Výchozí formát zprávy"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Upřednostňovat HTML před textem"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Upřednostňovat text před HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Použít globální nastavení"
@@ -448,100 +448,105 @@
 msgid "Retrieval Options"
 msgstr "Možnosti stahování"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identit"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Příjem"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Odesílání"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
-msgstr ""
+msgstr "Server LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Odchozí účty (přidejte alespoň jeden):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Obvyklé možnosti"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "P&otvrdit před odesláním"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Zkontrolovat pravopis před odesláním"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nikdy automaticky"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Při ručních kontrolách pošty"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Při všech kontrolách pošty"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Poslat nyní"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Poslat později"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Ode&slat zprávy ze složky odchozí pošty:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Implicitní metoda odesílání:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Povolit vrácení odeslání"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Přidat účet e-mailu..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Vlastní účet..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -550,30 +555,30 @@
 "Nelze spustit průvodce účtem. Prosím zkontrolujte zda je AccountWIzard "
 "správně nainstalován."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Nelze spustit průvodce účtem"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Zahrnout do ruční kontroly pošty"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Přepnout do odpojeného režimu při ukončení KMailu"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Zkontrolovat poštu při spuštění"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -629,7 +634,7 @@
 msgid "Fixed Width Font"
 msgstr "Neproporcionální font"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Editor"
@@ -883,12 +888,12 @@
 #: settings/kmail.kcfg.cmake:88
 #, kde-format
 msgid "Start minimized to tray"
-msgstr ""
+msgstr "Spustit minimalizovaný do lišty"
 
 #: configuredialog/configureappearancepage.cpp:893
 #, kde-format
 msgid "Show unread email in Taskbar"
-msgstr ""
+msgstr "Zobrazit nepřečtenou poštu v panelu úloh"
 
 #: configuredialog/configureappearancepage.cpp:964
 #, kde-format
@@ -931,91 +936,91 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Obecné"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardní šablony"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Vlastní šablony"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Předmět"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Znaková sada"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Hlavičky"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Přílohy"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Automatická oprava"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Automaticky měnit velikost obrázku"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Podpis"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formát"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1023,7 +1028,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1031,17 +1036,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1049,7 +1054,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1057,34 +1062,34 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Vloženě"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Jako příloha"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Výchozí typ přeposílání:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Příjemci"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1092,17 +1097,17 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Nastavit maximální počet příjemců pro varování"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1113,48 +1118,48 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Neukládat"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Nastavit doplňování..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Automatické uložení"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Neukládat automaticky"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1163,18 +1168,18 @@
 msgstr[1] " minuty"
 msgstr[2] " minut"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Automaticky uložit zprávu po tomto konkrétním intervalu"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefi&xy předmětu odpovědi"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1183,59 +1188,59 @@
 "Rozpoznávat jakoukoliv sekvenci z následujících prefixů\n"
 "(položky jsou regulární výrazy rozlišující malá a velká písmena):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Př&idat..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Odstranit"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Změn&it..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Vložit nový prefix odpovědi:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefixy předmětu př&eposlání"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Přidat..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Odstranit"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Změnit..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Vložit nový prefix přeposlání:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1245,89 +1250,89 @@
 "zjišťována znaková sada, která obsahuje všechny požadované znaky."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Z&měnit..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Vložit znakovou sadu:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Po&nechat výchozí znakovou sadu při odpovědi nebo přeposlání (pokud je to "
 "možné)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Tato znaková sada není podporována."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Použít uživatelskou identifikační příponu"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Uživatelská &identifikační přípona:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definovat vlastní pole pro MIME hlavičky:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Jméno"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Hodnota"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Nová"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Jméno:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Hodnota:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Neplatná hlavička"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Pojmenování příloh kompatibilní s Outlookem"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1336,40 +1341,40 @@
 "Zapněte tuto možnost, aby Outlook(tm) pochopil názvy příloh obsahující "
 "neanglické znaky"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Povolit detekci c&hybějících příloh"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Rozeznat jakékoliv z následujících klíčových slov jako záměr připojit "
 "přílohu:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Vložit nové klíčové slovo:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Maximální velikost přílohy:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Bez limitu"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1425,7 +1430,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:202
 #, kde-format
 msgid "Grammar Checker Plugins"
-msgstr ""
+msgstr "Moduly pro kontrolu gramatiky"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:212
 #, kde-format
@@ -1454,8 +1459,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr ""
+msgid "Text Conversion Plugins"
+msgstr "Moduly pro převod textu"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1568,7 +1573,7 @@
 msgid "Archive Folder"
 msgstr "Složka pro archivaci"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1632,9 +1637,9 @@
 #: dialog/kmknotify.cpp:39
 #, kde-format
 msgid "Notification"
-msgstr "Oznámení"
+msgstr "Upozornění"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1642,12 +1647,12 @@
 msgstr[1] "%1 přílohy (%2)"
 msgstr[2] "%1 příloh (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Skrýt seznam příloh"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Zobrazit seznam příloh"
@@ -1664,329 +1669,329 @@
 msgid "Encoding"
 msgstr "Kódování"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Nastavit předmět zprávy"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identita:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "S&lovník:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Složka ode&slaných zpráv:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Přenos &pošty:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "O&d:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Pře&dmět:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "Po&slat zprávu"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Po&slat zprávu pomocí"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Odeslat"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Poslat &později"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Poslat &později pomocí"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Fronta"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "U&ložit jako koncept"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Uložit e-mail ve složce Koncepty"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Uloži&t jako šablonu"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Uložit jako &soubor"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Vložit textový &soubor..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Vlož&it nedávný textový soubor"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Knih&a adres"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Otevřít Knihu adres"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nový editor"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Vyb&rat příjemce..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Uložit &distribuční seznam..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Vložit jako přílo&hu"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Zruš&it mezery"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "&Použít neproporcionální font"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "Nalé&havé"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
-msgstr "&Požadovat oznámení o naložení"
+msgstr "&Požadovat upozornění na naložení"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Vyžádat potv&rzení přijetí"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Zalamování slov"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "Ú&ryvky"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatická kontrola pravopisu"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rich text"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Všechn&a pole"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identita"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "S&lovník"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Složka odeslané pošty"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Přenos pošty"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Od"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Pře&dmět"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Př&ipojit podpis"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Př&ipojit podpis před"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Vložit podpis na pozici k&urzoru"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Kontrola pravopisu..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Kontrola pravopisu"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Z&ašifrovat zprávu"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Šifrovat"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Podep&sat zprávu"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Podepsat"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Formát ši&frované zprávy"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Vytvořit připomínku pro následnou činnost..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Nastavit KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -1995,60 +2000,60 @@
 "<qt>Toto úplně skryje panel nabídky. Můžete ji opětovně zobrazit pomocí %1.</"
 "qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Skrýt nabídku"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Řádka: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Sloupec: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "PŘE"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "VLO"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Kontrola pravopisu: zap"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Kontrola pravopisu: vyp"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Uložit &znovu jako šablonu"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "U&ložit jako koncept"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "Uložit znovu zprávu do složky šablon. Může být použita později."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2057,58 +2062,58 @@
 "Uložit zprávu do složky konceptů; ta může být poté upravena a odeslána "
 "později."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Přejete si zprávu uložit pro pozdější použití nebo ji zahodit?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Zavřít editor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Automatické uložení zprávy selhalo"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Odesílání zprávy selhalo"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Vložit soubor"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Př&idat jako vložený obrázek"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Přid&at jako přílohu"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Název přílohy:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
-msgstr ""
+msgstr "Název přílohy nemůže být prázdný"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
-msgstr ""
+msgstr "Neplatný název přílohy"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2116,7 +2121,7 @@
 msgstr[1] "Přidat URL do zprávy"
 msgstr[2] "Přidat URL do zprávy"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2124,17 +2129,17 @@
 msgstr[1] "Přid&at soubory jako přílohu"
 msgstr[2] "Přid&at soubory jako přílohu"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Vložit text ze schránky jako přílohu"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "nepojmenováno"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2146,12 +2151,12 @@
 "nastaven žádný k tomu potřebný OpenPGP nebo S/MIME šifrovací klíč.</"
 "p><p>Prosím nastavte patřičné klíče pro tuto identitu.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Nedefinovaný šifrovací klíč"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2162,12 +2167,12 @@
 "klíč (OpenPGP nebo S/MIME), který k tomu bude použit.</p><p>Prosím zvolte "
 "vhodný klíč v dialogu nastavení identity.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nedefinovaný podepisovací klíč"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2178,7 +2183,7 @@
 "mailovou adresu nastavit pro všechny identity, abyste ji nemuseli zadávat "
 "pro každou zprávu zvlášť."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2187,124 +2192,124 @@
 "V poli Komu:, Kopie nebo Skrytá kopie je nutné zadat minimálně jednoho "
 "příjemce."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Nebyl zadán adresát zprávy. I přesto zprávu odeslat?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Nebyl zadán adresát"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nebyl zadán předmět zprávy. I přesto zprávu odeslat?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nebyl zadán předmět"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Poslat tak, jak j&e"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "Zadat před&mět zprávy"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Musíte zvolit alespoň jednoho příjemce, abyste mohli návrh zašifrovat."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Chystáte se poslat e-mail..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Potvrzení odeslání"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Poslat nyní"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr "Pokoušíte se odeslat e-mail více než %1 adresátům. Přesto odeslat?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Příliš mnoho příjemců"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Po&slat tak, jak je"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Upravit příj&emce"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Zahodit formátování?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Zahodit formátování"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2312,7 +2317,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Informace o modulu editoru"
@@ -2386,19 +2391,19 @@
 msgid "External editor was started."
 msgstr "Byl spuštěn externí editor."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
@@ -2406,7 +2411,7 @@
 "Identita nebyla nalezena. Prosím, ujistěte se, že používáte správnou "
 "identitu."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2434,11 +2439,6 @@
 msgid "Message will not be encrypted"
 msgstr "Zpráva nebude zašifrována"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Textové úryvky"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2482,27 +2482,27 @@
 msgid "Cannot move messages."
 msgstr "Zprávy nelze přesunout."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Nebyla navrácena žádná složka."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Nelze vrátit seznam složek."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Zpráv archivováno"
@@ -2543,48 +2543,48 @@
 msgid "&Existing identities:"
 msgstr "&Existující identity:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Chyba při generování nového páru klíčů: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Chyba při generování klíče"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Žád&ný klíč"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Generovat nový pár klíčů"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Generuje se nový pár klíčů..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Upravit identitu"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Obecné"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "Vaše &jméno:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2596,12 +2596,12 @@
 "toto zanecháte prázdné, vaše skutečné jméno se neobjeví, objeví se pouze e-"
 "mailová adresa.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Or&ganizace:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2612,12 +2612,12 @@
 "jak byste chtěli, aby se zobrazilo v hlavičce e-mailu, který bude odeslán.</"
 "p><p>Je bezpečné (a běžné) zanechat pole prázdné.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-mailová adresa:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2627,12 +2627,12 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Emai&lové přezdívky:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2643,12 +2643,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Šifrování"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2657,13 +2657,18 @@
 "functions will not be affected.</p><p>You can find out more about keys at "
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
+"<qt><p>OpenPGP klíč, který zde vyberete, bude použit pro podepisování zpráv. "
+"Lze také použít GnuPG klíče.</p> <p>Můžete toto nechat prázdné, ale KMail "
+"nebude schopen digitálně podepisovat e-maily. Obyčejné funkce pošty nebudou "
+"ovlivněny.</p> <p>O klíčích můžete nalézt více na adrese <a>https://www."
+"gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Podepisovací klíč OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2673,13 +2678,19 @@
 "mail functions will not be affected.</p><p>You can find out more about keys "
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
+"<qt><p>Zde vybraný OpenPGP klíč se bude používat pro šifrování zpráv pro vás "
+"a pro funkci \"Přiložit můj veřejný klíč\" editoru. Můžete použít i GnuPG "
+"klíče.</p> <p>Položku můžete nechat nevyplněnou, ale nebude možné pro vás "
+"šifrovat kopie odchozí pošty pomocí OpenPGP. Běžné poštovní funkce zůstanou "
+"zachovány.</p> <p>Více se můžete o klíčích dozvědět na adrese <a>https://www."
+"gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Šifrovací klíč OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2692,12 +2703,12 @@
 "KMail nebude schopen podepisovat zprávy pomocí S/MIME. Běžné poštovní funkce "
 "zůstanou zachovány.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Podepisovací S/MIME certifikát:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2711,39 +2722,39 @@
 "můžete nechat nevyplněnou, ale nebude možné pro vás šifrovat kopie odchozí "
 "pošty pomocí S/MIME. Běžné poštovní funkce zůstanou zachovány.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Šifrovací S/MIME certifikát:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Preferovaný formát:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Automaticky podepisovat zprávy"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Automaticky šifrovat zprávy, pokud je to možné"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Ad&resa pro odpovědi:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2761,12 +2772,12 @@
 "aby šly na adresu skupiny.</p><p>Pokud nevíte, zanechte pole prázdné.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adresy &CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2782,12 +2793,12 @@
 "</p><p>Více adres můžete zadat tak, že je oddělíte čárkou.</p><p>Pokud si "
 "nejste jisti, ponechte pole prázdné.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
-msgstr "Adresy &BCC:"
+msgstr "Adresy pro s&kryté kopie:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2797,64 +2808,64 @@
 "yours.</p><p>To specify more than one address, use commas to separate the "
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
-"<qt><h3>BCC (Blind Carbon Copy) adresy</h3><p>Zde vložené adresy budou "
+"<qt><h3>Adresy pro skrytou kopii (BCC)</h3><p>Zde vložené adresy budou "
 "přidány ke každé odchozí zprávě, která je odesílána s touto identitou. "
 "Nebudou viditelné pro ostatní příjemce zprávy.</p><p>Obvykle se to používá k "
 "posílání kopií všech odeslaných zpráv na nějaký váš další účet.</p> <p>Více "
 "adres můžete zadat tak, že je oddělíte čárkou.</p><p>Pokud si nejste jisti, "
 "ponechte pole prázdné.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "S&lovník:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Složka odeslanýc&h zpráv:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Složka kon&ceptů:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "S&ložka se šablonami:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Odchozí účet:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Přiložit ke zprávě moji vizitku"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Vytvořit..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Jazyk pro automatickou opravu:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Obnovit výchozí název domény"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Implici&tní doména:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2863,33 +2874,33 @@
 "<qt><p>Implicitní doména se používá pro doplňování e-mailové adresy, je-li "
 "zadáno pouze jméno uživatele.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Po&užít vlastní šablony zpráv pro tuto identitu"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Podpis"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Obrázek"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Neplatná e-mailová přezdívka \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Neplatná e-mailová adresa"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2902,7 +2913,7 @@
 "To může na straně příjemce vyvolat varování během ověřování podpisů "
 "vytvořených s touto konfigurací."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2911,7 +2922,7 @@
 "Jeden z nastavených OpenPGP šifrovacích klíčů neobsahuje žádné ID uživatele "
 "s e-mailovou adresou této identity (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2924,7 +2935,7 @@
 "To může na straně příjemce vyvolat varování během ověřování podpisů "
 "vytvořených s touto konfigurací."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -2933,29 +2944,29 @@
 "Jeden z nastavených S/MIME šifrovacích certifikátů neobsahuje nastavenou e-"
 "mailovou adresu této identity (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-mailová adresa nenalezena v klíči/certifikátech"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Soubor s podpisem není platný"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Upravit identitu \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Upravit..."
@@ -2986,6 +2997,18 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Přejete si opravdu přerušit?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Potvrzení"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3144,8 +3167,10 @@
 "Examples are available at <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
+"Ukázky jsou dostupné na <a href=\"https://ace.home.xs4all.nl/X-Faces/"
+"\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Obrázek"
@@ -3179,7 +3204,7 @@
 msgstr[1] "Distribuční seznamy %2 jsou prázdné, nelze je použít."
 msgstr[2] "Distribuční seznamy %2 jsou prázdné, nelze je použít."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Přidat do knihy adres"
@@ -3189,22 +3214,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakt byl úspěšně vytvořen"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kontakt nelze uložit: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Nelze uložit kontakt"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Opravdu si přejete přiložit tuto složku \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Přiložit složku"
@@ -3324,7 +3349,7 @@
 #: kmail_options.h:22
 #, kde-format
 msgid "Send BCC: to 'address'"
-msgstr "Poslat slepou kopii (BCC) na adresu 'address'"
+msgstr "Poslat skrytou kopii na 'adresu'"
 
 #: kmail_options.h:26
 #, kde-format
@@ -3415,14 +3440,14 @@
 msgstr "Slož&ka"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Aplikovat filtry na složku"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3448,7 +3473,7 @@
 msgstr "&Předat dál"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&plikovat filtr"
@@ -3473,7 +3498,7 @@
 msgstr "Nápo&věda"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Hlavní panel nástrojů"
@@ -3527,12 +3552,12 @@
 msgid "The file does not contain a message."
 msgstr "Soubor neobsahuje zprávu."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Tento soubor obsahuje více zpráv; bude zobrazena pouze první."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3541,32 +3566,32 @@
 "Přejete si přeposlat vybrané zprávy jako přílohy v jedné zprávě (jako MIME "
 "souhrn)nebo jako samostatné zprávy?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Odeslat v jedné zprávě"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Odeslat jednotlivě"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrování zpráv"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtruje se zpráva %1 z %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Přesun zpráv"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Mazání zpráv"
@@ -3595,76 +3620,76 @@
 msgid "Text Direction Toolbar"
 msgstr "Panel nástrojů směru textu"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail je nastaven na odpojen, všechny síťové úlohy jsou odloženy"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Odeslat e-mail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "E-mail nelze odeslat"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail je nastaven na připojen, všechny síťové úlohy jsou obnoveny"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr ""
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail je právě v odpojeném režimu; jak si přejete pokračovat?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Připojen/Odpojen"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Pracovat připojen"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Pracovat odpojen"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Otevření souboru automatického uložení selhalo"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3674,7 +3699,7 @@
 msgstr[2] ""
 "Těchto %1 identit bylo nastaveno pro používání výchozího transportu:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3684,43 +3709,47 @@
 msgstr[2] ""
 "Těchto %1 identit bylo nastaveno pro používání změněného transportu:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Odesílám zprávy"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Je inicializováno odesílání..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Zdroj %1 je poškozen."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Zdroj %1 je poškozen.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Agento pro následnou upomínku nebyl zaregistrován."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3729,12 +3758,12 @@
 "Nelze spustit správce certifikátů. Prosím zkontrolujte zda je správně "
 "nainstalována Kleopatra."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Chyba KMailu"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3743,26 +3772,26 @@
 "Nelze spustit průvodce importem. Prosím zkontrolujte zda je správně "
 "nainstalován ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Nelze spustit průvodce importem"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Nelze spustit program \"Exportér nastavení PIM\". Prosím zkontrolujte svoji "
+"Nelze spustit program \"Exportér dat PIM\". Prosím zkontrolujte svoji "
 "instalaci."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Nelze spustit program \"Exportér nastavení PIM\""
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Nelze spustit program \"Exportér dat PIM\""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3771,67 +3800,67 @@
 "Nelze spustit ImportWizard. Prosím zkontrolujte zda je správně nainstalován "
 "ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Nelze spustit průvodce importem"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Nelze spustit průvodce importem. Prosím zkontrolujte svoji instalaci."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Žádný předmět"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(žádné šablony)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Tato složka nemá nastaveny volby pro vypršení pošty"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Opravdu si přejete nechat vypršet složku <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Nechat vypršet složku"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "N&echat vypršet"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Vyprázdnit koš"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Přesunout do koše"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Opravdu si přejete vyprázdnit složku koše?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3840,27 +3869,27 @@
 "<qt>Opravdu si přejete přesunout všechny zprávy ze složky <b>%1</b> do koše?"
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Všechny zprávy přesunout do koše"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Opravdu si přejete nechat zaniknout všechny staré zprávy?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Nechat vypršet staré zprávy?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Vypršení"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3871,17 +3900,17 @@
 "zvýšit pravděpodobnost, že bude systém napaden zneužitím nějaké, dosud "
 "neznámé, bezpečnostní chyby."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Bezpečnostní varování"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Načíst externí odkazy"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3899,531 +3928,531 @@
 "<qt>Opravdu si přejete smazat %1 označených zpráv?<br />Jakmile jsou "
 "smazány, nelze je obnovit.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Smazat zprávy"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Smazat zprávu"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Přesouvám zprávy..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Mažu zprávy..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Zprávy úspěšně smazány."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Zprávy úspěšně přesunuty."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Mazání zpráv se nezdařilo."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Mazání zpráv zrušeno."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Přesun zpráv se nezdařil."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Přesouvání zpráv zrušeno."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Přesunout zprávu do složky"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopíruji zprávy..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Zprávy úspěšně zkopírovány."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Kopírování zpráv se nezdařilo."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopírování zpráv zrušeno."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopírovat zprávy do složky"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Přesouvám zprávy do koše..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Mažu a přesunuji zprávy do koše..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Zprávy úspěšně přesunuty do koše."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Zprávy úspěšně přesunuty do koše nebo smazány"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Přesun zpráv do koše se nezdařil."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Mazání nebo přesun zpráv do koše selhalo."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Přesouvání zpráv do koše zrušeno."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Mazání nebo přesun zpráv do koše bylo zrušeno."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Přejít do složky"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Uložit j&ako..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "N&echat vypršet všechny složky"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Zkontrolovat pošt&u"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Zkontrolovat poštu v"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Zkontrolovat poštu"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Po&slat zprávy ve frontě"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Online stav (neznámý)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Poslat zprávy ve frontě pomocí"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Správa certifikátů"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importovat zprávy..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "La&dit Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Proh&lížeč záznamů filtrů..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Upravit odpovědi \"mimo kancelář\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Nastavit automatickou archivaci..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Zpožděné zprávy..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Následné upomínkové zprávy..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Smazat"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Přesun&out vlákno do koše"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Přesunout vlákno do koše"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Smazat v&lákno"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Hle&dat zprávy..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Vybr&at všechny zprávy"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Správa poštovní &konference..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Přiř&adit zkratku..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Nastav&ení vypršení"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Archivovat složku..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Načíst e&xterní odkazy"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopírovat zprávu do..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Přesunout zprávu do..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nová zpráva..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nová"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Zpráva ze š&ablony"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nová zpráva do poštovní &konference..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Vytvořit filt&r"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtr na &Předmětu..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtr na &Od..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtr na &Komu..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr ""
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "O&značit vlákno"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Označi&t vlákno jako přečtené"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Označit všechny zprávy ve vybraném vláknu jako přečtené"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Označit vlákno jako ne&přečtené"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Označit všechny zprávy ve vybraném vláknu jako nepřečtené"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Označit vlákno jako Dů&ležité"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Odstranit značku vlákna Důlež&ité"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Označit vlákno j&ako Úkol"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Odstr&anit značku vlákna Úkol"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Sle&dovat vlákno"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorovat vlákno"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Uloži&t přílohy..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Kopídovat dešifrovené do..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Aplikovat všechny filtr&y"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Ro&zbalit vlákno / skupinu"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Rozbalit aktuální vlákno nebo skupinu"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Sbal&it vlákno / skupinu"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Sbalit aktuální vlákno nebo skupinu"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Roz&balit všechna vlákna"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Rozbalit všechna vlákna v aktuální složce"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Sba&lit všechna vlákna"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Sbalit všechna vlákna v aktuální složce"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Zo&brazit zprávu"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Následující zpráva"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Přejít na následující zprávu"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Násled&ující nepřečtená"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Následující"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Přejít na následující nepřečtenou zprávu"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Předchozí zpráva"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Přejít na předchozí zprávu"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Předchozí &nepřečtená"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Předchozí"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Přejít na předchozí nepřečtenou zprávu"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Nás&ledující nepřečtená složka"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Přejít na následující složku s nepřečtenými zprávami"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Předch&ozí nepřečtená složka"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Přejít na předchozí složku s nepřečtenými zprávami"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Následující nepřečtený &text"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Přesun na následující nepřečtený text"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4432,223 +4461,228 @@
 "Aktuální zprávu rolovat dolů. Po konci zprávy přejít na následující "
 "nepřečtenou zprávu."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Nastavit &filtry..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "&Spravovat Sieve skripty..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "Přid&at účet..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "Úvod do &KMailu"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Zobrazit uvítací stránku KMailu"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "&Nastavit upozornění..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Nastavit &KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Nechat vypršet..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Přidat oblíbenou složku..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Odběr na serveru..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Aplikovat všechny filtry"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importovat/Exportovat data KMailu..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nový kontakt knihy adres..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopírovat zprávu do složky"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Přejít do složky..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Zrušit aktuální operaci"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Změřit se na následující složku"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Zaměřit se na předchozí složku"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Vybrat složku se zaměřením"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Přepnout se na první složku"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Přepnout se na poslední složku"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Zaměřit se na následující zprávu"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Zaměřit se na předchozí zprávu"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Vybrat první zprávu"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Vybrat poslední zprávu"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Vybrat zprávu se zaměřením"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Přejít do rychlého vyhledávání"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Rozšířit výběr na předchozí zprávu"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Rozšířit výběr na následující zprávu"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Přesunout zprávu do složky"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Na&stavení účtu"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Restartovat účet"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Přidat oblíbenou složku"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "V&yprázdnit koš"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Všechny zp&rávy přesunout do koše"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Smazat hle&dání"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Upravit vyhledávání..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Zpět"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Zpět: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtr %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Hledat... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4659,12 +4693,12 @@
 "zvýšit pravděpodobnost, že bude systém napaden zneužitím nějaké, dosud "
 "neznámé, bezpečnostní chyby."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Použít HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4674,118 +4708,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
-msgstr ""
+msgstr "Povolit sjednocené schránky?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
-msgstr ""
+msgstr "Povolit sjednocené schránky"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Spouští se..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Přesunout do &koše"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Koš"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Přesunout zprávu do koše"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Položku nelze zkopírovat. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nová zpráva pro..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Poslat odpověď na..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Předat dál na..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Přidat k existujícímu kontaktu"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Otevřít v knize adres"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Přidat tento odkaz do záložek"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Upravit kontakt..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Uložit odkaz jako..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "Hle&dat ve zprávě..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Uložit obrázek na disk..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Zobrazit formát HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Sdílet obrázek..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4794,62 +4828,62 @@
 "KMail je nyní postaven na frameworku pro správu osobních informací Akonadi, "
 "který přináší mnoho všemožných změn."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push e-mail (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Vylepšené hledání"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Podpora pro přidávání poznámek (anotací) k e-mailům"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Méně časté zamrzání rozhraní, kontroly pošty jsou prováděny na pozadí"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Podpora modulů"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Nové vykreslování HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Přidána kontrola URL s Phishingem"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Poštovní klient KDE."
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Získávám obsah složky"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Čekejte, prosím . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Odpojen"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4858,7 +4892,7 @@
 "KMail je právě v odpojeném režimu. Kliknutím <a href=\"kmail:goOnline\"> "
 "sem</a> přejdete do připojeného režimu . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4867,22 +4901,22 @@
 "Účet je právě v odpojeném režimu. Kliknutím <a href=\"kmail:goResourceOnline "
 "\">sem</a> přejdete do připojeného režimu. . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontakt byl úspěšně změněn"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nové zprávy v"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Nejsou žádné nepřečtené zprávy"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4906,8 +4940,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -4995,17 +5029,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Vybrat moduly k zobrazení na souhrnné stránce."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Shrnutí aplikace Kontakt"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c) 2004 Tobias Koenig"
@@ -5049,27 +5083,27 @@
 msgid "All"
 msgstr "Vše"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Shrnutí kontaktu"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Pohled na shrnutí kontaktu"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
-msgstr ""
+msgstr "(c) 2003-2019 Vývojáři aplikace Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5096,7 +5130,7 @@
 msgid "&Reply"
 msgstr "O&dpovědět"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Odpovědět..."
@@ -5106,12 +5140,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Odpovědět a&utorovi..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Odpovědě&t všem..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Odpovědět do e-mai&lové konferenci..."
@@ -5139,9 +5173,9 @@
 #: messageactions.cpp:132
 #, kde-format
 msgid "&Edit As New"
-msgstr ""
+msgstr "Upravi&t jako nové"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5199,7 +5233,7 @@
 #: messageactions.cpp:446
 #, kde-format
 msgid "<unknown>"
-msgstr ""
+msgstr "<neznámé>"
 
 #: messageactions.cpp:446
 #, kde-format
@@ -5330,45 +5364,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Hledání selhalo. Bylo nalezeno několik chyb: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Najít zprávy"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Hledat"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "Vloži&t..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Jako přílohu..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Uložit přílohy..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Smazat výběr"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Přejít do původní složky"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5376,68 +5410,68 @@
 msgstr[1] "%1 shody"
 msgstr[2] "%1 shod"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Poslední hledání"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Zapomněli jste určit podmínku."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Všechny vybrané složky jsou prázdné nebo nebyly indexovány."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Zapomněli jste přidat podmínky."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Vyhledávám..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Nelze získat výsledek hledání. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Vyhledávání selhalo."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Vyhledávání dokončeno."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Vyhledávání zastaveno."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5445,7 +5479,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5453,7 +5487,7 @@
 msgstr[1] "Kopírovat %1 zprávy"
 msgstr[2] "Kopírovat %1 zpráv"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5461,7 +5495,7 @@
 msgstr[1] "Vyjmout %1 zprávy"
 msgstr[2] "Vyjmout %1 zpráv"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Kontroluji stav indexu..."
@@ -5518,7 +5552,7 @@
 #: settings/kmail.kcfg.cmake:92
 #, kde-format
 msgid "Show Unread Email in TaskBar"
-msgstr ""
+msgstr "Zobrazit nepřečtenou poštu v panelu úloh"
 
 #. i18n: ectx: label, entry (ExternalEditor), group (General)
 #: settings/kmail.kcfg.cmake:96
@@ -5591,7 +5625,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5599,7 +5633,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5607,26 +5641,26 @@
 msgstr "Tato hodnota určuje, zda má být zobrazován Úvod do KMailu."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Zobrazovat políčko pro rychle hledání ve složkách"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Varovat, pokud počet příjemců překročí:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5635,19 +5669,19 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Zkontrolovat pravopis před odesláním"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automaticky požadovat oznámení o &naložení"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5663,13 +5697,13 @@
 "<em>Požadovat oznámení o naložení</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Interval automatického ukládání:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5681,151 +5715,151 @@
 "zde 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Zobrazovat v editoru Správce útržků a Panel vkládání."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Seznam všech nedávno použitých URL"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Seznam všech nedávno použitých kódování"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Rám s náhledem zprávy"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Nezobrazovat rám s náhledem zprávy"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Zobrazovat rám s náhledem zprávy pod seznamem zpráv"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Zobrazovat rám s náhledem zprávy vedle seznamu zpráv"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Seznam složek"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Dlouhý seznam složek"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Krátký seznam složek"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Šablona nové zprávy"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Šablona zprávy pro odpověď"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Šablona zprávy pro odpověď všem"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Šablona zprávy pro přeposlání"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Znaky pro citaci"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5833,7 +5867,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5841,7 +5875,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5849,7 +5883,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5857,7 +5891,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5865,7 +5899,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -5922,7 +5956,7 @@
 #: ui/accountspagereceivingtab.ui:41
 #, kde-format
 msgid "New Mail Notification"
-msgstr "Oznámení o nové poště"
+msgstr "Upozornění na novou poštu"
 
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mVerboseNotificationCheck)
 #: ui/accountspagereceivingtab.ui:65
@@ -5934,7 +5968,7 @@
 #: ui/accountspagereceivingtab.ui:68
 #, kde-format
 msgid "Deta&iled new mail notification"
-msgstr "Deta&ilní oznámení o nové poště"
+msgstr "Deta&ilní upozornění na novou poštu"
 
 #. i18n: ectx: property (text), widget (QPushButton, mOtherNewMailActionsButton)
 #: ui/accountspagereceivingtab.ui:81
@@ -6034,7 +6068,7 @@
 #: ui/composercryptoconfiguration.ui:71
 #, kde-format
 msgid "Show sign/encrypt indicator in editor"
-msgstr "Zobrazit v editoru indikátor zašifrovaný/podepsaný"
+msgstr "Zobrazit v editoru ukazatel zašifrovaný/podepsaný"
 
 #. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAdd)
 #: ui/identitypage.ui:24
@@ -6126,7 +6160,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6455,7 +6489,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
+msgid "Scan emails for tracking URLs"
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
@@ -6499,7 +6533,7 @@
 "sense e.g. for customer relationship management, it has been made available."
 "</li></ul></qt>"
 msgstr ""
-"<qt><h3>Politika oznámení o naložení se zprávou</h3><p>MDN (oznámení o "
+"<qt><h3>Politika oznámení o naložení se zprávou</h3><p>MDN (upozornění na "
 "naložení se zprávou) je zevšeobecněním funkce <b>potvrzení o doručení</b>. "
 "Autor zprávy pomocí MDN požaduje, aby byl informován o osudu zprávy. "
 "Příjemcův e-mailový klient může jako odpověď zaslat informace o tom, jak "
@@ -6573,7 +6607,7 @@
 #: ui/securitypagemdntab.ui:142
 #, kde-format
 msgid "Do not send MDNs in response to encrypted messages"
-msgstr "Neodesílat MDN oznámení o šifrovaných zprávách"
+msgstr "Neodesílat oznámení MDN o šifrovaných zprávách"
 
 #. i18n: ectx: property (text), widget (QLabel, labelWarning)
 #: ui/securitypagemdntab.ui:152
@@ -7068,6 +7102,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Reaktivovat všechna \"Znovu se neptat\" upozornění"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 s"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Vrátit odeslání"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
diff -Nru kmail-19.04.3/po/cs/kmail-refresh-settings.po kmail-19.12.3/po/cs/kmail-refresh-settings.po
--- kmail-19.04.3/po/cs/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/cs/kmail-refresh-settings.po	2020-03-03 00:33:56.000000000 +0000
@@ -0,0 +1,103 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+# Vit Pelcak <vit@pelcak.org>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-22 09:03+0200\n"
+"Last-Translator: Vit Pelcak <vit@pelcak.org>\n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 19.04.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Vít Pelčák"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "vit@pelcak.org"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr ""
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Varování"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Dokončit"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Vyčistit"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr ""
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr ""
diff -Nru kmail-19.04.3/po/cs/ktnef.po kmail-19.12.3/po/cs/ktnef.po
--- kmail-19.04.3/po/cs/ktnef.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/cs/ktnef.po	2020-03-03 00:33:56.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2017-09-11 14:05+0100\n"
 "Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
diff -Nru kmail-19.04.3/po/da/akonadi_archivemail_agent.po kmail-19.12.3/po/da/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/da/akonadi_archivemail_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/da/akonadi_archivemail_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2016-05-28 16:21+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -178,12 +178,12 @@
 "Kan ikke tilføje endnu et arkiv for denne mappe. Ændr i stedet det "
 "eksisterende arkiv."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Mappen findes ikke. Kontrollér indstillinger. Arkiv udsat."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Start arkivering af %1"
diff -Nru kmail-19.04.3/po/da/akonadi_followupreminder_agent.po kmail-19.12.3/po/da/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/da/akonadi_followupreminder_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/da/akonadi_followupreminder_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2016-08-07 15:04+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -17,87 +17,87 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agent til opfølgningspåmindelse"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, fuzzy, kde-format
 #| msgid "Follow Up Reminder Agent"
 msgid "Follow Up Reminder"
 msgstr "Agent til opfølgningspåmindelse"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, fuzzy, kde-format
 #| msgid "Copyright (C) 2014-2016 Laurent Montel"
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Ophavsret (C) 2014-2016 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Vedligeholder"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Martin Schlander"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "mschlander@opensuse.org"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Til"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Emne"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Deadline"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Svar"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Modtaget"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "I venteposition"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Vis besked"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Slet"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, fuzzy, kde-format
 #| msgid "Do you want to remove selected item?"
 msgid "Do you want to remove this selected item?"
@@ -105,12 +105,12 @@
 msgstr[0] "Vil du fjerne det valgte element?"
 msgstr[1] "Vil du fjerne det valgte element?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Svar fra %1 modtaget"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Du venter stadig på svar vedrørende denne mail:"
diff -Nru kmail-19.04.3/po/da/akonadi_mailfilter_agent.po kmail-19.12.3/po/da/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/da/akonadi_mailfilter_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/da/akonadi_mailfilter_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2015-12-08 19:05+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -22,17 +22,17 @@
 msgid "Filter Log Viewer"
 msgstr "Filterlogviser"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Log filteraktiviteter"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -41,23 +41,23 @@
 "Du kan slå logning af filteraktivititeter til og fra her. Naturligvis samles "
 "og vises log-data kun, hvis logning er slået til. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Logningsdetaljer"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Beskrivelse af log-mønster"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Evaluering af log-filter&regel"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -72,34 +72,34 @@
 "tilbagemelding om resultatet af evalueringen af alle regler i et enkelt "
 "filter."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Log filter&mønster-evaluering"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Log filterhandlinger"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Grænse for logstørrelse:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "ubegrænset"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -112,7 +112,7 @@
 "log-data. Hvis størrelsen på de indsamlede log-data overskrider denne "
 "grænse, kasseres de ældste data, indtil grænsen ikke længere overskrides."
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -121,63 +121,63 @@
 "Kunne ikke skrive filen %1:\n"
 "\"%2\" er den detaljerede fejlbeskrivelse."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-fejl"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerer brev %1 ud af %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Fejl ved udførsel af mailfilter-flytning"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Fejl ved udførsel af mailfilter-sletning"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Fejl ved udførsel af mailfilter-ændringer"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Evaluerer filterregler:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filterregler matchede.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Begynd filtrering ved brev \"%1\" fra \"%2\" \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrering af breve"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Mailfilterlog aktiveret"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Klar"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrerer om %1"
diff -Nru kmail-19.04.3/po/da/akonadi_sendlater_agent.po kmail-19.12.3/po/da/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/da/akonadi_sendlater_agent.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/da/akonadi_sendlater_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2016-08-07 15:06+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -60,57 +60,57 @@
 msgid "Your emails"
 msgstr "mschlander@opensuse.org"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Til"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Emne"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Send omkring"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Gentaget"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Brev-id"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Ingen breve venter..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Send nu"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Slet"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Ja"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nej"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected item? Do you want to continue?"
 #| msgid_plural ""
@@ -120,68 +120,68 @@
 msgstr[0] "Vil du slette det valgte element? Vil du fortsætte?"
 msgstr[1] "Vil du slette de valgte elementer? Vil du fortsætte?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Fjern elementer"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Vil du også fjerne breve?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Fjern breve"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Intet brev fundet."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Intet brev fundet."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Fejl under hentning af brev"
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Kan ikke hente brevet. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Vi kan ikke transportere"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Brevet er ikke et rigtigt brev"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Kan ikke sende brevet."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Brev afsendt"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Der opstod en fejl. Vil du sende det igen?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "En fejl opstod"
diff -Nru kmail-19.04.3/po/da/kmail.po kmail-19.12.3/po/da/kmail.po
--- kmail-19.04.3/po/da/kmail.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/da/kmail.po	2020-03-03 00:33:57.000000000 +0000
@@ -4,21 +4,21 @@
 # Copyright (C)
 #
 # Erik Kjær Pedersen <erik@binghamton.edu>, 1998, 2002, 2003, 2004, 2005, 2006, 2007.
-# Martin Schlander <mschlander@opensuse.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Martin Schlander <mschlander@opensuse.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020.
 # Jan Madsen <jan.madsen.pt@gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2018-01-10 19:51+0100\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2020-02-13 20:10+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #, kde-format
@@ -185,8 +185,8 @@
 msgstr "flere krypteringsnøgler pr. adresse"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -197,10 +197,9 @@
 msgstr "KDE's e-mail-klient"
 
 #: aboutdata.cpp:365
-#, fuzzy, kde-format
-#| msgid "Copyright © 1997–2016, KMail authors"
+#, kde-format
 msgid "Copyright © 1997–2019, KMail authors"
-msgstr "Ophavsret © 1997–2016, KMail-udviklerne"
+msgstr "Ophavsret © 1997–2019, KMail-udviklerne"
 
 #: collectionpage/collectionmailinglistpage.cpp:51
 #, kde-format
@@ -293,27 +292,27 @@
 "KMail kunne ikke fuldt ud detektere en mailingliste i denne mappe. Udfyld "
 "adresserne manuelt."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvote"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Brug:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% fuld"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 af %2 bruges"
@@ -336,7 +335,7 @@
 "mappe.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Skabeloner"
@@ -347,106 +346,106 @@
 msgstr "&Brug tilpassede brevskabeloner i denne mappe"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopiér globale skabeloner"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vis"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Brug selvvalgte &ikoner"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normale:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Ulæste:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Vis afsender-/modtagerkolonne i brevlisten"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Vis kolonne:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Standard"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Afsender"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Modtager"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Brevoversigt"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Brug standardsamling"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Samling"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Brug standardtema"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Standardformat til breve"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Foretræk HTML frem for tekst"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Foretræk tekst frem for HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Brug globale indstillinger"
@@ -456,102 +455,105 @@
 msgid "Retrieval Options"
 msgstr "Indstilling af hentning"
 
-#: configuredialog/configureaccountpage.cpp:68
-#, fuzzy, kde-format
-#| msgid "&Identity"
+#: configuredialog/configureaccountpage.cpp:69
+#, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
-msgstr "&Identitet"
+msgstr "Identiteter"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Modtagelse"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Afsendelse"
 
-#: configuredialog/configureaccountpage.cpp:87
-#, fuzzy, kde-format
-#| msgid "IMAP server"
+#: configuredialog/configureaccountpage.cpp:88
+#, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
-msgstr "IMAP-server"
+msgstr "LDAP-server:"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Udgående konti (tilføj mindst én):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Almindelige tilvalg"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Bekræft &før afsendelse"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Udfør stavekontrol før afsendelse"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Aldrig automatisk"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Ved manuelle tjek af e-mail"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Ved alle tjek af e-mail"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Send nu"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Send senere"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Send &breve i udbakken:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Stan&dardmetode for afsendelse:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Aktivér fortryd send"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Tilføj e-mail-konto..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Brugervalgt konto..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -560,30 +562,30 @@
 "Kunne ikke starte kontoguiden. Sørg for at du har AccountWizard korrekt "
 "installeret."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Kan ikke starte kontoguiden"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Medtag i manuelt tjek af e-mail"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Skift til offline ved nedlukning af KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Tjek e-mail ved opstart"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -641,7 +643,7 @@
 msgid "Fixed Width Font"
 msgstr "Fastbredde-skrifttype"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Brevskriver"
@@ -947,61 +949,61 @@
 msgstr ""
 "Vi kan ikke oprette et mærke. Der findes allerede et mærke med samme navn."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Generelt"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardskabeloner"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Brugerdefinerede skabeloner"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Emne"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Tegnsæt"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Headers"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Bilag"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autokorrektur"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Tilpas billeder automatisk"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signatur"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1010,12 +1012,12 @@
 "Indsæt automatisk den konfigurerede signatur\n"
 "når du begynder at skrive et brev"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Indsæt signaturen over evt. citeret tekst"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1024,18 +1026,18 @@
 "Indsæt RFC-overholdende signaturseparator\n"
 "(to bindestreger og et mellem på en linje før signaturen"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Citér ikke nogen eksisterende signatur ved svar"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1046,7 +1048,7 @@
 "for hele brevet), hvis\n"
 "der er markeret tekst i brevvinduet når du svarer."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1057,17 +1059,17 @@
 "selv når linjen blev oprettet ved at tilføje et ekstra linjeskift ifm.\n"
 "ordombrydning af teksten."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Aktivér automatisk ordombrydning ved den angivne bredde"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Angiv tekstbredde til automatisk ordombrydning"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1078,7 +1080,7 @@
 "i, når du svarer eller videresender.\n"
 "Hvis dette er afmarkeret, vil svaret være i klartekst som standard."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1089,34 +1091,34 @@
 "Fed, kursiv og understreget tekst, lister og eksterne referencer er "
 "understøttet."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Indlejret"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Som bilag"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Sæt standardformat på videresendte breve"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Standardtype af videresendelse:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Modtagere"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1127,17 +1129,17 @@
 "Du kan vælge dette pr. brev ved brug af \"Tilvalg - Bed om bekendtgørelse af "
 "dispositon\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Advar hvis for mange modtagere er angivet"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Angiv det maksimale antal modtagere af denne advarsel"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1154,7 +1156,7 @@
 "undgå at sende et brev til for mange mennesker ved et uheld. Bemærk dog\n"
 " at den ikke tager højde for distributionslister eller mailinglister."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1163,18 +1165,18 @@
 "Husk nylige adresser som er blevet angivet,\n"
 "og tilbyd dem som modtagerfuldførelse"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Gem ikke"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Maks. antal nylige adresser der huskes:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1183,24 +1185,23 @@
 "Det maksimale antal nyligt angivne adresser som skal\n"
 "huskes til fuldførelse"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Indstil fuldførelse..."
 
-#: configuredialog/configurecomposerpage.cpp:445
-#, fuzzy, kde-format
-#| msgid "No autosave"
+#: configuredialog/configurecomposerpage.cpp:447
+#, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
-msgstr "Gem ikke automatisk"
+msgstr "Autogemning"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Gem ikke automatisk"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1208,18 +1209,18 @@
 msgstr[0] " minut"
 msgstr[1] " minutter"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Gem automatisk brevet med det angivne interval"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Emnepræfikser for sv&ar"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1228,59 +1229,59 @@
 "Genkend en vilkårlig sekvens af følgende præfikser\n"
 "(indgange er ikke-versalfølsomme regulære udtryk):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Tilføj..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Fjern"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Æ&ndr..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Indtast nyt svarpræfiks:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "&Videresend emnepræfikser"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Tilføj..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Fjern"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Ændr..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Indtast nyt videresend-præfiks:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1290,89 +1291,89 @@
 "finde et tegnsæt, der indeholder alle de nødvendige tegn."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Æ&ndr..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Angiv tegnsæt:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Behold (så vidt muligt) originalt tegnsæt, når der svares eller videresendes"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Dette tegnsæt er ikke understøttet."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Brug tilpasset brev-id-endelse:"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Tilpasset brev-&id-endelse:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Angiv brugervalgte mime-header-felter:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Navn"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Værdi"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "N&y"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Navn:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Værdi:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "Ugyldig dato"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-kompatibel navngivning af bilag"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1381,38 +1382,38 @@
 "Slå dette til, for at få Outlook(tm) til at forstå bilagsnavne, der "
 "indeholder ikke-engelske tegn"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Aktivér detektion af manglende bilag"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Genkend hvert af følgende nøgleord som 'Jeg vil vedlægge en fil':"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Indtast nyt nøgleord:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Maksimal størrelse på bilag:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Ingen grænse"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1499,13 +1500,13 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer Plugins"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Plugins til brevskriver"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
 msgid "Misc"
-msgstr ""
+msgstr "Diverse"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:279
 #, kde-format
@@ -1613,7 +1614,7 @@
 msgid "Archive Folder"
 msgstr "Arkivmappe"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1679,19 +1680,19 @@
 msgid "Notification"
 msgstr "Bekendtgørelse"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 bilag (%2)"
 msgstr[1] "%1 bilag (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Skjul bilagsliste"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Vis bilagsliste"
@@ -1708,331 +1709,331 @@
 msgid "Encoding"
 msgstr "Tegnsæt"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Vælg den ordbog der skal bruges til stavekontrol af dette brev"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Vælg den mappe til sendte e-mails hvor en kopi af dette brev skal gemmes"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Vælg den udgående konto der skal bruges til afsendelse af brevet"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Angiv \"Fra:\"-e-mailadressen for dette brev"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Angiv et emne for dette brev"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitet:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Ordbog:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "&Mappe til afsendte e-mails:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Mail-overførsel:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Fra:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Emne:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Send e-mail"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Send e-mail via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Send"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "S&end senere"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "S&end senere via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Sæt i kø"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Gem som &kladde"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Gem e-mail i kladde-mappen"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Gem som &skabelon"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Gem e-mail i skabelon-mappen"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Gem som &fil"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Gem e-mail som klartekst- eller HTML-fil"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Indsæt tekstfil..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Indsæt nylig tekstfil"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adressebog"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Åbn adressebog"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Ny brevskriver"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Vælg &modtagere..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Gem &distributionsliste..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Indsæt som &bilag"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Rene mellemrum"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Brug fast&bredde-skrifttype"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Haster"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Bed om bekendtgørelse af dispositon"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Bed om bekendtgørelse af dispositon"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Tekstombrydning"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Stumper"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatisk stavekontrol"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Redigering af formateret tekst"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Formateret tekst"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Slå redigeringstilstand med formateret tekst til/fra"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Alle felter"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitet"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Ordbog"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Mappe til afsendte e-mails"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Mail-overførsel"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Fra"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Emne"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Vedlæg s&ignatur"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Læg signatur &foran"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Indsæt signat&ur ved markørposition"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Stavekontrol..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Stavekontrol"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Kryptér brev"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Kryptér"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Signér brev"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signér"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Kryptografisk brevformat"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Vælg kryptografisk format for dette brev"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Opret opfølgningspåmindelse..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Indstil KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2041,53 +2042,53 @@
 "<qt>Dette vil skjule menulinjen helt. Du kan få den vist igen ved at trykke "
 "%1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Skjul menulinjen"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linje: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolonne: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Stavekontrol: Til"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Stavekontrol: Fra"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Gem i&gen som skabelon"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Gem som kladde"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2096,7 +2097,7 @@
 "Gem dette brev i skabelonmappen. Det kan derefter bruges på et senere "
 "tidspunkt."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2105,83 +2106,83 @@
 "Gem brevet i mappen Kladder. Det kan derefter redigeres og sendes på et "
 "senere tidspunkt."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Vil du gemme det til senere, eller kassere det?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Luk brevskriver"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Automatisk gemning af brev mislykkedes"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Afsendelse af brev mislykkedes"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Indsæt fil"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Tilføj som &indlejret billede"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Tilføj som &bilag"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Navn på bilag:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "Ugyldig dato"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Føj URL til brevet"
 msgstr[1] "Føj URL'er til brevet"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Tilføj fil som &bilag"
 msgstr[1] "Tilføj filer som &bilag"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Indsæt tekst fra udklipsholderen som bilag"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "unavngiven"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2194,12 +2195,12 @@
 "skal bruges til dette.</p><p>Vælg nøglerne, der skal bruges i "
 "identitetsindstillingen.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Ikke-angivet krypteringsnøgle"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2210,12 +2211,12 @@
 "signeringsnøgle (OpenPGP eller S/MIME), der skal bruges.</p><p>Vælg den "
 "nøgle, der skal bruges i identitetsindstillingen.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Ikke-angivet signeringsnøgle"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2226,7 +2227,7 @@
 "mailadresse for alle identiteter, så du ikke behøver, at angive den for "
 "hvert brev."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2235,59 +2236,59 @@
 "Du skal angive mindst én modtager, enten i feltet \"Til:\" eller som CC "
 "eller BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Til:-feltet er tomt. Vil du sende brevet alligevel?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Intet \"Til:\" angivet"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du angav ikke et emne. Vil du sende brevet alligevel?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Intet emne angivet"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "S&end som det er"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Angiv emnet"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Du skal angive mindst én modtager for at kunne kryptere en kladde."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Ved at sende e-mail..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Send bekræftelse"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Send nu"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2296,22 +2297,22 @@
 "Du prøver at sende e-mailen til mere end %1 modtagere. Vil du sende brevet "
 "alligevel?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "For mange modtagere"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Send &som det er"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Redigér modtagere"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2320,43 +2321,43 @@
 "At slå HTML-tilstand fra vil få teksten til at miste formatering. Er du "
 "sikker?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Miste formatering?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Miste formatering"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Tilføj klartekst med opmærkning"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2364,7 +2365,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2442,27 +2443,27 @@
 msgid "External editor was started."
 msgstr "Ekstern editor blev startet."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Arkivmappe ikke defineret. Kontrollér indstillinger for kontoen %1"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Arkivmappe ikke defineret. Kontrollér indstillinger for kontoen %1"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2490,11 +2491,6 @@
 msgid "Message will not be encrypted"
 msgstr "Brevet bliver ikke krypteret"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Tekststumper"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2539,27 +2535,27 @@
 msgid "Cannot move messages."
 msgstr "Kan ikke flytte breve."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Kunne ikke hente mappe. Rapporteret fejl: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Ingen mappe returneret."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Kunne ikke hente overmappe. Rapporteret fejl: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Kunne ikke returnere liste over mapper."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Brevene er arkiveret"
@@ -2600,49 +2596,49 @@
 msgid "&Existing identities:"
 msgstr "&Eksisterende identiteter:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Fejl under forsøg på at omdøbe mappen %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Fejl ved nøglegenerering"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Ingen nøgle"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Generér et nyt nøglepar"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Genererer nyt nøglepar..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Redigér identitet"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Generelt"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Dit navn:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2654,12 +2650,12 @@
 "efterlader dette blankt, vises dit rigtige navn ikke, men kun e-mail-"
 "adressen.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&sation:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2670,12 +2666,12 @@
 "hvis du vil have, at den skal vises i brevhovedet i den e-mail, der sendes "
 "ud.</p><p>Det er sikkert (og normalt), at efterlade dette tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-mailadresse:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2691,12 +2687,12 @@
 "blankt, eller skriver det forkert, vil folk have besvær med at svare dig.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "E-mail-a&liasser:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2713,12 +2709,12 @@
 "th><td>fornavn@eksempel.org<br>efternavn@eksempel.org</td></tr></"
 "table><p>Angiv én aliasadresse pr. linje.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kryptografi"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2739,12 +2735,12 @@
 "Normale e-mail-funktioner påvirkes ikke.</p> <p>Du kan lære mere om nøgler "
 "på <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-signeringsnøgle:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2768,12 +2764,12 @@
 "Normale e-mail-funktioner påvirkes ikke.</p><p>Du kan lære mere om nøgler på "
 "<a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-krypteringsnøgle:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2786,12 +2782,12 @@
 "KMail ikke signere breve digitalt med S/MIME. Normale e-mail-funktioner "
 "påvirkes ikke.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-signeringscertifikater:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2806,39 +2802,39 @@
 "udgående breve til dig medS/MIME. Normale e-mail-funktioner påvirkes ikke.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME krypteringscertifikat:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Foretrukket format:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Signér breve automatisk"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Kryptér breve automatisk når det er muligt"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Svaradresse:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2856,12 +2852,12 @@
 "sendes til en gruppeadresse.</p><p>Efterlad dette felt blankt, hvis du er i "
 "tvivl.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&CC-adresser:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2878,12 +2874,12 @@
 "adskille listen af CC-modtagere.</p><p>Lad dette felt være tomt, hvis du er "
 "i tvivl.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC-adresser:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2900,57 +2896,57 @@
 "angive mere end en adresse bruges kommaer til at adskille listen af BCC-"
 "modtagere.</p><p>Efterlad dette felt blankt, hvis du er i tvivl.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Ordbog:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Mappen \"Sendte e-mails\":"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Kladdemappe:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Skabelonmappe:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Udgående konto:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Føj mit vCard til brevet"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Opret..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Sprog til autokorrektur:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Gendan standard domænenavn"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Stan&dard-domæne:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2959,33 +2955,33 @@
 "<qt><p>Standard-domænet bruges til at komplettere e-mailadresser, der kun "
 "består af brugerens navn.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Brug tilpassede brevskabeloner til denne identitet"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signatur"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Billede"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Ugyldig e-mailadresse \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Ugyldig e-mailadresse"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2998,7 +2994,7 @@
 "Dette kan resultere i advarselsbeskeder på den modtagersiden, under forsøg "
 "på at verificere signaturer, der lavet med denne konfiguration."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3007,7 +3003,7 @@
 "En af de indstillede OpenPGP krypteringsnøgler indeholder ikke noget bruger-"
 "ID med den indstillede e-mailadresse for denne identitet (%1)"
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3020,7 +3016,7 @@
 "Dette kan resultere i advarselsbeskeder på den modtagende side, når det "
 "forsøges at verificere signaturer lavet med denne indstilling."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3029,22 +3025,22 @@
 "En af de indstillede S/MIME krypteringsnøgler indeholder ikke noget bruger-"
 "ID med den indstillede e-mailadresse for denne identitet (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-mailadresse ikke fundet i nøgle/certifikater"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Signaturfilen er ikke gyldig"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Redigér identitet \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3053,7 +3049,7 @@
 "Nogle brugervalgte mapper for identiteten findes ikke (mere), derfor vil "
 "standardmapperne blive brugt."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Redigér..."
@@ -3084,6 +3080,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Vi kan ikke slette vCard-filen."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Vil du virkelig annullere?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Bekræftelse"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3251,7 +3259,7 @@
 "Der findes eksempler på <a href=\"http://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Billede"
@@ -3284,7 +3292,7 @@
 msgstr[0] "Distributionslisten \"%2 er tom, den kan ikke bruges."
 msgstr[1] "Distributionslisterne %2 er tomme, de kan ikke bruges."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Føj til adressebog"
@@ -3294,22 +3302,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakten blev oprettet"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kontakten kan ikke lagres: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Kunne ikke lagre kontakt"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Vil du knytte denne mappe til \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Tilknyt mappe"
@@ -3519,14 +3527,14 @@
 msgstr "M&appe"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Anvend filtre på mappe"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3552,7 +3560,7 @@
 msgstr "&Videresend"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "An&vend filter"
@@ -3577,7 +3585,7 @@
 msgstr "&Hjælp"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Hovedværktøjslinje"
@@ -3630,12 +3638,12 @@
 msgid "The file does not contain a message."
 msgstr "Filen indeholder ikke et brev."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Filen indeholder flere breve. Kun det første brev bliver vist."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3644,32 +3652,32 @@
 "Vil du videresende de valgte breve som bilag i ét brev (som et MIME-"
 "sammendrag) eller som enkeltvise breve?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Send som sammendrag"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Send enkeltvis"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrerer af breve"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerer brev %1 ud af %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Flytning af breve"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Sletning af breve"
@@ -3698,29 +3706,28 @@
 msgid "Text Direction Toolbar"
 msgstr "Tekstretning-værktøjslinje"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail er sat til at være offline. Alle netværksjob er hvilende."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
-#, fuzzy, kde-format
-#| msgid "Sendmail"
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
+#, kde-format
 msgid "Send Email"
-msgstr "Sendmail"
+msgstr "Send e-mail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Ved at sende e-mail..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail er sat til at være online. Alle netværksjob genoptages."
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3729,37 +3736,37 @@
 "KMail er sat til at være online. Alle netværksjob genoptages når en "
 "netværksforbindelse detekteres"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail er i offline-tilstand. Hvordan vil du fortsætte?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Arbejd online"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Arbejd offline"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Netværksforbindelse detekteret. Alle netværksjob genoptaget"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Ingen netværksforbindelse detekteret. Alle netværksjob suspenderes"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3768,12 +3775,12 @@
 "Kunne ikke åbne autogem-filen i %1.\n"
 "Årsag: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Åbning af autogem-fil mislykkedes"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3781,7 +3788,7 @@
 msgstr[0] "Denne identitet er ændret til at bruge standardoverførsel:"
 msgstr[1] "Disse %1 identiteter er ændret til at bruge standardoverførsel:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3790,43 +3797,46 @@
 msgstr[1] ""
 "Disse %1 identiteter er ændrede til at bruge den ændrede overførsel:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Sender breve"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Initierer afsendelsesprocessen..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Ressourcen %1 er defekt."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Arkivmail-agenten blev ikke registreret."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Send senere-agenten er ikke registreret."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Agent til opfølgningspåmindelse blev ikke registreret."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3835,12 +3845,12 @@
 "Kunne ikke starte certifikathåndtering. Sørg for at du har Kleopatra korrekt "
 "installeret."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-fejl"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3849,25 +3859,29 @@
 "Kunne ikke starte importguiden. Sørg for at du har ImportWizard korrekt "
 "installeret."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Kan ikke starte importguiden"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Kunne ikke starte programmet \"PIM Setting Exporter\". Tjek din installation."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Kunne ikke starte programmet \"PIM Setting Exporter\""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3876,69 +3890,69 @@
 "Kunne ikke starte importguiden. Sørg for at du har ImportWizard korrekt "
 "installeret."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Kan ikke starte importguiden"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Et andet e-mail-program blev fundet på systemet. Vil du importere data fra "
 "det?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Kunne ikke starte importguiden. Tjek din installation."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Intet emne"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(ingen skabeloner)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Denne mappe har ingen udløbsegenskaber sat"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Vil du virkelig lade mappen <b>%1</b> udløbe?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Lad mappe udløbe"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Udløb"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Tøm papirkurv"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Flyt til papirkurv"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Vil du virkelig tømme papirkurvsmappen?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3947,27 +3961,27 @@
 "<qt>Vil du virkelig flytte alle breve fra mappen <b>%1</b> til papirkurven?</"
 "qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Flyttede alle breve til papirkurven"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Vil du virkelig lade alle gamle breve udløbe?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Vil du lade gamle breve udløbe?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Udløb"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3978,17 +3992,17 @@
 "\"spam\" og kan forøge sandsynligheden for, at dit system vil blive "
 "kompromitteret af andre nuværende og fremtidige sikkerhedsudnyttelser."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Sikkerhedsadvarsel"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Indlæs eksterne referencer"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4003,535 +4017,535 @@
 "<qt>Ønsker du at slette de %1 valgte breve?<br />Når først de er slettede, "
 "kan de ikke genoprettes.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Slet breve"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Slet brev"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Flytter breve..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Sletter breve..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Sletning af breve gennemført."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Flytning af breve gennemført."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Sletning af breve fejlede."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Sletning af breve annulleret."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Flytning af breve fejlede."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Flytning af breve annulleret."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Flyt breve til mappen"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopierer breve..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Kopiering af breve gennemført."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Kopiering af breve mislykkedes."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopiering af breve annulleret."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopiér breve til mappen"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Flytter breve til papirkurv..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Flytter breve til papirkurv..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Flytning af breve til papirkurv gennemført."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Flytning af breve til papirkurv gennemført."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Flytning af breve til papirkurv mislykkedes."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Flytning af breve til papirkurv mislykkedes."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Flytning af breve til papirkurv annulleret."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Flytning af breve til papirkurv annulleret."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Gå til mappen"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Gem &som..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Lad alle mapper &udløbe"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Tjek e-&mail"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Tjek e-mail i"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Tjek e-mail"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Send breve i &køen"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Onlinestatus (ukendt)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Send breve i køen via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Certifikat-håndtering"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importér breve..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Fejlsøg Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filter&logviser..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importér fra en anden e-mail-klient..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Redigér \"Ikke på kontoret\"-svar..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Indstil automatisk arkivering..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Udsatte breve..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Breve med opfølgningspåmindelse..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Slet"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "&Flyt tråd til papirkurv"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Flyt tråd til papirkurv"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Slet t&råd"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Find breve..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Markér &alle breve"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Håndtering af mailinglister..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Tilknyt genvej..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Udløbsindstillinger"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arkivér mappe..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Indlæs e&ksterne referencer"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopiér brev til..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Flyt brev til..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nyt brev..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nyt"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Brev fra s&kabelon"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nyt brev til &mailingliste..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Opret filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filter på &Emne..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filter på &Fra..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filter på &Til..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filter på &Cc..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Markér &tråd"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Markér tråd som &læst"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Markér alle breve i den valgte tråd som læst"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Markér tråd som &ulæst"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Markér alle breve i den valgte tråd som ulæste"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Markér tråd som &vigtig"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Fjern trådmarkeringen &Vigtig"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Markér tråd som h&andlingspunkt"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Fjern markering af tråd som h&andlingspunkt"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Overvåg tråd"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorér tråd"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Gem bilag..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Kopiér dekrypteret til..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "An&vend alle filtre"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Fold tråd/gruppe ud"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Fold den aktuelle tråd eller gruppe ud"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "F&old tråd/gruppe sammen"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Fold denne tråd eller gruppe sammen"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Fol&d alle tråde ud"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Fold alle tråde i denne mappe ud"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "F&old alle tråde sammen"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Fold alle tråde i denne mappe sammen"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Vis brev"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Næste brev"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Gå til næste brev"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Næste &ulæste brev"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Næste"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Gå til næste ulæste brev"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Forrige brev"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Gå til forrige brev"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Forrige ulæste &brev"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Forrige"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Gå til forrige ulæste brev"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Næste &mappe med ulæste"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Gå til næste mappe med ulæste breve"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Forrige m&appe med ulæste"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Gå til forrige mappe med ulæste breve"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Næste ulæste &tekst"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Gå til næste ulæste tekst"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4540,226 +4554,228 @@
 "Rul ned i dette brev. Hvis du er ved slutningen af dette brev, så gå til det "
 "næste ulæste brev."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Indstil &filtre..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Håndtér Sie&ve-scripts..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Tilføj konto..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introduktion til KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Vis KMails velkomstside"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Indstil &bekendtgørelser..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Indstil KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Udløb..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Tilføj favoritmappe..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Abonnement på serversiden..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Anvend alle filtre"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importér/eksportér KMail-data..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Ny adressebogskontakt..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopiér brev til mappen"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Gå til mappen..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Afbryd nuværende operation"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Fokus på næste mappe"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Fokus på forrige mappe"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Vælg mappe med fokus"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Fokus på første mappe"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Fokus på sidste mappe"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Fokus på næste brev"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Fokus på forrige brev"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Markér første brev"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Markér sidste brev"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Vælg brev med fokus"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Giv hurtigsøgning fokus"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Udvid markering til forrige brev"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Udvid markering til næste brev"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Flyt brev til mappen"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Brug mindre båndbredde"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Markér alle breve som læste i denne mappe og alle dens undermapper"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Fjern dubletter i denne mappe og alle dens undermapper"
 
-#: kmmainwidget.cpp:3579
-#, fuzzy, kde-format
-#| msgid "&Settings"
+#: kmmainwidget.cpp:3586
+#, kde-format
 msgid "Account &Settings"
-msgstr "&Indstillinger"
+msgstr "Konto&indstillinger"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Genstart konto"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Tilføj favoritmappe"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Tøm papirkurv"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Flyt alle breve til papirkurv"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Slet søgning"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Redigér søgning..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "Fo&rtryd"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "Fo&rtryd: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
-#, fuzzy, kde-format
-#| msgctxt "Show shortcut for focus quick search. Don't change it"
-#| msgid "Search...<%1>"
+#: kmmainwidget.cpp:4695
+#, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Søg...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4770,12 +4786,12 @@
 "sandsynligheden for, at dit system vil blive kompromitteret af andre "
 "nuværende og fremtidige sikkerhedsudnyttelser."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Brug HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4785,119 +4801,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
-#, fuzzy, kde-format
-#| msgid "C&ancel"
+#: kmmainwidget.cpp:4897
+#, kde-format
 msgid "Cancel"
-msgstr "&Annullér"
+msgstr "Annullér"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Starter..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Flyt til papirkurv"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Flyt alle breve til papirkurv"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Kan ikke kopiere element. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nyt brev til..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Svar til..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Videresend til..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Føj til eksisterende kontakt"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Åbn i adressebog"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Bogmærk dette link"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Redigér kontakt..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Gem link som..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Find i brevet..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Gem billede på disken..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Vis HTML-format"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Vis HTML-format når e-mails kommer fra denne kontakt"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Indlæs eksterne referencer når e-mails kommer fra denne kontakt"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Del billede..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4906,62 +4921,62 @@
 "KMail er nu baseret på Akonadi - systemet til håndtering af personlig "
 "information. Dette medfører mange ændringer på alle niveauer."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push e-mail (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Forbedret søgning"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Understøttelse af at føje noter (annotationer) til e-mails"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Mindre frysning af brugerfladen, tjek af e-mail sker i baggrunden"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Plugin-understøttelse"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Ny HTML-rendering (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Tilføjede tjek af phishing-URL"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "KDE's e-mail-klient"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Henter mappeindhold"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Vent venligst . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Offline"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4970,7 +4985,7 @@
 "KMail er aktuelt i offline-tilstand. Klik <a href=\"kmail:goOnline\">her</a> "
 "for at gå online . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4979,22 +4994,22 @@
 "Kontoen er aktuelt i offline-tilstand. Klik <a href=\"kmail:goOnline\">her</"
 "a> for at gå online . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontakten blev ændret"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nye breve i"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Der er ingen ulæste breve"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5017,8 +5032,8 @@
 msgstr "Ophavsret © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5111,17 +5126,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Vælg de pluginoversigter der skal vises på oversigtssiden."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontact-oversigt"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontact-oversigt"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5167,28 +5182,27 @@
 msgid "All"
 msgstr "Alle"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact-oversigt"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontacts oversigtsvisning"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
-#, fuzzy, kde-format
-#| msgid "(c) 2003-2017 The Kontact developers"
+#: kontactplugin/summary/summaryview_plugin.cpp:122
+#, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
-msgstr "(c) 2003-2017 Kontact-udviklerne"
+msgstr "(c) 2003-2019 Kontact-udviklerne"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5215,7 +5229,7 @@
 msgid "&Reply"
 msgstr "Sva&r"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "Sva&r..."
@@ -5225,12 +5239,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Svar &forfatteren..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Svar til &alle..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Svar til mailing&liste..."
@@ -5261,7 +5275,7 @@
 msgid "&Edit As New"
 msgstr "&Redigér brev"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5454,114 +5468,114 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Søgning mislykkedes, der blev fundet nogle fejl: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Find breve"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Søg"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Indlejret..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Som &bilag..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Gem bilag..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Ryd udvalg"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Gå til oprindelig mappe"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 match"
 msgstr[1] "%1 match"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Sidste søgning"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Du valgte ikke en gyldig mappe."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Du glemte at vælge samlinger."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Du glemte at definere betingelse."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Alle valgte mapper er tomme eller ikke indekseret."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Du glemte at tilføje betingelser."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 "Betingelsen indeholder kan ikke bruges med et mindre antal tegn end fire."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Søger..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Kan ikke hente søgeresultat. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Søgning mislykkedes."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Søgning gennemført."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Søgning stoppet."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5571,21 +5585,21 @@
 "Der opstod et problem under omdøbning af din søgemappe. Ofte skyldes dette "
 "at en anden søgemappe med samme navn allerede findes. Fejl returneret \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Kopiér brev"
 msgstr[1] "Kopiér %1 breve"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Klip brev"
 msgstr[1] "Klip %1 breve"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Tjekker status på indeks..."
@@ -5719,7 +5733,7 @@
 msgstr "Angiver om det er første gang programmet kører (kun til intern brug)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5727,7 +5741,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5736,26 +5750,26 @@
 "Denne værdi bruges til at afgøre om introduktionen til KMail skal vises."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Vis linjeredigering for hurtigsøgning i mappe"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Videresend indlejret som standard."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Advar hvis modtagerantallet er flere end:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5766,19 +5780,19 @@
 "bede om bekræftelse før afsendelse af e-mailen. Advarslen kan slås fra."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Udfør stavekontrol før afsendelse"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Bed automatisk om &brevdispositionspåmindelser"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5795,13 +5809,13 @@
 "p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Auto-gem interval:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5813,152 +5827,152 @@
 "deaktivere autogemning ved at sætte det til værdien 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "Vis panel til håndtering og indsættelse af tekststumper i brevskriveren."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Når markeret, vil sendte breve blive gemt i krypteret form"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "En liste over alle nyligt anvendte URL'er"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "En liste over alle nyligt anvendte tegnsæt"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Vis kryptoetiket-indikator"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Validér standard genvej til afsendelse"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Størrelsen på identitetsdialogen (kun til intern brug)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Bredden på søgevinduet (kun til intern brug)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Højden på søgevinduet (kun til intern brug)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Bredden på dialogen Indstil KMail (kun til intern brug)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Højden på dialogen Indstil KMail (kun til intern brug)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Brevforhåndsvisningsrude"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Vis ikke en rude med forhåndsvisning af breve"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Vis rude med forhåndsvisning af breve under brevlisten"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Vis en rude med forhåndsvisning af breve ved siden af brevlisten"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Mappeliste"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lang mappeliste"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kort mappeliste"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Brevskabelon for nyt brev"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Brevskabelon for svar"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Brevskabelon for svar til alle"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Brevskabelon for videresend"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Tilføj tegn"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Angiver den politik der bruges ved visning af politik"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5967,7 +5981,7 @@
 "Angiver bredden af samlingsfeltet i søgevindue-dialogen (kun til intern brug)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5976,7 +5990,7 @@
 "Angiver bredden af emnefeltet i søgevindue-dialogen (kun til intern brug)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5985,7 +5999,7 @@
 "Angiver bredden af afsenderfeltet i søgevindue-dialogen (kun til intern brug)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5994,7 +6008,7 @@
 "Angiver bredden af modtagerfeltet i søgevindue-dialogen (kun til intern brug)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6003,7 +6017,7 @@
 "Angiver bredden af datofeltet i søgevindue-dialogen (kun til intern brug)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6270,10 +6284,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6465,8 +6516,7 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, selectMultipleFolders)
 #: ui/searchwindow.ui:60
-#, fuzzy, kde-format
-#| msgid "Select folders..."
+#, kde-format
 msgid "Select Folders..."
 msgstr "Vælg mapper..."
 
@@ -6639,10 +6689,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Tjek e-mail i"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7097,10 +7146,9 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, warnGroupBox)
 #: ui/warningconfiguration.ui:59
-#, fuzzy, kde-format
-#| msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+#, kde-format
 msgid "Warn if certificates/ke&ys expire soon (configure thresholds below)"
-msgstr "Advar hvis certifikat/nøgler udløber snart (indstil grænse nedenfor)"
+msgstr "Advar hvis certifikat/nø&gler udløber snart (indstil grænse nedenfor)"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
 #: ui/warningconfiguration.ui:68
@@ -7230,8 +7278,7 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
 #: ui/warningconfiguration.ui:292
-#, fuzzy, kde-format
-#| msgid "For root certificates:"
+#, kde-format
 msgid "For &root certificates:"
 msgstr "Til rod-certifikater:"
 
@@ -7243,10 +7290,9 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #: ui/warningconfiguration.ui:318
-#, fuzzy, kde-format
-#| msgid "For end-user certificates/keys:"
+#, kde-format
 msgid "For end-user certificates/&keys:"
-msgstr "Til slutbruger-certifikater/-nøgler:"
+msgstr "Til slutbruger-certifikater/-&nøgler:"
 
 #. i18n: ectx: property (text), widget (QPushButton, gnupgButton)
 #: ui/warningconfiguration.ui:365
@@ -7260,6 +7306,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Genaktivér alle \"Spørg ikke igen\"-advarsler"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 sekunder"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Fortryd send"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7283,8 +7339,7 @@
 msgstr "Kan ikke flytte brev. %1"
 
 #: util.cpp:187
-#, fuzzy, kde-format
-#| msgid "Delete"
+#, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "Delete"
 msgstr "Slet"
@@ -7312,10 +7367,17 @@
 msgstr[1] "\"Ikke på kontoret\"-svar aktiveret på serverne"
 
 #: widgets/zoomlabelwidget.cpp:35
-#, fuzzy, kde-format
-#| msgid "Zoom"
+#, kde-format
 msgid "Zoom: %1%"
-msgstr "Zoom"
+msgstr "Zoom: %1%"
+
+#~ msgid "Text Snippets"
+#~ msgstr "Tekststumper"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Tjek e-mail i"
 
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Mappenavn og -størrelse når du er tæt på kvoten"
@@ -9995,12 +10057,6 @@
 #~ msgid "Add Group"
 #~ msgstr "Tilføj gruppe"
 
-#, fuzzy
-#~| msgid "Do you really want to remove this group and all its snippets?"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Vil du virkelig fjerne denne gruppe og alle dens stumper?"
-
 #~ msgid "&Apply"
 #~ msgstr "&Anvend"
 
@@ -11034,9 +11090,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Angiv om kontoen bruger standardidentiteten"
 
-#~ msgid "Identity account"
-#~ msgstr "Identitetskonto"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "RID-sti til den postkasse der skal overvåges for ændringer"
 
diff -Nru kmail-19.04.3/po/da/ktnef.po kmail-19.12.3/po/da/ktnef.po
--- kmail-19.04.3/po/da/ktnef.po	2019-07-09 00:20:18.000000000 +0000
+++ kmail-19.12.3/po/da/ktnef.po	2020-03-03 00:33:56.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2017-03-22 17:29+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
diff -Nru kmail-19.04.3/po/de/akonadi_archivemail_agent.po kmail-19.12.3/po/de/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/de/akonadi_archivemail_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/de/akonadi_archivemail_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: archivemailagent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-01-07 06:56+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -174,14 +174,14 @@
 "Ein zweites Archiv für diesen Ordner kann nicht hinzugefügt werden. "
 "Stattdessen wird das Archiv geändert."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "Der Ordner existiert nicht. Bitte überprüfen Sie die Einstellungen. Die "
 "Archivierung wurde zurückgestellt."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Archivierung von %1 wird gestartet"
diff -Nru kmail-19.04.3/po/de/akonadi_followupreminder_agent.po kmail-19.12.3/po/de/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/de/akonadi_followupreminder_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/de/akonadi_followupreminder_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2019-01-07 06:56+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -15,97 +15,97 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agent zur Erinnerung an Folgenachrichten"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Erinnerung an Folgenachrichten"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Betreuer"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Frederik Schwarzer"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "schwarzer@kde.org"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "An"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Betreff"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Termin"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Antwort"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Empfangen"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "In der Warteschleife"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Nachricht anzeigen"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Löschen"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Möchten Sie diesen ausgewählten Eintrag löschen?"
 msgstr[1] "Möchten Sie diese %1 ausgewählten Einträge löschen?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Antwort von %1 erhalten"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Sie warten immer noch auf eine Antwort auf diese E-Mail:"
diff -Nru kmail-19.04.3/po/de/akonadi_mailfilter_agent.po kmail-19.12.3/po/de/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/de/akonadi_mailfilter_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/de/akonadi_mailfilter_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: mailfilteragent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-10-24 06:44+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -21,17 +21,17 @@
 msgid "Filter Log Viewer"
 msgstr "Betrachter für Filter-Protokoll"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Freigeben ..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Filtervorgänge protokollieren"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -41,23 +41,23 @@
 "werden. Protokolle werden nur geschrieben und angezeigt, wenn diese "
 "Einstellung aktiviert ist."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Details zur Protokollierung"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Beschreibung der Protokollmuster"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Protokollierung der Filter&regeln"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -71,34 +71,34 @@
 "Filterregel ausführlich protokolliert; anderenfalls wird nur das Ergebnis "
 "der Anwendung aller Regeln eines Filters protokolliert."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Protokollierung der Filtermusterauswertung"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Maximale Protokollgröße:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " kB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "unbegrenzt"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -111,7 +111,7 @@
 "der Protokolldaten diese Grenze überschreitet, werden die ältesten Daten "
 "verworfen. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -120,63 +120,63 @@
 "Die Datei %1 kann nicht geschrieben werden:\n"
 "Die ausführliche Fehlerbeschreibung laut: „%2“."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-Fehler"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Nachricht %1 von %2 wird gefiltert."
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Fehler beim Anwenden des E-Mail-Filters „verschieben“"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Fehler beim Anwenden des E-Mail-Filters „löschen“"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Fehler beim Anwenden des E-Mail-Filters „modifizieren“"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Filterregeln werden geprüft:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filterregeln wurden angewandt.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Filterung beginnt bei Nachricht „%1“ von „%2“ um „%3“ :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Nachrichten werden gefiltert"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "E-Mail-Filter-Protokoll aktiviert"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Bereit"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "%1 wird gefiltert"
diff -Nru kmail-19.04.3/po/de/akonadi_sendlater_agent.po kmail-19.12.3/po/de/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/de/akonadi_sendlater_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/de/akonadi_sendlater_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2019-01-09 12:04+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -57,124 +57,124 @@
 msgid "Your emails"
 msgstr "lueck@hube-lueck.de"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "An"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Betreff"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Senden um"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Wiederholung"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Nachrichtenkennung"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Es stehen keine Nachrichten an ..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Sofort senden"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Löschen"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Ja"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nein"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Möchten Sie den ausgewählten Eintrag löschen?"
 msgstr[1] "Möchten Sie die ausgewählten Einträge löschen?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Einträge entfernen"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Möchten Sie die Nachrichten ebenfalls entfernen?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Nachrichten entfernen"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Es wurde keine Nachricht gefunden."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Es wurde keine Nachricht gefunden."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Fehler beim Abholen der Nachricht."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Die Nachricht kann nicht abgeholt werden. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Der Versandweg kann nicht erstellt werden"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Die Nachricht ist keine richtige E-Mail"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Die Nachricht kann nicht gesendet werden."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Nachricht wurde versendet"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Es ist ein Fehler aufgetreten. Möchten Sie es erneut versuchen?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Es wurde ein Fehler gefunden"
diff -Nru kmail-19.04.3/po/de/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/de/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/de/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/de/akonadi_unifiedmailbox_agent.po	2020-03-03 00:33:57.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-22 12:02+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Einheitliches Postfach %1 wird abgeglichen"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Einheitliches Postfach hinzufügen"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Name:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Symbol auswählen ..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Symbol:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Versendete Nachrichten"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Entwürfe"
diff -Nru kmail-19.04.3/po/de/docs/akonadi_archivemail_agent/index.docbook kmail-19.12.3/po/de/docs/akonadi_archivemail_agent/index.docbook
--- kmail-19.04.3/po/de/docs/akonadi_archivemail_agent/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/de/docs/akonadi_archivemail_agent/index.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -55,9 +55,9 @@
 >&FDLNotice;</legalnotice>
 
 <date
->2013-08-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.11</releaseinfo>
+>Anwendungen 19.12</releaseinfo>
 </articleinfo>
 
 <sect1 id="introduction">
@@ -73,10 +73,12 @@
 
 <!-- keep in sync with kmail/menus.docbook reader-tools-configure-automatic-archiving"-->
 <para
->Mit <guimenu
+>Mit <menuchoice
+><guimenu
 >Einstellungen</guimenu
 > <guimenuitem
 >Automatische Archivierung einrichten ...</guimenuitem
+></menuchoice
 > in &kmail; öffnen Sie einen Dialog, in dem Sie den Agenten zur Archivierung von Ordnern einrichten können. </para>
 
 <!-- keep in sync with kmail/using.docbook auto-archive -->
@@ -118,8 +120,8 @@
 >Archive_</userinput
 >, dem Pfad des ausgewählten Ordners in &kmail;s Ordnerliste, dem Datum im Format <userinput
 >Jahr-Monat-Tag</userinput
-> und der gewählten Dateiwerweiterung zusammengesetzt wie &eg; <filename
->Archive_Lokale Ordner_Posteingang_2013-09-03.tar.bz2</filename
+> und der gewählten Dateierweiterung zusammengesetzt wie &eg; <filename
+>Archive_Lokale Ordner_Posteingang_2019-09-03.tar.bz2</filename
 >. </para
 ></listitem>
 <listitem
@@ -174,6 +176,18 @@
 <para
 >Mit dem Ankreuzfeld links neben jedem Eintrag in der Liste aktivieren oder deaktivieren Sie diesen Archivierungsauftrag. </para>
 <para
+>Sie können den Einrichtungsdialog jederzeit später aufrufen, indem Sie <menuchoice
+> <guimenu
+>Einstellungen</guimenu
+><guimenuitem
+>&kmail;  einrichten</guimenuitem
+></menuchoice
+> im Hauptfenster von &kmail; auswählen und dann auf der Seite <guilabel
+>Module</guilabel
+> die Einstellungen für <guilabel
+>Agent zur E-Mail-Archivierung</guilabel
+> bearbeiten. </para>
+<para
 >Im Kontextmenu, das Sie durch Klicken mit der &RMBn; auf einen Eintrag öffnen, finden Sie Aktionen zum Öffnen des Ordners, der die Archive enthält. Außerdem können Sie einen Archivierungsauftrag sofort manuell starten. Dann wird ein bereits vorher am gleichen Tag erstelltes Archiv ohne Benachrichtigung überschrieben. </para>
 
 </sect2>
@@ -186,9 +200,9 @@
 <para
 >&i18n-archivemailagent;</para>
 <para
->Programm Copyright 2013 Laurent Montel montel@kde.org </para>
+>Programm Copyright 2013-2019 Laurent Montel montel@kde.org </para>
 <para
->Dokumentation Copyright &copy; 2013 Laurent Montel montel@kde.org </para>
+>Dokumentation Copyright &copy; 2013-2019 Laurent Montel montel@kde.org </para>
 
 <para
 >Übersetzung Burkhard Lück<email
diff -Nru kmail-19.04.3/po/de/docs/akonadi_followupreminder_agent/index.docbook kmail-19.12.3/po/de/docs/akonadi_followupreminder_agent/index.docbook
--- kmail-19.04.3/po/de/docs/akonadi_followupreminder_agent/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/de/docs/akonadi_followupreminder_agent/index.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -47,9 +47,9 @@
 </copyright>
 
 <date
->2014-06-10</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.14</releaseinfo>
+>Anwendungen 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -60,6 +60,78 @@
 <para
 >Dies Programm ist ein Akonadi-Agent zur Erinnerung an Folgenachrichten </para>
 
+<sect2 id="using-kapp">
+<title
+>&i18n-followupreminderagent; benutzen</title>
+
+<para
+>Benutzen Sie <menuchoice
+><guimenu
+>Optionen</guimenu
+><guimenuitem
+>Erinnerung an Folgenachricht erstellen</guimenuitem
+></menuchoice
+> im Editorfenster von &kmail;, um einen Dialog zu öffnen, in dem Sie eine Erinnerung an eine Folgenachricht zur aktuellen E-Mail zu einer bestimmten Zeit erstellen können.</para>
+
+<screenshot>
+<screeninfo
+>&i18n-followupreminderagent;-Dialog</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="add-followup-reminder.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>&i18n-followupreminderagent;-Dialog</phrase>
+    </textobject>
+    <caption>
+      <para
+>&i18n-followupreminderagent;-Dialog</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+<para
+>Drücken Sie den Pfeil abwärts neben dem Feld <guilabel
+>Datum</guilabel
+> und wählen ein Datum aus dem &kde;-Kalenderdialog. Im Auswahlfeld <guilabel
+>Aufgabe speichern in</guilabel
+> können Sie auch einen Kalender zur Speicherung der Erinnerung auswählen.</para>
+<para
+>Möchten Sie geplante Erinnerungen löschen, öffnen Sie <menuchoice
+><guimenu
+>Einstellungen</guimenu
+><guimenuitem
+>&kmail; einrichten ...</guimenuitem
+></menuchoice
+> und gehen dann zur Seite <guilabel
+>Module</guilabel
+>. Klicken Sie dort auf den Einrichtungsknopf der Eintrags <guilabel
+>Agent zur Erinnerung an Folgenachrichten</guilabel
+>. Öffnen Sie dann mit der &RMBn; das Kontextmenü für eine Erinnerung und wählen <guimenuitem
+>Löschen</guimenuitem
+>. </para>
+
+<screenshot>
+<screeninfo
+>&i18n-followupreminderagent; einrichten</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="followupreminder-configure.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>&i18n-followupreminderagent; einrichten</phrase>
+    </textobject>
+    <caption>
+      <para
+>&i18n-followupreminderagent; einrichten</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+</sect2>
+
 <sect2 id="credits">
 
 <title
@@ -68,9 +140,9 @@
 <para
 >&i18n-followupreminderagent;</para>
 <para
->Programm Copyright 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Programm Copyright 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Dokumentation Copyright &copy; 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Dokumentation Copyright &copy; 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Übersetzung Burkhard Lück<email
diff -Nru kmail-19.04.3/po/de/docs/akonadi_sendlater_agent/index.docbook kmail-19.12.3/po/de/docs/akonadi_sendlater_agent/index.docbook
--- kmail-19.04.3/po/de/docs/akonadi_sendlater_agent/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/de/docs/akonadi_sendlater_agent/index.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -57,9 +57,9 @@
 </copyright>
 
 <date
->2013-11-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.12</releaseinfo>
+>Anwendungen 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -122,10 +122,14 @@
 <para
 >Benutzen Sie in &kmail; <menuchoice
 ><guimenu
->Extras</guimenu
+>Einstellungen</guimenu
 > <guimenuitem
->Agent zum späteren Senden einrichten ...</guimenuitem
+>&kmail; einrichten ...</guimenuitem
 ></menuchoice
+> und wählen Sie dann auf der Seite <guilabel
+>Module</guilabel
+> die Einrichtung für <guilabel
+>Agent zum späteren Senden</guilabel
 >, um das Versenden von geplanten E-Mails zu bearbeiten. </para>
 
 <screenshot>
@@ -162,9 +166,9 @@
 <para
 >&i18n-sendlateragent;</para>
 <para
->Programm Copyright 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Programm Copyright 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Dokumentation Copyright &copy; 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Dokumentation Copyright &copy; 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Übersetzung Burkhard Lück<email
diff -Nru kmail-19.04.3/po/de/docs/kmail2/using-kmail.docbook kmail-19.12.3/po/de/docs/kmail2/using-kmail.docbook
--- kmail-19.04.3/po/de/docs/kmail2/using-kmail.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/de/docs/kmail2/using-kmail.docbook	2020-03-03 00:34:19.000000000 +0000
@@ -3281,7 +3281,7 @@
 ></userinput
 >. Es gibt in &kmail; noch keine Unterstützung für diese Prozedur der Schlüsselerzeugung. Die Identität (normalerweise der Name gefolgt von der E-Mail-Adresse in spitzen Klammern, wie z.B. <userinput
 >Hans Mustermann &lt;Hans.Mustermann@beispiel.de&gt;</userinput
->) und das Passwort sind wichtig für das Funktionieren von &kmail; und <application
+>) und die Passphrase sind wichtig für das Funktionieren von &kmail; und <application
 >GnuPG</application
 >.</para>
 
@@ -3401,8 +3401,8 @@
 >OpenPGP</guilabel
 >-Schlüssel verbunden worden sein. Für die Signierung ist das <application
 >GnuPG</application
->-Passwort erforderlich. Wenn man nicht <guilabel
->Passwort im Speicher halten</guilabel
+>-Passphrase erforderlich. Wenn man nicht <guilabel
+>Passphrase im Speicher halten</guilabel
 > auf der Seite <guilabel
 >Sicherheit</guilabel
 > bei den Einstellungen von &kmail; gewählt hat, fragt &kmail; nach dem Passwort. Anderenfalls wird die Nachricht ohne Nachfrage von &kmail; signiert, falls man das Passwort bereits einmal eingegeben hatte.</para>
@@ -3480,7 +3480,7 @@
 >Empfang einer verschlüsselten Nachricht</title>
 
 <para
->Man muss lediglich die Nachricht in &kmail; auswählen. Dann wird man nach dem Passwort gefragt. &kmail; versucht nun, die Nachricht zu entschlüsseln und zeigt danach den unverschlüsselten Text, wenn die Nachricht mit dem öffentlichen Schlüssel verschlüsselt worden ist (falls nicht, ist das Ergebnis unleserlich). &kmail; speichert diese Nachricht verschlüsselt ab, sodass niemand ohne Passwort die Nachricht lesen kann.</para>
+>Man muss lediglich die Nachricht in &kmail; auswählen. Dann wird man nach de Passphrase gefragt. &kmail; versucht nun, die Nachricht zu entschlüsseln und zeigt danach den unverschlüsselten Text, wenn die Nachricht mit dem öffentlichen Schlüssel verschlüsselt worden ist (falls nicht, ist das Ergebnis unleserlich). &kmail; speichert diese Nachricht verschlüsselt ab, sodass niemand ohne Passphrase die Nachricht lesen kann.</para>
 
 </sect2>
 
diff -Nru kmail-19.04.3/po/de/kmail.po kmail-19.12.3/po/de/kmail.po
--- kmail-19.04.3/po/de/kmail.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/de/kmail.po	2020-03-03 00:33:57.000000000 +0000
@@ -17,8 +17,8 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-01-24 11:08+0100\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-10-17 07:03+0200\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de\n"
@@ -26,7 +26,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -195,8 +195,8 @@
 msgstr "Mehrere Schlüssel zur Verschlüsselung pro Adresse"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -302,27 +302,27 @@
 "KMail hat in diesem Ordner keine eindeutige Mailingliste erkannt. Bitte "
 "tragen Sie die erforderlichen Adressen von Hand ein."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Speicherplatzkontingent"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Ausnutzung:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% belegt"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 von %2 benutzt"
@@ -345,7 +345,7 @@
 "betätigen.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Vorlagen"
@@ -356,106 +356,106 @@
 msgstr "Für diesen &Ordner eigene Nachrichtenvorlagen benutzen"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "Globale Vorlagen &kopieren"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Ansicht"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "E&igene Symbole verwenden"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "No&rmal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Ungelesen:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Absender-/Empfängerspalte in Nachrichtenliste anzeigen"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Spal&te anzeigen:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Standard"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Absender"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Empfänger"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Nachrichtenliste"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Standard-Zusammenstellung verwenden"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Zusammenstellung"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Standard-Design verwenden"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Design"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Standard-Nachrichtenformat"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "HTML- vor Text-Ansicht bevorzugen"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Text- vor HTML-Ansicht bevorzugen"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Globale Einstellung verwenden"
@@ -465,100 +465,106 @@
 msgid "Retrieval Options"
 msgstr "Abrufeinstellungen"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identitäten"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Empfang"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Versand"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "LDAP-Server "
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Ausgangspostfächer (fügen Sie mindestens eines hinzu):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Allgemeine Einstellungen"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Vo&r Versenden nachfragen"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Rechtschreibprüfung vor dem Versenden"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nie automatisch"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Bei manuellem Abholen"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Bei allen Abholvorgängen"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Sofort senden"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
-msgstr "Später senden ..."
+msgstr "Später senden"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "N&achrichten im Postausgang senden:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Standard-Sendemethode:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, fuzzy, kde-format
+#| msgid "Enable Unified Mailboxes"
+msgid "Enable Undo Send"
+msgstr "Einheitliche Postfächer aktivieren"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "E-Mail-Postfach hinzufügen ..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Benutzerdefiniertes Postfach ..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -567,30 +573,30 @@
 "Der Postfach-Assistent lässt sich nicht starten. Stellen Sie bitte sicher, "
 "dass AccountWizard richtig installiert ist."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Der Postfach-Assistent lässt sich nicht starten."
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Bei manueller Prüfung einbeziehen"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Beim Beenden in Offline-Modus wechseln"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Beim Start nach E-Mail sehen"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -648,7 +654,7 @@
 msgid "Fixed Width Font"
 msgstr "Feste Zeichenbreiten"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Nachrichten-Editor"
@@ -907,7 +913,7 @@
 #: settings/kmail.kcfg.cmake:88
 #, kde-format
 msgid "Start minimized to tray"
-msgstr ""
+msgstr "Minimiert im Systemabschnitt der Kontrollleiste starten"
 
 #: configuredialog/configureappearancepage.cpp:893
 #, kde-format
@@ -957,61 +963,61 @@
 "Die Markierung kann nicht erstellt werden. Eine Markierung mit diesem Namen "
 "ist bereits vorhanden."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Allgemein"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standard-Vorlagen"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Eigene Vorlagen"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Betreff"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Zeichensatz"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Vorspann"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Anhänge"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autokorrektur"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Bildgröße automatisch ändern"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signatur"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1020,12 +1026,12 @@
 "Automatisch die eingerichtete Signatur einfügen\n"
 "wenn das Schreiben einer neuen Nachricht begonnen wird"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Signatur über zitiertem Text einfügen"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1034,18 +1040,18 @@
 "Signatur-Trennzeichen nach RFC einfügen\n"
 "(zwei Bindestriche und ein Leerzeichen) vor der Signatur"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Beim Antworten keine vorhandene Signatur zitieren"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1056,7 +1062,7 @@
 "statt der gesamten Nachricht zitieren,\n"
 "falls ein Text im Nachrichtenfenster markiert wurde."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1067,17 +1073,17 @@
 "Textes hinzufügen, auch wenn die Zeile durch einen neuen Zeilenumbruch "
 "erzeugt wurde."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Automatischen Zeilenumbruch an der festgelegten Breite aktivieren"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Textbreite für den automatischen Zeilenumbruch festlegen."
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1088,7 +1094,7 @@
 "Format verwenden. Ist diese Einstellung nicht gewählt, wird \n"
 "standardmäßig die ursprüngliche Nachricht nur als Text zitiert."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1099,34 +1105,34 @@
 "Fettdruck, Kursiv und unterstrichener Text, Listen und externe Referenzen\n"
 "werden unterstützt."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Im Text"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Als Anhang"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Legt das Standardformat für Weiterleitungen fest"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Standard-Typ für Weiterleitungen:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Empfänger"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1138,17 +1144,17 @@
 "Dies können Sie für jede einzelne Nachricht mit „Optionen“ -> "
 "„Empfangsbenachrichtigung anfordern“ einstellen."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Warnen, wenn zu viele Empfänger ausgewählt sind"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Maximale Anzahl von Empfängern für diese Warnung einstellen"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1165,7 +1171,7 @@
 "senden. Beachten Sie, das dabei Nachrichten an Verteilungslisten oder\n"
 "Mailinglisten nicht berücksichtigt werden."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1174,18 +1180,18 @@
 "Zuletzt verwendete eingegebene Adressen merken,\n"
 "und zur Autovervollständigung für Empfänger anbieten"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Nicht speichern"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Höchste Anzahl zuletzt verwendeter Adressen:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1194,23 +1200,23 @@
 "Die höchste Anzahl zuletzt verwendeter Adressen,\n"
 "die für die Vervollständigung behalten werden"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Vervollständigung einrichten ..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Automatisches Speichern"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Kein automatisches Speichern"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1218,18 +1224,18 @@
 msgstr[0] " Minute"
 msgstr[1] " Minuten"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Nachricht automatisch in diesem angegebenen Intervall speichern"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Präfi&xe der Betreffzeile beantworteter Nachrichten"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1239,61 +1245,61 @@
 "(die Einträge sind reguläre Ausdrücke ohne Unterscheidung der Groß-/"
 "Kleinschreibung):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Hinzufügen ..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Entfernen"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Ä&ndern ..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr ""
 "Geben Sie das Präfix für die Betreffzeile beantworteter Nachrichten ein:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Präfixe der Betreffzeile weiter&geleiteter Nachrichten"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Hinzufügen ..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Entfernen"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Ändern ..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr ""
 "Geben Sie das Präfix für die Betreffzeile weitergeleiteter Nachrichten ein:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1303,89 +1309,89 @@
 "einem Zeichensatz durchsucht, der alle benötigten Zeichen enthält."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Ä&ndern ..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Geben Sie den Zeichensatz ein:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Ursprungs-&Zeichensatz beim Beantworten oder Weiterleiten möglichst "
 "beibehalten"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Dieser Zeichensatz wird nicht unterstützt."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Benutzerdefinierte Endung für Nachrichten&kennung benutzen"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Benut&zerdefinierte Endung für Nachrichtenkennung:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definieren Sie eigene MIME-Vorspannfelder:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Name"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Wert"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Neu"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Name:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Wert:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Ungültiger Vorspann"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-kompatible Namensvergabe für Anhänge"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1394,40 +1400,40 @@
 "Schalten Sie diese Einstellung ein, damit Outlook(tm) die Namen von Anhängen "
 "akzeptiert, die Sonderzeichen enthalten"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Suche nach fehlenden Anhängen aktivieren"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Jeder der folgenden Ausdrücke wird als Schlüsselwort für einen Anhang "
 "interpretiert:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Geben Sie ein neues Schlüsselwort ein:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Maximale Größe des Anhangs:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Keine Begrenzung"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1482,10 +1488,9 @@
 msgstr "Nachrichten-Editor-Module"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:202
-#, fuzzy, kde-format
-#| msgid "Check Before Send Plugins"
+#, kde-format
 msgid "Grammar Checker Plugins"
-msgstr "Module zum Prüfen vor dem Senden"
+msgstr "Module zur Grammatikprüfung"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:212
 #, kde-format
@@ -1513,15 +1518,14 @@
 msgstr "Vorspannstil-Module"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
-#, fuzzy, kde-format
-#| msgid "Composer Plugins"
-msgid "Convertor Text Plugins"
-msgstr "Nachrichten-Editor-Module"
+#, kde-format
+msgid "Text Conversion Plugins"
+msgstr "Module zur Textumwandlung"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
 msgid "Misc"
-msgstr ""
+msgstr "Verschiedenes"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:279
 #, kde-format
@@ -1630,7 +1634,7 @@
 msgid "Archive Folder"
 msgstr "Archiv-Ordner"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1696,19 +1700,19 @@
 msgid "Notification"
 msgstr "Benachrichtigung"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 Anhang (%2)"
 msgstr[1] "%1 Anhänge (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Liste der Anhänge ausblenden"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Liste der Anhänge anzeigen"
@@ -1725,336 +1729,335 @@
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Wählen Sie das Wörterbuch, das für die Rechtschreibprüfung dieser Nachricht "
 "verwendet werden soll"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Wählen Sie den Ordner für versendete Nachrichten, in dem diese Nachricht "
 "gespeichert werden soll"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 "Wählen Sie das Postfach für ausgehende Nachrichten, das zum Versenden dieser "
 "Nachricht verwendet werden soll"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Stellen Sie die „Von:“-Adresse für diese Nachricht ein"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Vergeben Sie einen Betreff für diese Nachricht"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identität:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Wörterbuch:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Ordner für &versendete Nachrichten:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Versandweg:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Von:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Be&treff:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "E-Mail ver&senden"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "E-Mail versenden &mit"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Senden"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "S&päter senden"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Spä&ter senden mit"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "In Postausgang"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "&Als Entwurf speichern"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "E-Mail im Ordner Entwürfe speichern"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Als &Vorlage speichern"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "E-Mail im Ordner Vorlagen speichern"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "In Datei &speichern "
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "E-Mail als Text- oder HTML-Datei speichern"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Textdatei e&infügen ..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Kürzlich verwendete Textdatei einfügen"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Adress&buch"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Adressbuch öffnen"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Neue Nachricht"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "E&mpfänger auswählen ..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "&Verteilerliste speichern ..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Als An&hang einfügen"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Leerräume komprimieren"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Feste &Zeichenbreiten"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Dringend"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "E&mpfangsbenachrichtigung anfordern"
 
-#: editor/kmcomposerwin.cpp:1172
-#, fuzzy, kde-format
-#| msgid "&Request Disposition Notification"
+#: editor/kmcomposerwin.cpp:1234
+#, kde-format
 msgid "&Request Delivery Confirmation"
-msgstr "E&mpfangsbenachrichtigung anfordern"
+msgstr "Ausliefe&rungsbenachrichtigung anfordern"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Z&eilenumbruch"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Textbausteine"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Automatische &Rechtschreibprüfung"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Bearbeiten in Rich-Text"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rich-Text"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Bearbeiten in Rich-Text ein-/ausschalten"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Alle Felder"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identität"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Wörterbuch"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Ordner für &versendete Nachrichten"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Ver&sandweg"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Von"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Be&treff"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "S&ignatur anfügen"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Signatur &voranstellen"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Signatur an der &Schreibmarke einfügen"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Rechtschreib&prüfung ..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Rechtschreibprüfung"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Nachricht &verschlüsseln"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Verschlüsseln"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Nachricht &signieren"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signieren"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Nachrichten-Verschlüsselungsformat"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Bitte wählen Sie ein Verschlüsselungsformat für diese Nachricht aus."
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Erinnerung an Folgenachricht erstellen ..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMail einrichten ..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2063,53 +2066,53 @@
 "<qt>Hiermit wird die Menüleiste vollständig ausgeblendet. Drücken Sie %1 , "
 "um sie wieder anzuzeigen.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Menüleiste ausblenden"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Zeile: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Spalte: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "Überschr"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "Einf"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Rechtschreibprüfung: an"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Rechtschreibprüfung: aus"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Als &Vorlage erneut speichern"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Als &Entwurf speichern"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2118,7 +2121,7 @@
 "Diese Nachricht wieder im Vorlagenordner speichern. Von dort aus kann sie "
 "später benutzt werden."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2127,82 +2130,82 @@
 "Diese Nachricht im Entwurfsordner speichern. Dort kann sie später weiter "
 "bearbeitet und gesendet werden."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Möchten Sie die Nachricht verwerfen oder für später speichern?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Editor schließen"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Automatisches Speichern der Nachricht ist fehlgeschlagen"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Das Senden der Nachricht ist fehlgeschlagen"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Datei einfügen"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Als &eingebettetes Bild hinzufügen"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Als &Anhang hinzufügen"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Name des Anhangs:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Der Name des Anhangs darf nicht leer sein"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Ungültiger Name des Anhangs"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Adresse zur Nachricht hinzufügen"
 msgstr[1] "Adressen (URLs) zur Nachricht hinzufügen"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Datei als &Anhang hinzufügen"
 msgstr[1] "Dateien als &Anhang hinzufügen"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Inhalt der Zwischenablage als Anhang einfügen"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2215,12 +2218,12 @@
 "(OpenPGP oder S/MIME) Schlüssel hierfür fest.</p> <p>Bitte legen Sie den "
 "Schlüssel für diese Identität fest.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Verschlüsselungsschlüssel nicht definiert"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2231,12 +2234,12 @@
 "oder S/MIME-Schlüssel dafür festgelegt werden.</p><p>Legen Sie bitte den für "
 "diese Identität verwendeten Schlüssel fest.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Signaturschlüssel nicht definiert"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2247,7 +2250,7 @@
 "in allen Identitäten Ihre E-Mail-Adresse eintragen, damit Sie diese nicht "
 "für jede Nachricht angeben müssen."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2256,39 +2259,39 @@
 "Sie müssen zumindest einen Empfänger im Feld „An:“ oder unter „Kopie:“ (CC) "
 "oder „Blindkopie:“ (BCC) angeben."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Das Feld „An:“ ist leer. Soll die Nachricht trotzdem versendet werden?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Kein Hauptempfänger angegeben"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 "Sie haben keinen Betreff angegeben. Soll die Nachricht trotzdem versendet "
 "werden?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Kein Betreff angegeben"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Ohne Änderung &senden"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Betreff angeben"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2297,22 +2300,22 @@
 "Sie müssen zumindest einen Empfänger angeben, um einen Entwurf verschlüsseln "
 "zu können."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Nachrichten werden versendet ..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Bestätigung senden"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Jetzt senden"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2321,22 +2324,22 @@
 "Sie versenden diese Nachricht an mehr als %1 Empfänger. Soll die Nachricht "
 "trotzdem gesendet werden?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Zu viele Empfänger"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Ohne Änderung &senden"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Empfänger ä&ndern"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2345,22 +2348,22 @@
 "Durch das Abschalten des HTML-Modus wird der Text seine Formatierungen "
 "verlieren. Sind Sie sicher?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Möchten Sie die Formatierungen verwerfen?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Formatierungen verwerfen"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Kennzeichnung für einfachen Text hinzufügen"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2370,7 +2373,7 @@
 "verwendet, der Schlüssel ist voll vertrauenswürdig. Klicken Sie auf das "
 "Symbol für weitere Informationen."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2380,7 +2383,7 @@
 "verwendet, der Schlüssel ist eingeschränkt vertrauenswürdig. Klicken Sie auf "
 "das Symbol für weitere Informationen."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2390,7 +2393,7 @@
 "verwendet, der Schlüssel ist nicht vertrauenswürdig. Klicken Sie auf das "
 "Symbol für weitere Informationen."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2398,14 +2401,13 @@
 "icon for details."
 msgstr ""
 "Die E-Mail an diesen Empfänger wird verschlüsselt, aber die Sicherheit des "
-"Verschlüsselung ist unbekannt, der Schlüssel konnte nicht überprüft werden. "
+"Verschlüsselung ist unbekannt, der Schlüssel kann nicht überprüft werden. "
 "Klicken Sie auf die Symbol für Informationen."
 
-#: editor/kmcomposerwin.cpp:3636
-#, fuzzy, kde-format
-#| msgid "Login Information"
+#: editor/kmcomposerwin.cpp:3735
+#, kde-format
 msgid "Plugin Editor Information"
-msgstr "Anmeldeinformationen"
+msgstr "Modul Editor-Information"
 
 #: editor/potentialphishingemail/potentialphishingdetaildialog.cpp:33
 #, kde-format
@@ -2479,7 +2481,7 @@
 msgid "External editor was started."
 msgstr "Der externe Editor wurde gestartet."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2488,14 +2490,14 @@
 "Der Versandweg wurde nicht gefunden. Bitte überprüfen Sie, ob den richtigen "
 "E-Mail-Versandweg benutzen."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Es ist kein Ordner für versendete Nachrichten definiert. Bitte richten Sie "
 "einen ein, bevor Sie eine E-Mail senden."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
@@ -2503,7 +2505,7 @@
 "Die Identität wurde nicht gefunden. Bitte überprüfen Sie, ob Sie eine "
 "richtige Identität benutzen."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2532,11 +2534,6 @@
 msgid "Message will not be encrypted"
 msgstr "Die Nachricht wird nicht verschlüsselt"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Textbausteine"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2584,29 +2581,29 @@
 msgid "Cannot move messages."
 msgstr "Nachrichten können nicht verschoben werden."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Der Ordner kann nicht geholt werden. Die Fehlermeldung lautet: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Es wurde kein Ordner zurückgegeben."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 "Der übergeordnete Ordner kann nicht geholt werden. Die Fehlermeldung lautet: "
 "%1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Liste der Ordner kann nicht zurückgegeben werden."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Nachrichten wurden archiviert"
@@ -2647,48 +2644,48 @@
 msgid "&Existing identities:"
 msgstr "E&xistierende Identitäten:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Fehler beim Erstellen des neuen Schlüsselpaars: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Fehler bei Schlüsselgenerierung"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Kein Schlüssel"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erstellen"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Neues Schlüsselpaar wird erstellt ..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Identität bearbeiten"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Allgemein"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "I&hr Name:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2700,12 +2697,12 @@
 "p> <p>Falls dieses Feld leer bleibt, erscheint in der E-Mail nur die Adresse "
 "aber nicht der Name.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Organisation:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2716,12 +2713,12 @@
 "Firma enthalten, falls dieser Name im Nachrichtenvorspannfeld erscheinen "
 "soll.</p> <p>Dieses Feld wird meistens leer gelassen.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-Mail-Adresse:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2738,12 +2735,12 @@
 "oder falsch ausgefüllt ist, können die Empfänger auf E-Mails von Ihnen nicht "
 "antworten.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "&E-Mail-Aliase:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2760,12 +2757,12 @@
 "tr><tr><th>Aliase:</th><td>vorname@beispiel.de<br>nachname@beispiel.de</td></"
 "tr> </table><p>Bitte eine Adresse pro Zeile eingeben.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kryptografie"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2782,12 +2779,12 @@
 "Informationen zu Schlüsseln finden Sie auf <a>httpd://www.gnupg.org</a></p>."
 "</qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-Signaturschlüssel:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2806,12 +2803,12 @@
 "dadurch nicht eingeschränkt.</p> <p>Weitere Informationen zu Schlüsseln "
 "finden Sie auf <a>https://www.gnupg.org</a></p>.</qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-Schlüssel zum Verschlüsseln:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2825,12 +2822,12 @@
 "signieren. Die normale Funktionalität wird dadurch nicht beeinträchtigt.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-Signaturzertifikat:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2846,39 +2843,39 @@
 "Nachrichten nicht mit S/MIME verschlüsseln. Die normale Funktionalität wird "
 "dadurch nicht eingeschränkt.</p>.</qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-Verschlüsselungszertifikat:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Bevorzugtes Format:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Nachrichten automatisch signieren"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Nachrichten möglichst automatisch verschlüsseln"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Antwortadresse:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2896,12 +2893,12 @@
 "an eine Gruppenadresse gehen.</p> <p>Lassen Sie dieses Feld im Zweifelsfall "
 "leer.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&Kopie-Adressen:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2919,12 +2916,12 @@
 "Empfänger durch Kommata.</p><p>Im Zweifelsfall lassen Sie dieses Feld leer.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Blindkopie-Adressen:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2942,57 +2939,57 @@
 "als eine Adresse angeben, trennen Sie die Liste der BCC-Empfänger durch "
 "Kommas.</p><p>Im Zweifelsfall lassen Sie dieses Feld leer.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Wörterbuch:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Ordner für versendete Nachrichten:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Ordner für En&twürfe:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Ordner für &Vorlagen:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Versand-Postfach:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Eigene vCard zur Nachricht hinzufügen"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Erstellen ..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Sprache der Autokorrektur:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Standard-Domainname wiederherstellen"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "S&tandard-Domain:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3001,33 +2998,33 @@
 "<qt><p>Die Standard-Domain wird zur automatischen Vervollständigung einer E-"
 "Mail-Adresse verwendet, falls nur ein Benutzername angegeben wurde.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Eigene Nachrichten&vorlagen benutzen"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signatur"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Bild"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Ungültiger E-Mail-Alias „%1“"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Ungültige E-Mail-Adresse"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3041,7 +3038,7 @@
 "Dies kann zu Warnmeldungen führen, wenn hierüber erstellte Signaturen beim "
 "Empfänger überprüft werden."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3051,7 +3048,7 @@
 "Benutzerkennung, die mit der für diese Identität festgelegten E-Mail-Adresse "
 "übereinstimmt (%1). "
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3064,7 +3061,7 @@
 "übereinstimmt (%1). Dies kann zu Warnmeldungen führen, wenn hierüber "
 "erstellte Signaturen beim Empfänger überprüft werden."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3074,22 +3071,22 @@
 "Benutzerkennung, die mit der für diese Identität festgelegten E-Mail-Adresse "
 "übereinstimmt (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Die E-Mail-Adresse wurde nicht im Schlüssel/Zertifikat gefunden"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Die Signatur ist ungültig"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Identität „%1“ bearbeiten"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3098,7 +3095,7 @@
 "Ein eingestellter Ordner dieser Identität existiert nicht (mehr). Der  "
 "Standardordner wird verwendet."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Bearbeiten ..."
@@ -3129,6 +3126,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Die vCard-Datei kann nicht gelöscht werden."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Möchten Sie wirklich abbrechen?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Bestätigung"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3294,7 +3303,7 @@
 "Beispiele finden Sie unter <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Bild"
@@ -3329,7 +3338,7 @@
 msgstr[1] ""
 "Die Verteilerlisten „%2“ sind leer, sie können nicht verwendet werden."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Zum Adressbuch hinzufügen"
@@ -3339,22 +3348,22 @@
 msgid "Contact created successfully"
 msgstr "Der Kontakt wurde erfolgreich erstellt"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Der Kontakt kann nicht gespeichert werden: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Speichern des Kontakts ist fehlgeschlagen"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Möchten Sie diesen Ordner „%1“ wirklich?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Ordner anhängen"
@@ -3573,14 +3582,14 @@
 msgstr "&Ordner"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Filter auf Ordner anwenden"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3606,7 +3615,7 @@
 msgstr "&Weiterleiten"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Filter anwenden"
@@ -3631,7 +3640,7 @@
 msgstr "&Hilfe"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Haupt-Werkzeugleiste"
@@ -3686,14 +3695,14 @@
 msgid "The file does not contain a message."
 msgstr "Die Datei enthält keine Nachricht."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "Diese Datei enthält mehrere Nachrichten. Nur die erste Nachricht wird "
 "angezeigt."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3702,32 +3711,32 @@
 "Sollen die ausgewählten Nachrichten als Anhang in einer Nachricht (MIME-"
 "Katalog) oder als individuelle Nachrichten weitergeleitet werden?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Als MIME-Katalog senden"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Einzeln senden"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Nachrichten werden gefiltert"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Nachricht %1 von %2 wird gefiltert."
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Nachrichten werden verschoben"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Nachrichten werden gelöscht"
@@ -3756,31 +3765,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Textflussrichtung-Werkzeugleiste"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail befindet sich im „Offline-Modus“. Alle Vorgänge, die eine "
 "Netzwerkverbindung erfordern, werden ausgesetzt."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "E-Mail senden"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Nachrichten kann nicht versendet werden"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail befindet sich im „Online-Modus“. Alle Vorgänge, die eine "
 "Netzwerkverbindung erfordern, werden wiederaufgenommen."
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3790,37 +3799,37 @@
 "Netzwerkverbindung erfordern, werden wiederaufgenommen sobald eine "
 "Netzwerkverbindung erkannt wurde."
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail ist momentan im Offline-Modus. Wie möchten Sie fortfahren?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Online arbeiten"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Netzwerkverbindung erkannt, alle Netzwerkaufgaben wiederaufgenommen"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Keine Netzwerkverbindung erkannt, alle Netzwerkaufgaben angehalten"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3829,12 +3838,12 @@
 "Die Sicherungsdatei in %1 kann nicht geöffnet werden.\n"
 "Grund: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Das Öffnen der automatischen Sicherung ist fehlgeschlagen."
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3846,7 +3855,7 @@
 "Diese %1 Identitäten wurden geändert. Sie verwenden ab jetzt den Standard-"
 "Versandweg:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3858,44 +3867,48 @@
 "Diese %1 Identitäten wurden geändert. Sie verwenden ab jetzt den geänderten "
 "Versandweg:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Nachrichten werden versendet"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Sendevorgang wird eingeleitet ..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Die Ressource „%1“ ist nicht funktionsfähig."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Die Ressource „%1“ ist nicht funktionsfähig.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Der Agent zur E-Mail-Archivierung ist noch nicht registriert."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Der Agent zur späteren Senden ist noch nicht registriert."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 "Der Agent zur Erinnerung an Folgenachrichten ist noch nicht registriert."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3904,12 +3917,12 @@
 "Die Zertifikatsverwaltung lässt sich nicht starten. Stellen Sie bitte "
 "sicher, dass Kleopatra richtig installiert ist."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-Fehler"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3918,26 +3931,26 @@
 "Der Import-Assistent lässt sich nicht starten. Stellen Sie bitte sicher, "
 "dass ImportWizard richtig installiert ist."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Der Import-Assistent lässt sich nicht starten."
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Das Programm „PIM-Einstellungs-Export“ lässt sich nicht starten. Bitte "
-"überprüfen Sie die korrekte Installation."
+"Das Programm „PIM-Daten-Export“ lässt sich nicht starten. Bitte überprüfen "
+"Sie die korrekte Installation."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Das Programm „PIM-Einstellungs-Export“ lässt sich nicht starten."
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Das Programm „PIM-Daten-Export“ lässt sich nicht starten."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3946,75 +3959,75 @@
 "Der Import-Assistent lässt sich nicht starten. Stellen Sie bitte sicher, "
 "dass ImportWizard richtig installiert ist."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Der Import-Assistent lässt sich nicht starten."
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Ein anderes E-Mail-Programm wurde auf Ihren System gefunden. Möchten Sie "
 "dessen Daten importieren?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Der Import-Assistent lässt sich nicht starten. Bitte überprüfen Sie die "
 "korrekte Installation."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Kein Betreff"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(keine Vorlagen)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr ""
 "Für diesen Ordner wurden noch keine Einstellungen zur Begrenzung der "
 "Aufbewahrungsfrist festgelegt."
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Sind Sie sicher, dass Sie alte Nachrichten aus dem Ordner <b>%1</b> "
 "löschen möchten?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Alte Nachrichten im Ordner löschen"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Alte Nachrichten &löschen"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Papierkorb leeren"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "In den Papierkorb werfen"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Möchten Sie den Papierkorb wirklich leeren?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4023,29 +4036,29 @@
 "<qt>Möchten Sie alle Nachrichten des Ordners <b>%1</b> in den Papierkorb "
 "verschieben?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Alle Nachrichten wurden in den Papierkorb verschoben"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr ""
 "Sollen wirklich alle Nachrichten, deren Aufbewahrungsfrist abgelaufen ist, "
 "gelöscht werden?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Alte Nachrichten löschen?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Alte Nachrichten löschen"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4057,17 +4070,17 @@
 "dass Ihr System durch aktuelle oder künftige Sicherheitslücken geschädigt "
 "wird."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Sicherheitswarnung"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Externe Referenzen laden"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4082,537 +4095,537 @@
 "<qt>Sollen die %1 ausgewählten Nachrichten wirklich gelöscht werden?<br /"
 ">Sie können nicht wiederhergestellt werden.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Nachrichten löschen"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Nachricht löschen"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Nachrichten werden verschoben ..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Nachrichten werden gelöscht ..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Das Löschen der Nachrichten ist abgeschlossen."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Das Verschieben der Nachrichten ist abgeschlossen."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Löschen der Nachrichten fehlgeschlagen."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Löschen der Nachrichten abgebrochen."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Verschieben der Nachrichten fehlgeschlagen."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Verschieben der Nachrichten abgebrochen."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Nachrichten in Ordner verschieben"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Nachrichten werden kopiert ..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Das Kopieren der Nachrichten ist abgeschlossen."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Kopieren der Nachrichten fehlgeschlagen."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopieren der Nachrichten abgebrochen."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Nachrichten in Ordner kopieren"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Nachrichten werden in den Papierkorb geworfen ..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Nachrichten werden gelöscht und in den Papierkorb geworfen ..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Das Verschieben der Nachrichten in den Papierkorb ist abgeschlossen."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr ""
 "Das Löschen oder Verschieben der Nachrichten in den Papierkorb ist "
 "abgeschlossen"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Das Verschieben der Nachrichten in den Papierkorb ist fehlgeschlagen."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr ""
 "Das Löschen oder Verschieben der Nachrichten in den Papierkorb ist "
 "fehlgeschlagen."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Das Verschieben der Nachrichten in den Papierkorb wurde abgebrochen."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr ""
 "Das Löschen oder Verschieben der Nachrichten in den Papierkorb wurde "
 "abgebrochen."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "In Ordner wechseln"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Speichern &unter ..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Alte Nachrichten aus allen Ordnern löschen"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Na&ch E-Mail sehen"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Nach E-Mail sehen in"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Nach E-Mail sehen"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Postausgang versenden"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Online-Status (unbekannt)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Postausgang versenden über"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Zertifikatsverwaltung"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "Nachrichten &importieren ..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Fehlersuche im Sieve-Filter ..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filter&protokoll anzeigen ..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Import aus einem anderen E-Mail-Programm ..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Abwesenheitsbenachrichtigungen bearbeiten ..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Automatische Archivierung &einrichten ..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Später zu sendende Nachrichten ..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Nachrichten zur Erinnerung an Folgenachrichten ..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Löschen"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Gru&ppe in den Papierkorb werfen"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Gruppe in den Papierkorb werfen"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Gr&uppe löschen"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Nachrichten &suchen ..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "All&e Nachrichten auswählen"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Ver&waltung von Mailinglisten ..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Kur&zbefehl festlegen ..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Einstellungen für Aufbewahrungs&frist"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "Ordner a&rchivieren ..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "E&xterne Referenzen laden"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Nachricht kopieren nach ..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Nachricht verschieben nach ..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Neue Nachricht ..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Neu"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Neue Nachricht von &Vorlage"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Ne&ue Nachricht an Mailingliste ..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Filter anlegen"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Nach &Betreff filtern ..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Nach &Absender filtern ..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Nach Em&pfänger filtern ..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Nach Blind&kopie filtern ..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "&Gruppe markieren"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Gruppe als ge&lesen markieren"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Alle Nachrichten in dieser Gruppe als gelesen markieren"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Gruppe als &ungelesen markieren"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Alle Nachrichten der ausgewählten Gruppe als ungelesen markieren"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Gruppe als w&ichtig markieren"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Gruppen-Markierung „Wichtig“ entfernen"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Gruppe als &Aufgabe markieren"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Gruppen-Markierung „Aufgabe“ ent&fernen"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Gruppe über&wachen"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Gruppe &ignorieren"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "A&nhänge speichern ..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Entschlüsselt kopieren nach ..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "A&lle Filter anwenden"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Gruppe &aufklappen"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Aktuelle Gruppe aufklappen"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Gruppe &einklappen"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Aktuelle Gruppe einklappen"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Alle Gruppen auf&klappen"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Alle Gruppen des aktuellen Ordners aufklappen"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "A&lle Gruppen einklappen"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Alle Gruppen des aktuellen Ordners einklappen"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Nachricht anzeigen"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Nächste Nachricht"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Zur nächsten Nachricht gehen"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Nächste &ungelesene Nachricht"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Nächste"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Zur nächsten ungelesenen Nachricht gehen"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Vorherige Nachricht"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Zur vorherigen Nachricht gehen"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Vorherige un&gelesene Nachricht"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Vorherige"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Zur vorherigen ungelesenen Nachricht gehen"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Nächster ungelesener O&rdner"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Gehe zum nächsten Ordner mit ungelesenen Nachrichten"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Vorheriger ungelesener Or&dner"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Vorheriger Ordner mit ungelesenen Nachrichten"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Nächster ungelesener &Text"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Zum nächsten ungelesen Text springen"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4621,225 +4634,230 @@
 "In der aktuellen Nachricht nach unten blättern. Am Ende der aktuellen "
 "Nachricht zur nächsten ungelesenen Nachricht wechseln."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "&Filter einrichten ..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "„Sieve“-&Skripte verwalten ..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "Postf&ach hinzufügen ..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Einführung zu KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Begrüßungsbildschirm von KMail anzeigen"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "&Benachrichtigungen festlegen ..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "KMail ein&richten ..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Aufbewahrungsfrist festlegen ..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Bevorzugten Ordner &hinzufügen ..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Serverseitiges Abonnement ..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Alle Filter anwenden"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "KMail-Daten im-/exportieren ..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Neuer Adressbuchkontakt ..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Nachricht in Ordner kopieren"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "In Ordner wechseln ..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Laufenden Vorgang abbrechen"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Nächsten Ordner aktivieren"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Vorherigen Ordner aktivieren"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Aktivierten Ordner auswählen"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Ersten Ordner aktivieren"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Letzten Ordner aktivieren"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Nächste Nachricht aktivieren"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Vorherige Nachricht aktivieren"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Erste Nachrichten auswählen"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Letzte Nachrichten auswählen"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Aktivierte Nachricht auswählen"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Fokus auf die Schnellsuche einstellen"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Auswahl auf vorherige Nachricht ausweiten"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Auswahl auf nächste Nachricht ausweiten"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Nachricht in Ordner verschieben"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Niedrige Bandbreite verwenden"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 "Alle Nachrichten in diesem sowie untergeordneten Ordnern als gelesen "
 "markieren"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Doppelte Nachrichten in diesem Ordner und allen Unterordnern entfernen"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Zugang&seinstellungen"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Postfach neu starten"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Bevorzugten Ordner hinzufügen"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Papierkorb lee&ren"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Alle Nachrichten in den &Papierkorb werfen"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Suche e&ntfernen"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Suche bearbeiten ..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Rückgängig"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Rückgängig: „%1“"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter „%1“"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Suchen... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4850,12 +4868,12 @@
 "„Spam“) und erhöht die Wahrscheinlichkeit, dass Ihr System durch aktuelle "
 "oder künftige Sicherheitslücken geschädigt wird."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML verwenden"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4865,118 +4883,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Einheitliche Postfächer aktivieren?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Einheitliche Postfächer aktivieren"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Startvorgang ..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "In den &Papierkorb werfen"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "In den &Papierkorb werfen"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Nachricht in den Papierkorb werfen"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Die Nachricht „%1“ kann nicht kopiert werden."
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Neue Nachricht an ..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Antwort an ..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Weiterleiten an ..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Zu vorhandenem Kontakt hinzufügen"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Im Adressbuch öffnen"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Lesezeichen für Verknüpfung"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Kontakt bearbeiten ..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Verknüpfung speichern unter ..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "In Na&chricht suchen ..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Bild auf Datenträger speichern ..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "HTML-Format anzeigen"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "HTML-Format bei E-Mails von diesem Kontakt anzeigen"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Externe Referenzen bei E-Mails von diesem Kontakt laden."
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Bild freigeben ..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4985,64 +5003,64 @@
 "KMail basiert nun auf dem Framework für persönliche Informationsverwaltung "
 "von Akonadi, was viele Veränderungen mit sich bringt."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "E-Mail Push (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Verbesserte Suche"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Unterstützt das Hinzufügen von Notizen/Bemerkungen an E-Mails"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Weniger Einfrieren der Oberfläche, da das Prüfen auf neue E-Mails in den "
 "Hintergrund verlagert wurde"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Unterstützung für Module"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Neuer HTML-Renderer (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Überprüfung auf Phishing-Adressen wurde hinzugefügt"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Das E-Mail-Programm von KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Ordner-Inhalt wird bezogen"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Bitte warten ..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Offline"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5051,7 +5069,7 @@
 "KMail ist momentan im Offline-Modus. Klicken Sie <a href=\"kmail:goOnline"
 "\">hier</a>, um online zu gehen ...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5060,22 +5078,22 @@
 "Das Postfach ist momentan im Offline-Modus. Klicken Sie <a href=\"kmail:"
 "goResourceOnline\">hier</a>, um online zu gehen ...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Der Kontakt wurde erfolgreich geändert"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Neue Nachrichten in"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Sie haben keine ungelesenen Nachrichten"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5098,8 +5116,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5193,17 +5211,17 @@
 "Wählen Sie die Übersichtsmodule, die auf der Übersichtsseite angezeigt "
 "werden sollen."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontact-Übersicht"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "Copyright 2004 Tobias Koenig"
@@ -5250,27 +5268,27 @@
 msgid "All"
 msgstr "Alles"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact-Übersicht"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontact-Übersicht"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "Copyright 2003–2019, die Kontact-Entwickler"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5299,7 +5317,7 @@
 msgid "&Reply"
 msgstr "&Antworten"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Antworten ..."
@@ -5309,12 +5327,12 @@
 msgid "Reply to A&uthor..."
 msgstr "An&twort an Verfasser ..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Allen ant&worten ..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "An die Mailing&liste antworten ..."
@@ -5344,7 +5362,7 @@
 msgid "&Edit As New"
 msgstr "Als Neu bear&beiten"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5537,82 +5555,82 @@
 "Suche kann nicht durchgeführt werden. Folgende Fehler wurden gefunden: "
 "<ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Nachrichten suchen"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Suchen"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Im Text ..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Al&s Anhang ..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Anhänge speichern ..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Auswahl aufheben"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Zum ursprünglichen Ordner wechseln"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 Übereinstimmung"
 msgstr[1] "%1 Übereinstimmungen"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Letzte Suche"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Sie haben keinen gültigen Ordner ausgewählt."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Es wurden keine Sammlungen ausgewählt."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Es wurde keine Bedingung definiert."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Alle ausgewählten Ordner sind leer oder nicht indiziert."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Es wurde keine Bedingung hinzugefügt."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5620,32 +5638,32 @@
 "Die Bedingung „Enthält“ kann nicht mit weniger als vier Zeichen verwendet "
 "werden."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Suchvorgang ..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Das Ergebnis der Suche kann nicht eingelesen werden: „%1“"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Suche ist fehlgeschlagen."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Suche abgeschlossen."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Suche abgebrochen."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5656,21 +5674,21 @@
 "Grund dafür ist, dass bereits ein Suchordner mit diesem Namen existiert. Die "
 "Fehlermeldung lautet „%1“"
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Nachricht kopieren"
 msgstr[1] "%1 Nachrichten kopieren"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Nachricht ausschneiden"
 msgstr[1] "%1 Nachrichten ausschneiden"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Index-Status wird geprüft ..."
@@ -5806,7 +5824,7 @@
 "Verwendung)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5814,7 +5832,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5822,26 +5840,26 @@
 msgstr "Dieser Wert legt fest, ob die Einführung zu KMail angezeigt wird."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Ordner-Schnellsuche anzeigen"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Weiterleiten „Im Text“ als Voreinstellung."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Warnen, wenn die Anzahl Empfänger größer ist als:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5853,19 +5871,19 @@
 "Warnung kann abgeschaltet werden."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Rechtschreibprüfung vor dem Versenden"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "A&utomatisch Empfangs- und Lesebestätigungen anfordern"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5882,13 +5900,13 @@
 "eingestellt werden.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Intervall für automatisches Speichern:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5900,13 +5918,13 @@
 "automatische Speichern auch abschalten, indem Sie hier den Wert 0 angeben."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Textbaustein-Werkzeugleiste im E-Mail-Editor anzeigen."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
@@ -5914,139 +5932,139 @@
 "gespeichert"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Eine Liste aller kürzlich verwendeten Adressen (URLs)"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Eine Liste aller kürzlich verwendeten Kodierungen"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Markierung für Verschlüsselung anzeigen"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Standard-Kurzbefehl zum Senden überprüfen"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Die Größe des Indentitätsdialogs (nur zur internen Verwendung)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Die Breite des Suchfensters (nur zur internen Verwendung)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Die Höhe des Suchfensters (nur zur internen Verwendung)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Die Breite des KMail-Einrichtungsdialogs (nur zur internen Verwendung)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Die Höhe des KMail-Einrichtungsdialogs (nur zur internen Verwendung)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Nachrichtenvorschaubereich"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Nachrichtenvorschaubereich nicht anzeigen"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Nachrichtenvorschaubereich unterhalb der Nachrichtenliste anzeigen"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Nachrichtenvorschaubereich neben der Nachrichtenliste anzeigen"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Ordnerliste"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lange Ordnerliste"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kurze Ordnerliste"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Nachrichtenvorlage für neue Nachricht"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Nachrichtenvorlage für Antwort"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Nachrichtenvorlage für Antwort an alle"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Nachrichtenvorlage für Weiterleitung"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Zitatzeichen"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Bestimmt die Regelung beim Anzeigen einer Regelung"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6056,7 +6074,7 @@
 "internen Verwendung)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6066,7 +6084,7 @@
 "Verwendung)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6076,7 +6094,7 @@
 "Verwendung)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6086,7 +6104,7 @@
 "internen Verwendung)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6096,7 +6114,7 @@
 "Verwendung)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6372,7 +6390,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6408,7 +6426,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6746,10 +6764,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Nach E-Mail sehen in"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7380,6 +7397,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Alle „Nicht wieder fragen“-Warnungen reaktivieren"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7435,6 +7462,14 @@
 msgid "Zoom: %1%"
 msgstr "Vergrößerung: %1 %"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Textbausteine"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Nach E-Mail sehen in"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Ordnername und -größe bei Annäherung an Speicherplatzkontingent"
 
@@ -10170,10 +10205,6 @@
 #~ "warning>"
 
 #~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Möchten Sie die Gruppe „%1“ wirklich löschen?"
-
-#~ msgctxt "@info"
 #~ msgid ""
 #~ "Do you really want to remove snippet \"%1\"?<nl/><warning>There is no way "
 #~ "to undo the removal.</warning>"
@@ -11213,9 +11244,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Festlegen, ob der Zugang die vorgegebene Identität verwendet"
 
-#~ msgid "Identity account"
-#~ msgstr "Identitätszugang"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "RID-Pfad zum Postfach, um es auf Änderungen zu überwachen."
 
diff -Nru kmail-19.04.3/po/de/kmail-refresh-settings.po kmail-19.12.3/po/de/kmail-refresh-settings.po
--- kmail-19.04.3/po/de/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/de/kmail-refresh-settings.po	2020-03-03 00:33:57.000000000 +0000
@@ -0,0 +1,104 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Frederik Schwarzer <schwarzer@kde.org>, 2019.
+# Burkhard Lück <lueck@hube-lueck.de>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-09 11:43+0200\n"
+"Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
+"Language-Team: German <kde-i18n-de@kde.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 18.12.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Deutsches KDE-Übersetzerteam,Burkhard Lück"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kde-i18n-de@kde.org,lueck@hube-lueck.de"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "KMail-Assistent zur Erneuerung der Einstellungen"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Erneuerung der Einstellungen für KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Warnung"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Einstellungen aufräumen"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Fertigstellen"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Aufräumen"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Veraltete Einstellungen für „Tipp des Tages“ entfernen: Abgeschlossen"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Dialog-Einstellungen in Datei „%1“ löschen: Abgeschlossen"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Filter-Einstellungen in Datei „%1“ löschen: Abgeschlossen"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Ordner-Einstellungen in Datei „%1“ aufräumen: Abgeschlossen"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Einstellungen zur Dialoggröße in Datei „%1“ aufräumen: Abgeschlossen"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Schließen Sie bitte KMail/Kontact, ehe Sie das Programm benutzen."
diff -Nru kmail-19.04.3/po/de/ktnef.po kmail-19.12.3/po/de/ktnef.po
--- kmail-19.04.3/po/de/ktnef.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/de/ktnef.po	2020-03-03 00:33:57.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-22 20:18+0100\n"
 "Last-Translator: Frederik Schwarzer <schwarzer@kde.org>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
diff -Nru kmail-19.04.3/po/el/akonadi_archivemail_agent.po kmail-19.12.3/po/el/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/el/akonadi_archivemail_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/el/akonadi_archivemail_agent.po	2020-03-03 00:33:58.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2014-11-04 20:47+0200\n"
 "Last-Translator: Dimitris Kardarakos <dimkard@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -182,13 +182,13 @@
 "Αδυναμία προσθήκης δεύτερης αρχειοθήκης για αυτόν το φάκελο. Να γίνει "
 "τροποποίηση του υφιστάμενου."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "Ο κατάλογος δεν υπάρχει. Ελέγξτε τις ρυθμίσεις. Η αρχειοθέτηση αναβάλλεται."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Έναρξη αρχειοθέτησης %1"
diff -Nru kmail-19.04.3/po/el/akonadi_mailfilter_agent.po kmail-19.12.3/po/el/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/el/akonadi_mailfilter_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/el/akonadi_mailfilter_agent.po	2020-03-03 00:33:58.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2014-11-06 12:02+0200\n"
 "Last-Translator: Dimitris Kardarakos <dimkard@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -24,17 +24,17 @@
 msgid "Filter Log Viewer"
 msgstr "Προβολέας καταγραφών φίλτρου"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Καταγραφές δραστηριοτήτων φίλτρου"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -44,23 +44,23 @@
 "καταγραφή δεδομένων συλλέγεται και εμφανίζεται μόνο όταν η καταγραφή είναι "
 "ενεργή. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Λεπτομέρειες καταγραφής"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Περιγραφή μοτίβου καταγραφής"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Αξιολόγηση κανόνων φίλτ&ρου καταγραφής"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -75,34 +75,34 @@
 "θα δοθεί μόνο ανάδραση για το αποτέλεσμα της αξιολόγησης όλων των κανόνων "
 "ενός φίλτρου."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Αξιολόγηση μοτίβου φίλτρου καταγραφής"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Ενέργειες φίλτρου καταγραφής"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Όριο μεγέθους καταγραφής:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "απεριόριστο"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -116,7 +116,7 @@
 "καταγραφής υπερβαίνει το όριο αυτό τότε τα παλαιότερα δεδομένα θα "
 "απορριφθούν μέχρι την παύση της υπέρβασης του ορίου. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -125,63 +125,63 @@
 "Αδυναμία εγγραφής του αρχείου %1:\n"
 "\"%2\" είναι η λεπτομερής περιγραφή σφάλματος."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Σφάλμα του KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Φιλτράρισμα μηνύματος %1 από %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Σφάλμα εφαρμογής μετακίνησης του φίλτρου αλληλογραφίας"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Σφάλμα εφαρμογής διαγραφής του φίλτρου αλληλογραφίας"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Σφάλμα εφαρμογής τροποποιήσεων του φίλτρου αλληλογραφίας"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Αξιολόγηση κανόνων φίλτρου:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Οι κανόνες του φίλτρου ταιριάζουν.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Έναρξη φιλτραρίσματος στο μήνυμα \"%1\" από \"%2\" στο \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Φιλτράρισμα μηνυμάτων"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Οι καταγραφές του φίλτρου αλληλογραφίας είναι ενεργοποιημένες"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Έτοιμο"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Φιλτράρισμα σε %1"
diff -Nru kmail-19.04.3/po/el/akonadi_sendlater_agent.po kmail-19.12.3/po/el/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/el/akonadi_sendlater_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/el/akonadi_sendlater_agent.po	2020-03-03 00:33:58.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2014-03-05 21:53+0200\n"
 "Last-Translator: Dimitris Kardarakos <dimkard@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -60,57 +60,57 @@
 msgid "Your emails"
 msgstr "dimkard@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Προς"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Θέμα"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Αποστολή γύρω"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Επαναλαμβανόμενο"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Αναγνωριστικό μηνύματος"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Κανένα μήνυμα σε αναμονή..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Αποστολή τώρα"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Ναι"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Όχι"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected items? Do you want to continue?"
 msgid "Do you want to delete the selected item?"
@@ -120,70 +120,70 @@
 msgstr[1] ""
 "Θέλετε να διαγραφούν τα επιλεγμένα αντικείμενα; Θέλετε να συνεχίσετε;"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Αφαίρεση αντικειμένων"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Επιθυμείτε την αφαίρεση και των μηνυμάτων;"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Αφαίρεση μηνυμάτων"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, fuzzy, kde-format
 #| msgid "Not message found."
 msgid "Not message found."
 msgstr "Το μήνυμα δεν βρέθηκε."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, fuzzy, kde-format
 #| msgid "Not message found."
 msgid "No message found."
 msgstr "Το μήνυμα δεν βρέθηκε."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Σφάλμα κατά την ανάκτηση του μηνύματος."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Αδυναμία ανάκτησης του μηνύματος. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Αδυναμία δημιουργίας μεταφοράς"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Το μήνυμα δεν αποτελεί ένα πραγματικό μήνυμα"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Αδυναμία αποστολής του μηνύματος."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Το μήνυμα εστάλη"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Βρέθηκε σφάλμα. Επιθυμείτε να το στείλετε ξανά;"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Βρέθηκε σφάλμα"
diff -Nru kmail-19.04.3/po/el/kmail.po kmail-19.12.3/po/el/kmail.po
--- kmail-19.04.3/po/el/kmail.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/el/kmail.po	2020-03-03 00:33:58.000000000 +0000
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2015-11-02 01:45+0200\n"
 "Last-Translator: Stelios <sstavra@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -207,8 +207,8 @@
 msgstr "Πολλαπλά κλειδιά κρυπτογράφησης ανά διεύθυνση"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -316,27 +316,27 @@
 "Το KMail δεν μπόρεσε να εντοπίσει πλήρως μια λίστα αλληλογραφίας σε αυτόν το "
 "φάκελο. Παρακαλώ συμπληρώστε τις διευθύνσεις με το χέρι."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Χώρος"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Χρήση:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% πληρότητα"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 από %2 σε χρήση"
@@ -359,7 +359,7 @@
 "πλήκτρο(α) που θέλετε να συσχετίσετε με αυτόν.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Πρότυπα"
@@ -370,108 +370,108 @@
 msgstr "&Χρήση προσαρμοσμένων προτύπων μηνύματος για αυτόν το φάκελο"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "Αντιγρα&φή καθολικών προτύπων"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Προβολή"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Χρήση προσαρμοσμένων ε&ικονιδίων"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "Κα&νονικό:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Μη αναγνωσμένο:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Εμφάνιση στήλης αποστολέα/παραλήπτη στη λίστα μηνυμάτων"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Εμφάνιση &στήλης:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Αποστολέας"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Παραλήπτης"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Λίστα μηνυμάτων"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Χρήση της προκαθορισμένης άθροισης"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Άθροιση"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Χρήση του προκαθορισμένου θέματος"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Θέμα"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Προκαθορισμένη μορφή μηνύματος"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "Προτίμηση HTML αντί για απλό κείμενο"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &Plain Text to HTML"
 msgid "Prefer text to HTML"
 msgstr "Προτίμηση &απλού κειμένου αντί για HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Use Global Setting"
 msgid "Use Global Settings"
@@ -482,103 +482,108 @@
 msgid "Retrieval Options"
 msgstr "Επιλογές ανάκτησης"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Ταυτότ&ητα"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Λήψη"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Αποστολή"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Λογαριασμοί εξερχομένων (προσθέστε τουλάχιστον ένα):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Κοινές επιλογές"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Επι&βεβαίωση πριν την αποστολή"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Έλεγχος ορθογραφίας πριν την αποστολή"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Ποτέ αυτόματα"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Κατά το χειροκίνητο έλεγχο"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Σε όλους τους ελέγχους"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Αποστολή τώρα"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Αποστολή αργότερα"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Αποστολή μηνυμάτων στο &φάκελο εξερχομένων:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Προκαθορισμέν&η μέθοδος αποστολής:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Προσθήκη λογαριασμού"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "Προσαρμογή προτεραιότητας λογαριασμών..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -588,30 +593,30 @@
 "Αδυναμία εκκίνησης του οδηγού λογαριασμού. Παρακαλώ ελέγξτε την εγκατάστασή "
 "σας."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Αδυναμία εκκίνησης οδηγού λογαριασμού"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Συμπερίληψη στο χειροκίνητο έ&λεγχο αλληλογραφίας"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Αλλαγή σε εκτός σύνδεσης κατά τον τερματισμό του KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Έλεγχος αλληλογραφίας κατά την εκκίνηση"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -669,7 +674,7 @@
 msgid "Fixed Width Font"
 msgstr "Γραμματοσειρά σταθερού πλάτους"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Σύνταξη μηνύματος"
@@ -980,61 +985,61 @@
 "Δεν μπορούμε να δημιουργήσουμε την ετικέτα. Μια ετικέτα με το ίδιο όνομα ήδη "
 "υπάρχει."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Γενικά"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Τυπικά πρότυπα"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Προσαρμοσμένα πρότυπα"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Θέμα"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Σύνολο χαρακτήρων"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Επικεφαλίδες"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Συνημμένα"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autocorrection"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Αυτόματη αλλαγή μεγέθους εικόνας"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Υπογραφή"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1043,12 +1048,12 @@
 "Αυτόματη εισαγωγή της διαμορφωμένης υπογραφής\n"
 "κατά την έναρξη σύνταξης ενός μηνύματος"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Εισαγωγή της υπογραφής πάνω από το κείμενο σε παράθεση"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1057,18 +1062,18 @@
 "Εισαγωγή του διαχωριστή υπογραφής συμβατού RFC\n"
 "(δυο παύλες και ένα κενό ανά γραμμή) πριν την υπογραφή"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Κατά την απάντηση, να μην παραθέτεται οποιαδήποτε υπάρχουσα υπογραφή "
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Μορφή"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1079,7 +1084,7 @@
 "(αντί ολόκληρου του μηνύματος), αν\n"
 "υπάρχει επιλεγμένο κείμενο στο παράθυρο μηνύματος."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1091,17 +1096,17 @@
 "προσθήκη\n"
 "μιας επιπλέον διακοπής γραμμής κατά την αναδίπλωση λέξεων του κειμένου."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Ενεργοποίηση της αυτόματης αναδίπλωσης λέξεων στο καθορισμένο πλάτος"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Καθορισμός του πλάτους κειμένου για την αυτόματη αναδίπλωση λέξεων"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1113,7 +1118,7 @@
 "μορφή ή διαφορετικά, αν δεν είναι επιλεγμένο, η απάντηση\n"
 "θα γίνει σε απλό κείμενο από προεπιλογή."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1124,34 +1129,34 @@
 "Υποστηρίζονται Έντονα, Πλάγια και υπογραμμισμένο κείμενο, λίστες,\n"
 "και εξωτερικές αναφορές."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Εμβόλιμα"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Σαν συνημμένο"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Καθορισμός της εξ ορισμού μορφής του προωθημένου μηνύματος."
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Προκαθορισμένος τύπος προώθησης:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Παραλήπτες"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1163,17 +1168,17 @@
 "Μπορείτε να την ζητάτε για κάθε μήνυμα με το μενού «Επιλογές - Αίτηση "
 "ειδοποίησης παράδοσης»"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Προειδοποίηση αν καθοριστούν πολλοί παραλήπτες"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Καθορισμός του μεγίστου αριθμού παραληπτών για την προειδοποίηση "
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1191,7 +1196,7 @@
 "Σημειώστε, ότι δεν λαμβάνεται υπόψη τις λίστες διανομής ή τις λίστες "
 "αλληλογραφίας."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1200,18 +1205,18 @@
 "Απομνημόνευση των εισαγμένων διευθύνσεων,\n"
 "και διάθεση αυτών στη συμπλήρωση παραλήπτη"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Χωρίς αποθήκευση"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Όριο διατηρουμένων πρόσφατων διευθύνσεων:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1220,25 +1225,25 @@
 "Ο μέγιστος αριθμός των πρόσφατων διευθύνσεων που θα\n"
 "διατηρούνται για την αυτόματη συμπλήρωση"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Διαμόρφωση της σειράς συμπλήρωσης..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Χωρίς αυτόματη αποθήκευση"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Χωρίς αυτόματη αποθήκευση"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1246,18 +1251,18 @@
 msgstr[0] " λεπτό"
 msgstr[1] " λεπτά"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Αυτόματη αποθήκευση του μηνύματος στο συγκεκριμένο χρονικό διάστημα"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Προθέματα θέματος &απάντησης"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1266,59 +1271,59 @@
 "Αναγνώριση οποιουδήποτε συνδυασμού από τα ακόλουθα προθέματα\n"
 "(οι καταχωρήσεις είναι κανονικές εκφράσεις χωρίς διάκριση πεζών/κεφαλαίων):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Προσ&θήκη..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Αφαίρεση"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Επεξεργασία..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Εισάγετε νέο πρόθεμα απάντησης:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Προθέματα θέματος &προώθησης"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Προσθήκη..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Αφαίρεση"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Τροποποίηση..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Εισάγετε νέο πρόθεμα προώθησης:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1328,90 +1333,90 @@
 "ένα σύνολο χαρακτήρων που να περιέχει όλους τους χαρακτήρες του μηνύματος."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Τροποποίηση..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Εισάγετε σύνολο χαρακτήρων:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Διατήρηση αυθεντι&κού συνόλου χαρακτήρων σε απαντήσεις ή προωθήσεις (αν "
 "είναι δυνατό)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Αυτό το σύνολο χαρακτήρων δεν υποστηρίζεται."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Χρήση προσαρμοσμένου επιθέματος message-id"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Προσαρμοσμένο επίθεμα message-&id:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Ορισμός προσαρμοσμένων mime πεδίων κεφαλίδων:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Όνομα"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Τιμή"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Νέο"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "Ό&νομα:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Τιμή:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "Μη έγκυρη ημερομηνία"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Ονομασία συνημμένων συμβατή με το Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1420,41 +1425,41 @@
 "Ενεργοποιήστε αυτή την επιλογή για να κάνετε το Outlook(tm) να καταλαβαίνει "
 "ονόματα συνημμένων με μη αγγλικούς χαρακτήρες"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Ενεργοποίηση ανίχνευσης έλλειψης συνημμένων"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Αναγνώριση οποιασδήποτε από τις ακόλουθες λέξεις κλειδιά ως πρόθεση για "
 "επισύναψη ενός αρχείου:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Εισάγετε νέα λέξη κλειδί:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Έχει επισύναψη"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " KB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Χωρίς όριο"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1549,7 +1554,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Σύνταξη μηνύματος"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1667,7 +1672,7 @@
 msgid "Archive Folder"
 msgstr "Αρχειοθέτηση του φακέλου"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1733,19 +1738,19 @@
 msgid "Notification"
 msgstr "Ειδοποίηση"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 συνημμένο: (%2)"
 msgstr[1] "%1 συνημμένα: (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Απόκρυψη λίστας συνημμένων"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Εμφάνιση λίστας συνημμένων"
@@ -1762,339 +1767,339 @@
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Επιλογή λεξικού προς χρήση ορθογραφικού ελέγχου για αυτό το μήνυμα"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Επιλογή του φακέλου απεσταλμένων όπου θα σωθεί ένα αντίγραφο αυτού του "
 "μηνύματος"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 "Επιλογή του λογαριασμού εξερχομένων που θα χρησιμοποιηθεί για την αποστολή "
 "αυτού του μηνύματος"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 "Καθορίστε την διεύθυνση ηλ. αλληλογραφίας για το πεδίο «Από:» για αυτό το "
 "μήνυμα"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Επιλογή θέματος για αυτό το μήνυμα"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Ταυτότητα:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Λεξικό:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Φάκελος απεστα&λμένων:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Μεταφορέας &αλληλογραφίας:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Από:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Θέμα:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Αποστολή αλληλογραφίας"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Α&ποστολή αλληλογραφίας μέσω"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Αποστολή"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Αποστολή αρ&γότερα"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Αποστολή αργό&τερα μέσω"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Σε αναμονή"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Αποθήκευση ως &προσχέδιο"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Αποθήκευση μηνύματος στο φάκελο με τα προσχέδια"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Αποθήκευση ως πρό&τυπο"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Αποθήκευση μηνύματος στο φάκελο προτύπων"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Αποθήκευση ως α&ρχείο"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Αποθήκευση μηνύματος ως κείμενο ή html αρχείο"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Εισαγωγή αρχείου κειμένου..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Ε&ισαγωγή πρόσφατου αρχείου κειμένου"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Βιβλίο διευθύνσεων"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Άνοιγμα βιβλίου διευθύνσεων"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Νέο παράθυρο σύνταξης"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Επιλογή &παραληπτών..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Αποθήκευση λίστας &διανομής..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Επικόλληση ως &συνημμένο"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Καθαρισμός κενών"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Χρήση γραμματοσειράς &σταθερού πλάτους"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Επείγον"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Αίτηση ειδοποίησης παράδοσης"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Αίτηση ειδοποίησης παράδοσης"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Ανα&δίπλωση λέξεων"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Δείγματα"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Αυτόματος ορθογραφικός έλεγχος"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Επεξεργασία εμπλουτισμένου κείμενου"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Εμπλουτισμένο κείμενο"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 "Εναλλαγή ενεργοποίησης λειτουργίας επεξεργασίας εμπλουτισμένου κειμένου"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Ό&λα τα πεδία"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "Ταυτότ&ητα"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Λεξικό"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Φάκελ&ος απεσταλμένων"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Μεταφορέας &αλληλογραφίας"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Από"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Θέμα"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Υπογραφή στο &τέλος"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Υπογραφή στην &αρχή"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Εισαγωγή υπογραφής στη θέση &δρομέα"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Ελεγκτής &ορθογραφίας..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Ελεγκτής ορθογραφίας"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Κρυ&πτογράφηση μηνύματος"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Κρυπτογράφηση"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Υπογραφή μηνύματος"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Υπογραφή"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Μορφή &κρυπτογράφησης μηνύματος"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Επιλέξτε μια μορφή κρυπτογράφησης για αυτό το μήνυμα"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "Αναζήτηση μ&ηνυμάτων..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Διαμόρφωση του KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2103,53 +2108,53 @@
 "<qt>Αυτό θα κρύψει εντελώς τη γραμμή μενού. Μπορείτε να την αποκαλύψετε πάλι "
 "πληκτρολογώντας %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Απόκρυψη της γραμμή μενού"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Γραμμή: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Στήλη: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ΕΠΚ"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "ΕΙΣ"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Έλεγχος ορθογραφίας: ενεργός"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Έλεγχος ορθογραφίας: ανενεργός"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Νέα απο&θήκευση ως πρότυπο"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Αποθήκευ&ση ως προσχέδιο"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2158,7 +2163,7 @@
 "Νέα αποθήκευση αυτού του μηνύματος στο φάκελο προτύπων. Έτσι μπορείτε να το "
 "χρησιμοποιήσετε στο μέλλον."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2167,85 +2172,85 @@
 "Αποθήκευση αυτού του μηνύματος στο φάκελο προσχεδίων. Μπορείτε να το "
 "επεξεργαστείτε και να το αποστείλετε αργότερα."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
 "Επιθυμείτε την απόρριψη του μηνύματος, ή την αποθήκευσή του για αργότερα;"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Κλείσιμο παραθύρου σύνταξης"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Η αυτόματη αποθήκευση μηνύματος απέτυχε"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Η αποστολή του μηνύματος απέτυχε"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Εισαγωγή περιεχομένων αρχείου"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Προσθήκη ως &εμβόλιμη εικόνα"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Προσθήκη ως &συνημμένο"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Όνομα του συνημμένου:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "Μη έγκυρη ημερομηνία"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Προσθήκη του URL στο μήνυμα"
 msgstr[1] "Προσθήκη των URL στο μήνυμα"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Προσθήκη αρχείου ως συνημμένου"
 msgstr[1] "Προσθήκη σαν συνημμένο"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Εισαγωγή κειμένου του προχείρου ως συνημμένο"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "ανώνυμο"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2258,12 +2263,12 @@
 "κρυπτογράφησης για χρήση.</p><p>Παρακαλώ επιλέξτε το κλειδί(α) για χρήση στη "
 "διαμόρφωση της ταυτότητας.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Μη ορισμένο κλειδί κρυπτογράφησης"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2275,12 +2280,12 @@
 "p><p>Παρακαλώ επιλέξτε το κλειδί για χρήση στη διαμόρφωση της ταυτότητας.</"
 "p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Μη ορισμένο κλειδί υπογραφής"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2291,7 +2296,7 @@
 "θα πρέπει να ορίσετε τη διεύθυνσή για όλες τις ταυτότητες, ώστε να μη "
 "χρειάζεται να την εισάγετε σε κάθε μήνυμα."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2300,37 +2305,37 @@
 "Πρέπει να ορίσετε τουλάχιστον έναν παραλήπτη, είτε στο πεδίο 'Προς:' ή σαν "
 "κοινοποίηση ή σαν κρυφή κοινοποίηση."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Δεν καθορίσατε το πεδίο Προς:. Να σταλεί το μήνυμα έτσι κι αλλιώς;"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Δεν έχει καθορισθεί το πεδίο Προς:"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Δεν καθορίσατε κάποιο θέμα. Να σταλεί το μήνυμα έτσι κι αλλιώς;"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Δεν έχει καθορισθεί θέμα"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Αποστολή ό&πως είναι"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Καθορισμός του θέματος"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2339,22 +2344,22 @@
 "Πρέπει να ορίσετε τουλάχιστον έναν παραλήπτη για να μπορέσετε να "
 "κρυπτογραφήσετε ένα προσχέδιο."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Έτοιμο για αποστολή αλληλογραφίας..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Αποστολή επιβεβαίωσης"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Απο&στολή τώρα"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2363,22 +2368,22 @@
 "Προσπαθείτε να στείλετε το μήνυμα σε περισσότερους από %1 παραλήπτες. "
 "Αποστολή του μηνύματος;"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Πάρα πολλοί παραλήπτες"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Αποστολή όπως είναι"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Επεξεργασία παραληπτών"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2387,43 +2392,43 @@
 "Η απενεργοποίηση της λειτουργίας HTML θα προκαλέσει την απώλεια της "
 "μορφοποίησης του κειμένου. Είστε σίγουρος/η;"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Απώλεια της μορφοποίησης;"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Απώλεια μορφοποίησης"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Προσθήκη σήμανσης ως απλό κείμενο"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2431,7 +2436,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2509,14 +2514,14 @@
 msgid "External editor was started."
 msgstr "Ο εξωτερικός επεξεργαστής ξεκίνησε."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
@@ -2524,7 +2529,7 @@
 "Δεν καθορίστηκε φάκελος αρχειοθέτησης. Παρακαλώ ελέγξτε τις ρυθμίσεις του "
 "λογαριασμού %1"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2533,7 +2538,7 @@
 "Δεν καθορίστηκε φάκελος αρχειοθέτησης. Παρακαλώ ελέγξτε τις ρυθμίσεις του "
 "λογαριασμού %1"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2563,11 +2568,6 @@
 msgid "Message will not be encrypted"
 msgstr "Το μήνυμα δεν θα έχει κρυπτογράφηση"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Δείγματα κειμένου"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2616,27 +2616,27 @@
 msgid "Cannot move messages."
 msgstr "Αδυναμία μετακίνησης των μηνυμάτων."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Απέτυχε η ανάκτηση του φακέλου. Αναφέρθηκε το σφάλμα: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Δεν επιστράφηκε φάκελος."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Απέτυχε η ανάκτηση του γονικού φακέλου. Αναφέρθηκε το σφάλμα: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Αδυναμία επιστροφής της λίστας φακέλων."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Τα μηνύματα αρχειοθετήθηκαν"
@@ -2677,50 +2677,50 @@
 msgid "&Existing identities:"
 msgstr "Υπάρχουσ&ες ταυτότητες:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Σφάλμα κατά τη μετονομασία του φακέλου %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Εισάγετε νέα λέξη κλειδί:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Επεξεργασία ταυτότητας"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Γενικά"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Το όνομα σας:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2732,12 +2732,12 @@
 "p><p>Αν το αφήσετε κενό, θα εμφανίζεται μόνο η διεύθυνση αλληλογραφίας σας.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Ορ&γανισμός:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2748,12 +2748,12 @@
 "σας όπως θέλετε να εμφανίζεται στην κεφαλίδα του μηνύματος που θα αποσταλεί."
 "</p><p>Είναι ασφαλές (και τυπικό) να το αφήσετε κενό.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Διεύθυνση &αλληλογραφίας:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2770,12 +2770,12 @@
 "διευθύνσεων στο παρακάτω πεδίο.</p><p>Αν το αφήσετε κενό, ή το γράψετε "
 "λάθος, οι παραλήπτες σας θα έχουν πρόβλημα να σας απαντήσουν.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Ψευδώνυμα ηλ. α&λληλογραφίας:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2792,12 +2792,12 @@
 "tr><tr><th>Ψευδώνυμα:</th><td>first@example.org<br>last@example.org</td></"
 "tr></table><p>Πληκτρολογήστε ένα ψευδώνυμα διεύθυνσης ανά γραμμή.</p></qt> "
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Κρυπτογράφηση"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2819,12 +2819,12 @@
 "ηλ. αλληλογραφίας δεν θα επηρεαστούν.</p><p>Μπορείτε να μάθετε περισσότερα "
 "για τα κλειδιά στο: <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Κλειδί υπογραφής OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2850,12 +2850,12 @@
 "να μάθετε περισσότερα για τα κλειδιά στο: <a>http://www.gnupg.org</a></p></"
 "qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Κλειδί κρυπτογράφησης OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2868,12 +2868,12 @@
 "το KMail δεν θα είναι σε θέση να υπογράφει ψηφιακά τα μηνύματά σας με χρήση "
 "S/MIME. Οι κανονικές λειτουργίες αλληλογραφίας δεν θα επηρεαστούν.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Πιστοποιητικό υπογραφής S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2889,40 +2889,40 @@
 "κρυπτογραφημένα αντίγραφα των εξερχομένων μηνυμάτων σας, με χρήση S/MIME, "
 "στον εαυτό σας. Οι υπόλοιπες λειτουργίες δεν θα επηρεαστούν.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Πιστοποιητικό κρυπτογράφησης S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Προτιμώμενη μορφή:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Αυτόματη υπογραφή μηνυμάτων"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Αυτόματη κρυπτογράφηση μηνυμάτων &αν γίνεται"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Διεύθυνση απάντ&ησης:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2940,12 +2940,12 @@
 "<tt>Από:</tt>, αλλά οι απαντήσεις να στέλνονται σε μία ομαδική διεύθυνση.</"
 "p><p>Αν δεν είστε σίγουροι για τη χρήση της, αφήστε την κενή.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Διευθύνσεις κοι&νοποίησης:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2963,12 +2963,12 @@
 "να διαχωρίσετε τη λίστα παραληπτών CC.</p><p>Αν έχετε αμφιβολίες, αφήστε "
 "αυτό το πεδίο κενό.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Διευθύνσεις &κρυφής κοινοποίησης:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2987,57 +2987,57 @@
 "διαχωρίσετε τη λίστα παραληπτών BCC.</p><p>Αν έχετε αμφιβολίες, αφήστε κενό "
 "αυτό το πεδίο.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Λεξικό:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Φάκελος απεσταλμένων:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Φάκελος προσχε&δίων:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Φάκελος &προτύπων:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Λογαριασμός εξερχομένων:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Επισύναψη της κάρτας μου vCard στο μήνυμα"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Δημιουργία..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Γλώσσα αυτόματης διόρθωσης:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Επαναφορά προκαθορισμένου ονόματος τομέα"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "&Προκαθορισμένος τομέας:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3046,33 +3046,33 @@
 "<qt><p>Ο προκαθορισμένος τομέας χρησιμεύει στη συμπλήρωση διευθύνσεων ηλ. "
 "αλληλογραφίας που περιέχουν μόνο το όνομα χρήστη.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Χρήση προσαρμοσμένων προτύπων μηνύματος για αυτήν την ταυτότητα"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Υπογραφή"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Εικόνα"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Μη έγκυρο ψευδώνυμο ηλ. αλληλογραφίας «%1»"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Μη έγκυρη διεύθυνση ηλ. αλληλογραφίας"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3086,7 +3086,7 @@
 "κατά την προσπάθεια επαλήθευσης υπογραφών που δημιουργήθηκαν με αυτή τη "
 "διαμόρφωση."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3096,7 +3096,7 @@
 "χρήστη με τη διαμορφωμένη διεύθυνση ηλ. αλληλογραφίας για αυτή την ταυτότητα "
 "(%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3111,7 +3111,7 @@
 "κατά την προσπάθεια επαλήθευσης υπογραφών που δημιουργήθηκαν με αυτή τη "
 "διαμόρφωση."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3121,22 +3121,22 @@
 "χρήστη με τη διαμορφωμένη διεύθυνση ηλ. αλληλογραφίας για αυτή την ταυτότητα "
 "(%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Η διεύθυνση ηλ. αλληλογραφίας δεν βρέθηκε στα κλειδιά/πιστοποιητικά"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Το αρχείο υπογραφής δεν είναι έγκυρο"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Επεξεργασία ταυτότητας \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3148,7 +3148,7 @@
 "Ο προσαρμοσμένος φάκελος προσχεδίων για την ταυτότητα \"%1\" δεν υπάρχει "
 "(πια), και γι' αυτό θα χρησιμοποιηθεί ο προκαθορισμένος φάκελος προσχεδίων."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Επεξεργασία..."
@@ -3180,6 +3180,21 @@
 msgid "We cannot delete vCard file."
 msgstr "Δεν μπορούμε να διαγράψουμε το αρχείο vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "Do you really want to remove this group and all its snippets?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+"Θέλετε πραγματικά να αφαιρέσετε αυτή την ομάδα και όλα τα δείγματά της;"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Αποστολή επιβεβαίωσης"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3351,7 +3366,7 @@
 "Παραδείγματα υπάρχουν στο <a href=\"http://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Εικόνα"
@@ -3385,7 +3400,7 @@
 msgstr[0] "Η λίστα διανομής %2 είναι άδεια, δεν μπορεί να χρησιμοποιηθεί."
 msgstr[1] "Οι λίστες διανομής %2 είναι άδειες, δεν μπορούν να χρησιμοποιηθούν."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Προσθήκη στο βιβλίο διευθύνσεων"
@@ -3395,22 +3410,22 @@
 msgid "Contact created successfully"
 msgstr "Η επαφή δημιουργήθηκε επιτυχώς"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Αδυναμία αποθήκευσης της επαφής: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Αποτυχία αποθήκευσης της επαφής"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Θέλετε να επισυνάψετε αυτόν το φάκελο «%1»;"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Επισύναψη φακέλου"
@@ -3630,7 +3645,7 @@
 msgstr "&Φάκελος"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3638,7 +3653,7 @@
 msgstr "&Εφαρμογή όλων των φίλτρων στο φάκελο"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current Folder & All Subfolders"
@@ -3665,7 +3680,7 @@
 msgstr "Προώ&θηση"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Εφαρμογή φίλτρου"
@@ -3690,7 +3705,7 @@
 msgstr "&Βοήθεια"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Κύρια γραμμή εργαλείων"
@@ -3747,12 +3762,12 @@
 msgid "The file does not contain a message."
 msgstr "Αυτό το αρχείο δεν περιέχει μήνυμα."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Αυτό το αρχείο περιέχει πολλαπλά μηνύματα. Μόνο το πρώτο εμφανίζεται."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3761,32 +3776,32 @@
 "Επιθυμείτε την προώθηση των επιλεγμένων μηνυμάτων ως συνημμένα σε ένα μήνυμα "
 "(ως σύνοψη MIME) ή ως ανεξάρτητα μηνύματα;"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Αποστολή σύνοψης"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Αποστολή ανεξάρτητα"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Φιλτράρισμα μηνυμάτων"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Φιλτράρισμα μηνύματος %1 από %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Μετακίνηση μηνυμάτων"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Διαγραφή μηνυμάτων"
@@ -3815,31 +3830,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Γραμμή εργαλείων κατεύθυνσης κειμένου"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "Το KMail λειτουργεί χωρίς σύνδεση. Όλες οι δικτυακές εργασίες έχουν ανασταλεί"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Έτοιμο για αποστολή αλληλογραφίας..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "Το KMail λειτουργεί με σύνδεση. Όλες οι δικτυακές εργασίες συνεχίζονται"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3848,41 +3863,41 @@
 "Η ρύθμιση της κατάστασης λειτουργίας του KMail είναι σε σύνδεση. Όλες οι "
 "δικτυακές εργασίες θα συνεχίσουν όταν εντοπιστεί μια σύνδεση με το δίκτυο"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 "Το KMail είναι σε λειτουργία χωρίς σύνδεση. Πώς επιθυμείτε να συνεχίσετε;"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Με σύνδεση/χωρίς σύνδεση"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Εργασία με σύνδεση"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Εργασία χωρίς σύνδεση"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "Εντοπίστηκε σύνδεση με το δίκτυο, όλες οι δικτυακές εργασίες συνεχίζονται"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Δεν εντοπίστηκε κάποια σύνδεση σε ένα δίκτυο, όλες οι εργασίες δικτύου θα "
 "ανασταλούν"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3891,12 +3906,12 @@
 "Αδυναμία ανοίγματος του αρχείου αυτόματης αποθήκευσης στο %1.\n"
 "Αιτία: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Το άνοιγμα του αρχείου αυτόματης αποθήκευσης απέτυχε"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3908,7 +3923,7 @@
 "Αυτές οι %1 ταυτότητες τροποποιήθηκαν ώστε να χρησιμοποιούν τον "
 "προκαθορισμένο μεταφορέα:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3920,46 +3935,49 @@
 "Αυτές οι %1 ταυτότητες τροποποιήθηκαν ώστε να χρησιμοποιούν τον "
 "τροποποιημένο μεταφορέα:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Αποστολή μηνυμάτων"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Αρχικοποίηση διαδικασίας αποστολής..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Ο πόρος %1 είναι σπασμένος."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Ο πράκτορας αλληλογραφίας αρχειοθήκης δεν καταχωρήθηκε."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 "Ο πράκτορας ετεροχρονισμένης αποστολής της αλληλογραφίας δεν καταχωρήθηκε."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Send Later Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 "Ο πράκτορας ετεροχρονισμένης αποστολής της αλληλογραφίας δεν καταχωρήθηκε."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3969,12 +3987,12 @@
 "Αδυναμία εκκίνησης του διαχειριστή πιστοποιητικών. Παρακαλώ ελέγξτε την "
 "εγκατάστασή σας."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Σφάλμα του KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3984,26 +4002,30 @@
 "Αδυναμία εκκίνησης του οδηγού εισαγωγής. Παρακαλώ ελέγξτε την εγκατάστασή "
 "σας."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Αδυναμία εκκίνησης του οδηγού εισαγωγής"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Αδυναμία εκκίνησης του προγράμματος «Εξαγωγέας ρυθμίσεων PIM». Ελέγξτε την "
 "εγκατάστασή σας."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Αδυναμία εκκίνησης του προγράμματος «Εξαγωγέας ρυθμίσεων PIM»"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -4013,72 +4035,72 @@
 "Αδυναμία εκκίνησης του οδηγού εισαγωγής. Παρακαλώ ελέγξτε την εγκατάστασή "
 "σας."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Αδυναμία εκκίνησης του οδηγού εισαγωγής"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Ένα άλλο πρόγραμμα ηλ. αλληλογραφίας βρέθηκε στο σύστημα. Θέλετε να κάνετε "
 "εισαγωγή δεδομένων από αυτό;"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Αδυναμία εκκίνησης του οδηγού εισαγωγής. Παρακαλώ ελέγξτε την εγκατάστασή "
 "σας."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Κανένα θέμα"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(κανένα πρότυπο)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Αυτός ο φάκελος δεν έχει ορισμένη καμία επιλογή λήξης"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Επιθυμείτε πραγματικά τη λήξη του φακέλου <b>%1</b>;</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Λήξη φακέλου"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Λή&ξη"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Μετακίνηση στα απορρίμματα"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Επιθυμείτε πραγματικά να αδειάσετε το φάκελο των απορριμμάτων;"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4087,27 +4109,27 @@
 "<qt>Επιθυμείτε πραγματικά να μετακινήσετε όλα τα μηνύματα από το φάκελο <b>"
 "%1</b> στα απορρίμματα;</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Όλα τα μηνύματα μετακινήθηκαν στα απορρίμματα"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Επιθυμείτε πραγματικά τη λήξη όλων των παλιών μηνυμάτων;"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Λήξη παλιών μηνυμάτων;"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Λήξη"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4119,17 +4141,17 @@
 "αυξήσει την πιθανότητα άλωσης του συστήματός σας μέσω των τωρινών και "
 "μελλοντικών προβλημάτων ασφαλείας."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Προειδοποίηση ασφαλείας"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Φόρτωση εξωτερικών αναφορών"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4144,538 +4166,538 @@
 "<qt>Επιθυμείτε πραγματικά τη διαγραφή των %1 επιλεγμένων μηνυμάτων;<br /"
 ">Μετά τη διαγραφή, δεν υπάρχει τρόπος να τα ανακτήσετε.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Διαγραφή μηνυμάτων"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Διαγραφή μηνύματος"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Μετακίνηση μηνυμάτων..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Διαγραφή μηνυμάτων..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Τα μηνύματα διαγράφηκαν με επιτυχία."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Τα μηνύματα μετακινήθηκαν με επιτυχία."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Η διαγραφή των μηνυμάτων απέτυχε."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Η διαγραφή των μηνυμάτων ακυρώθηκε."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Η μετακίνηση των μηνυμάτων απέτυχε."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Η μετακίνηση των μηνυμάτων ακυρώθηκε."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Μετακίνηση μηνυμάτων σε άλλο φάκελο"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Αντιγραφή μηνυμάτων..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Τα μηνύματα αντιγράφηκαν με επιτυχία."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Η αντιγραφή των μηνυμάτων απέτυχε."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Η αντιγραφή των μηνυμάτων ακυρώθηκε."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Αντιγραφή μηνυμάτων στο φάκελο"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Μετακίνηση μηνυμάτων στα απορρίμματα..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Μετακίνηση μηνυμάτων στα απορρίμματα..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Τα μηνύματα μετακινήθηκαν στα απορρίμματα με επιτυχία."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Τα μηνύματα μετακινήθηκαν στα απορρίμματα με επιτυχία."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Η μετακίνηση των μηνυμάτων στο απορρίμματα απέτυχε."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Η μετακίνηση των μηνυμάτων στο απορρίμματα απέτυχε."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Η μετακίνηση των μηνυμάτων στα απορρίμματα ακυρώθηκε."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Η μετακίνηση των μηνυμάτων στα απορρίμματα ακυρώθηκε."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Μετάβαση στο φάκελο"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Αποθήκευση &ως..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Λή&ξη των παλιών μηνυμάτων στους φακέλους"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Έλεγχος &αλληλογραφίας"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Έλεγχος αλληλογραφίας στο"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Έλεγχος αλληλογραφίας"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Αποστολή των μηνυμάτων &σε αναμονή"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Κατάσταση σύνδεσης (άγνωστη)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Αποστολή των μηνυμάτων σε αναμονή μέσω"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Διαχειριστής πιστοποιητικών"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "Ε&ισαγωγή μηνυμάτων..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Αποσφαλμάτωση Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Προβο&λέας καταγραφών φίλτρου..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Επεξεργασία απαντήσεων \"Εκτός γραφείου\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Διαμόρφωση της αυτόματης αρχειοθέτησης..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Καθυστερημένα μηνύματα..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "Αναζήτηση μ&ηνυμάτων..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Διαγραφή"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Μετακίνηση νήματος στα απορρίμμα&τα"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Μετακίνηση νήματος στα απορρίμματα"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Δια&γραφή νήματος"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Αναζήτηση μ&ηνυμάτων..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Επιλογή ό&λων των μηνυμάτων"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Διαχείριση λίστας τα&χυδρομείου..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Ορισμός συντόμευσης..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Ρυθμίσεις &λήξης"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Αρχειοθέτηση φακέλου..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Φόρτωση ε&ξωτερικών αναφορών"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Αντιγραφή μηνύματος προς..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Μετακίνηση μηνύματος προς..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Νέο μήνυμα..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Νέο"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Μήνυμα από &πρότυπο"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Νέο μήνυμα &σε λίστα ταχυδρομείου..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Δ&ημιουργία φίλτρου"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Φίλτρο &στο Θέμα..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "&Φίλτρο στο Από..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Φίλ&τρο στο Προς..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Φίλ&τρο στο Προς..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Σημείωση νήμα&τος"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Σημείωση νήματος σαν &αναγνωσμένο"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Σημείωση όλων των μηνυμάτων στο επιλεγμένο νήμα σαν αναγνωσμένα"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Σημείωση νήματος σαν &μη αναγνωσμένο"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Σημείωση όλων των μηνυμάτων στο επιλεγμένο νήμα σαν μη αναγνωσμένα"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Σημείωση νήματος ως &σημαντικό"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Αφαίρεση σημείωσης &σημαντικού νήματος"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Σημείωση νήματος για &ενέργεια"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Αφαίρεση σημείωσης μηνύματος &ενέργειας"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Παρακολούθηση νήματος"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Παρά&βλεψη νήματος"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Αποθήκευ&ση συνημμένων..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Αντιγραφή αντικειμένου προς..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "&Εφαρμογή όλων των φίλτρων"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Ανάπτυξη νήματος / ομάδας"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Ανάπτυξη του τρέχοντος νήματος ή ομάδας"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Σύμπτυξη νήματος / ομάδας"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Σύμπτυξη του τρέχοντος νήματος ή ομάδας"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ανά&πτυξη όλων των νημάτων"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Ανάπτυξη όλων των νημάτων στον τρέχοντα φάκελο"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Σύμπ&τυξη όλων των νημάτων"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Σύμπτυξη όλων των νημάτων στον τρέχοντα φάκελο"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Εμφάνι&ση μηνύματος"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Επόμε&νο μήνυμα"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Μετάβαση στο επόμενο μήνυμα"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Επόμενο μη αναγνωσμένο μήν&υμα"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Επόμενο"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Μετάβαση στο επόμενο μη αναγνωσμένο μήνυμα"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Προηγούμενο μήνυμα"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Μετάβαση στο προηγούμενο μήνυμα"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Προηγούμενο μη αναγνωσμένο &μήνυμα"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Μετάβαση στο προηγούμενο μη αναγνωσμένο μήνυμα"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Επόμενος μη αναγνωσμένος &φάκελος"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Μετάβαση στον επόμενο φάκελο με μη αναγνωσμένα μηνύματα"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Προηγούμενος μη αναγνωσμένος φάκελ&ος"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Μετάβαση στον προηγούμενο φάκελο με μη αναγνωσμένα μηνύματα"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Επόμενο μη αναγνω&σμένο κείμενο"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Μετάβαση στο επόμενο μη αναγνωσμένο κείμενο"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4684,222 +4706,228 @@
 "Κύλιση κειμένου στο τρέχον μήνυμα. Όταν φτάσει το τέλος, μετάβαση στο "
 "επόμενο μη αναγνωσμένο μήνυμα."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Διαμόρφωση &φίλτρων..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Διαχείριση σεναρίων &Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Προσθήκη λογαριασμού"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Παρουσίαση του KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Εμφάνιση της σελίδας καλωσορίσματος του KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Διαμόρφωση &ειδοποιήσεων..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Διαμόρφωση του KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Λήξη..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Προσθήκη αγαπημένου φακέλου..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Εγγραφή στο άκρο του διακομιστή..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "&Εφαρμογή όλων των φίλτρων"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "&Εξαγωγή δεδομένων του KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Νέα επαφή βιβλίου διευθύνσεων..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Αντιγραφή μηνύματος στο φάκελο"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Μετάβαση στο φάκελο..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Εγκατάλειψη της τρέχουσας λειτουργίας"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Εστίαση στον επόμενο φάκελο"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Εστίαση στον προηγούμενο φάκελο"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Επιλογή φακέλου με την εστίαση"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Εστίαση στον πρώτο φάκελο"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Εστίαση στον τελευταίο φάκελο"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Εστίαση στο επόμενο μήνυμα"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Εστίαση στο προηγούμενο μήνυμα"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Επιλογή του πρώτου μηνύματος"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Επιλογή του τελευταίου μηνύματος"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Επιλογή μηνύματος με την εστίαση"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Ορισμός εστίασης στη γρήγορη αναζήτηση"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Επέκταση επιλογής στο προηγούμενο μήνυμα"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Επέκταση επιλογής στο επόμενο μήνυμα"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Μετακίνηση μηνύματος στο φάκελο"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message Window"
 msgid "Use Less Bandwidth"
 msgstr "Παράθυρο μηνύματος"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "Ρ&υθμίσεις"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "Όνομα ταυτότητας"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Προσθήκη αγαπημένου φακέλου"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Ά&δειασμα απορριμμάτων"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Μετακίνηση όλων των μηνυμάτων στα απορρίμματα"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Διαγραφή αναζήτησης"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Επεξεργασία αναζήτησης..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "Α&ναίρεση"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "Α&ναίρεση: «%1»"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Φίλτρο %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4907,7 +4935,7 @@
 msgid "Search... <%1>"
 msgstr "Αναζήτηση...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4918,12 +4946,12 @@
 "\"spam\" (διαφημιστικά κλπ) και ίσως αυξήσει την πιθανότητα άλωσης του "
 "συστήματός σας μέσω των τωρινών και μελλοντικών προβλημάτων ασφαλείας."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Χρήση HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4933,121 +4961,121 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "&Ακύρωση"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Έναρξη..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Μετακίνηση στα απορρίμματα"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Μετακίνηση μηνύματος στα απορρίμματα"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Αδυναμία αντιγραφής του αντικειμένου. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Νέο μήνυμα σε..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Απάντηση σε..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Προώθηση σε..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Προσθήκη σε υπάρχουσα επαφή"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Άνοιγμα στο βιβλίο διευθύνσεων"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Προσθήκη αυτού του συνδέσμου στους σελιδοδείκτες"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Επεξεργασία επαφής..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Αποθήκευση συνδέσμου ως..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "Αναζήτηση στο &μήνυμα..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Αποθήκευση της εικόνας στο δίσκο..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Εμφάνιση σε μορφή HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Εμφάνιση σε HTML όταν το μήνυμα προέρχεται από αυτήν την επαφή"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Φόρτωση εξωτερικών αναφορών όταν η αλληλογραφία προέρχεται από αυτήν την "
 "επαφή"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Διαμοιρασμός της εικόνας..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -5056,70 +5084,70 @@
 "Το KMail βασίζεται πλέον στο πλαίσιο εργασίας του διαχειριστή προσωπικών "
 "πληροφοριών του Akonadi, το οποίο φέρνει πολλές αλλαγές σε όλους τους τομείς."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push email (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Βελτιωμένη αναζήτηση"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Υποστήριξη για προσθήκη σημειώσεων στην αλληλογραφία"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Λιγότερο «πάγωμα» της εφαρμογής, ο έλεγχος αλληλογραφίας γίνεται στο "
 "παρασκήνιο"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "Υποστήριξη GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "Έλεγχος ορθογραφίας πριν την αποστολή"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "Πελάτης ηλ. αλληλογραφίας του KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "Ανάκτηση ιδιοτήτων φακέλου"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Παρακαλώ περιμένετε"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "χωρίς σύνδεση"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5133,7 +5161,7 @@
 "λειτουργία χωρίς σύνδεση. Κάντε κλικ <a href=\"kmail:goOnline\">εδώ</a> για "
 "να συνδεθείτε . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5147,22 +5175,22 @@
 "τώρα σε λειτουργία χωρίς σύνδεση. Κάντε κλικ <a href=\"kmail:goResourceOnline"
 "\">εδώ</a> για να συνδεθείτε . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Η επαφή τροποποιήθηκε επιτυχώς"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Νέα μηνύματα στο"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Δεν υπάρχουν μη αναγνωσμένα μηνύματα"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5185,8 +5213,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5282,19 +5310,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Επαφές"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5343,28 +5371,28 @@
 msgid "All"
 msgstr "Όλες"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2009, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2009, Οι προγραμματιστές του KMail"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5393,7 +5421,7 @@
 msgid "&Reply"
 msgstr "&Απάντηση"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Απάντηση..."
@@ -5403,12 +5431,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Απάντηση στο &συγγραφέα..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "&Απάντηση σε όλους..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Απάντηση στη λίστα τα&χυδρομείου..."
@@ -5439,7 +5467,7 @@
 msgid "&Edit As New"
 msgstr "&Επεξεργασία μηνύματος"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5639,82 +5667,82 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Η αναζήτηση απέτυχε. Βρέθηκαν τα σφάλματα: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Αναζήτηση μηνυμάτων"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "Αναζήτη&ση"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Εμβόλιμο..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Σ&αν συνημμένο..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Αποθήκευση συνημμένων..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Καθαρισμός επιλογής"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Μετάβαση στον αρχικό φάκελο"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 αποτέλεσμα"
 msgstr[1] "%1 αποτελέσματα"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Τελευταία αναζήτηση"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Δεν έχετε επιλέξει έναν έγκυρο φάκελο."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Ξεχάσατε να ορίσετε συλλογές."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Ξεχάσατε να ορίσετε την κατάσταση."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Όλοι οι επιλεγμένοι φάκελοι είναι κενοί ή δεν έχουν δεικτοδοτηθεί."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Ξεχάσατε να προσθέσετε συνθήκες."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5722,32 +5750,32 @@
 "Η συνθήκη Περιέχει δεν μπορεί να χρησιμοποιηθεί με λιγότερους χαρακτήρες από "
 "4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Αναζήτηση..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Αδυναμία ανάκτησης των αποτελεσμάτων αναζήτησης. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Η αναζήτηση απέτυχε."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Η αναζήτηση ολοκληρώθηκε."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Η αναζήτηση διακόπηκε."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5758,21 +5786,21 @@
 "κοινή αιτία για αυτό είναι πως ένα άλλος φάκελος αναζήτησης με το ίδιο όνομα "
 "υπάρχει ήδη. Επιστρεφόμενο σφάλμα: «%1»."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Αντιγραφή μηνύματος"
 msgstr[1] "Αντιγραφή %1 μηνυμάτων"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Αποκοπή μηνύματος"
 msgstr[1] "Αποκοπή %1 μηνυμάτων"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5913,7 +5941,7 @@
 "χρήση μόνο)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5921,7 +5949,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5931,26 +5959,26 @@
 "εισαγωγής στο KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Εμφάνιση γραμμής γρήγορης αναζήτησης"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Προκαθορισμένα προώθηση εμβόλιμα."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Προειδοποίηση αν ο αριθμός παραληπτών είναι περισσότερος από:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5962,19 +5990,19 @@
 "αποστολή του μηνύματος. Η προειδοποίηση μπορεί να απενεργοποιηθεί."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Έλεγχος ορθογραφίας πριν την αποστολή"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Αυτόματη αίτηση ειδοποιήσεων παράδοσης &μηνύματος"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5991,13 +6019,13 @@
 "παράδοσης</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Χρονικό διάστημα αυτόματης αποθήκευσης:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -6010,7 +6038,7 @@
 "απενεργοποιήσετε τη δημιουργία του θέτοντας εδώ την τιμή  0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -6018,7 +6046,7 @@
 "συντάκτη."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
@@ -6026,136 +6054,136 @@
 "κρυπτογραφημένη μορφή"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Μια λίστα με όλα τα πρόσφατα χρησιμοποιημένα URL"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Μια λίστα με όλες τις πρόσφατα χρησιμοποιημένες κωδικοποιήσεις"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Εμφάνιση ετικέτας ένδειξης κρυπτογράφησης"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Επαλήθευση προκαθορισμένης συντόμευσης αποστολής"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Το μέγεθος του διαλόγου ταυτότητας (για εσωτερική χρήση μόνο)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Το πλάτος του παραθύρου αναζήτησης (για εσωτερική χρήση μόνο)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Το ύψος του παραθύρου αναζήτησης (για εσωτερική χρήση μόνο)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "Το πλάτος του διαλόγου διαμόρφωσης του KMail (για εσωτερική χρήση μόνο)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Το ύψος του διαλόγου διαμόρφωσης του KMail (για εσωτερική χρήση μόνο)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Πλαίσιο προεπισκόπησης μηνυμάτων"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Να μην εμφανίζεται το πλαίσιο προεπισκόπησης μηνυμάτων"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
 "Εμφάνιση του πλαισίου προεπισκόπησης μηνυμάτων κάτω από τη λίστα μηνυμάτων"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
 "Εμφάνιση του πλαισίου προεπισκόπησης μηνυμάτων δίπλα από τη λίστα μηνυμάτων"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Λίστα φακέλων"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Εκτενής λίστα φακέλων"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Σύντομη λίστα φακέλων"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Πρότυπο μηνύματος για νέο μήνυμα"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Πρότυπο μηνύματος για απάντηση"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Πρότυπο μηνύματος για απάντηση σε όλους"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Πρότυπο μηνύματος για προώθηση"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Χαρακτήρες παράθεσης"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
@@ -6163,7 +6191,7 @@
 "πολιτικής"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6173,7 +6201,7 @@
 "(μόνο για εσωτερική χρήση)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6183,7 +6211,7 @@
 "(μόνο για εσωτερική χρήση)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6193,7 +6221,7 @@
 "αναζήτησης (μόνο για εσωτερική χρήση)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6203,7 +6231,7 @@
 "αναζήτησης (μόνο για εσωτερική χρήση)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6213,7 +6241,7 @@
 "αναζήτησης (μόνο για εσωτερική χρήση)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6486,10 +6514,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6864,10 +6929,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Έλεγχος αλληλογραφίας στο"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7503,6 +7567,16 @@
 msgstr ""
 "Ενεργοποίηση όλων των προειδοποιήσεων με την επιλογή \"Να μην ερωτηθώ ξανά\""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7560,6 +7634,14 @@
 msgid "Zoom: %1%"
 msgstr "Εστίαση"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Δείγματα κειμένου"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Έλεγχος αλληλογραφίας στο"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Όνομα φακέλου και μέγεθος όταν πλησιάζει το όριο"
 
@@ -10345,13 +10427,6 @@
 #~ msgid "Add Group"
 #~ msgstr "Προσθήκη ομάδας"
 
-#, fuzzy
-#~| msgid "Do you really want to remove this group and all its snippets?"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr ""
-#~ "Θέλετε πραγματικά να αφαιρέσετε αυτή την ομάδα και όλα τα δείγματά της;"
-
 #~ msgid "&Apply"
 #~ msgstr "Ε&φαρμογή"
 
@@ -11388,11 +11463,6 @@
 #~ msgstr "Χρονικό &διάστημα ελέγχου:"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Όνομα ταυτότητας"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "Ο &διακομιστής υποστηρίζει Sieve"
diff -Nru kmail-19.04.3/po/el/ktnef.po kmail-19.12.3/po/el/ktnef.po
--- kmail-19.04.3/po/el/ktnef.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/el/ktnef.po	2020-03-03 00:33:58.000000000 +0000
@@ -2,13 +2,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Stelios <sstavra@gmail.com>, 2012.
+# Stelios <sstavra@gmail.com>, 2012, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2012-10-11 15:42+0300\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
+"PO-Revision-Date: 2019-09-02 09:42+0300\n"
 "Last-Translator: Stelios <sstavra@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
 "Language: el\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -29,10 +29,9 @@
 msgstr "sstavra@gmail.com"
 
 #: attachpropertydialog.cpp:58
-#, fuzzy, kde-format
-#| msgid "&Save..."
+#, kde-format
 msgid "Save..."
-msgstr "Αποθήκευ&ση..."
+msgstr "Αποθήκευση..."
 
 #: attachpropertydialog.cpp:93
 #, kde-format
@@ -43,7 +42,7 @@
 #: attachpropertydialog.cpp:97
 #, kde-format
 msgid " bytes"
-msgstr ""
+msgstr " bytes"
 
 #: attachpropertydialog.cpp:165
 #, kde-format
@@ -152,7 +151,7 @@
 #, kde-format
 msgctxt "@info"
 msgid "Unable to open file \"%1\"."
-msgstr "Αδυναμία ανοίγματος αρχείου \"%1\"."
+msgstr "Αδυναμία ανοίγματος του αρχείου «%1»."
 
 #: ktnefmain.cpp:209
 #, kde-format
@@ -197,33 +196,31 @@
 #: ktnefmain.cpp:561
 #, kde-format
 msgid "Open &with %1"
-msgstr ""
+msgstr "Άνοιγμα &με το %1"
 
 #: ktnefmain.cpp:563
 #, kde-format
 msgctxt "@item:inmenu Open With, %1 is application name"
 msgid "%1"
-msgstr ""
+msgstr "%1"
 
 #: ktnefmain.cpp:589
 #, kde-format
 msgctxt "@title:menu"
 msgid "&Open With"
-msgstr ""
+msgstr "Άν&οιγμα με"
 
 #: ktnefmain.cpp:606
 #, kde-format
 msgctxt "@action:inmenu Open With"
 msgid "&Other..."
-msgstr ""
+msgstr "Άλλ&ο..."
 
 #: ktnefmain.cpp:608 ktnefmain.cpp:616
-#, fuzzy, kde-format
-#| msgctxt "@action:inmenu"
-#| msgid "View With..."
+#, kde-format
 msgctxt "@title:menu"
 msgid "&Open With..."
-msgstr "Προβολή με..."
+msgstr "Πρ&οβολή με..."
 
 #. i18n: ectx: Menu (action)
 #: ktnefui.rc:4
@@ -348,10 +345,9 @@
 
 #. i18n: ectx: property (text), widget (QLabel, mMimeLabel)
 #: ui/attachpropertywidgetbase.ui:199
-#, fuzzy, kde-format
-#| msgid "Mime type:"
+#, kde-format
 msgid "MIME type:"
-msgstr "Τύπος mime:"
+msgstr "Τύπος MIME:"
 
 #~ msgctxt "@info:status"
 #~ msgid "100 attachments found"
diff -Nru kmail-19.04.3/po/en_GB/akonadi_archivemail_agent.po kmail-19.12.3/po/en_GB/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/en_GB/akonadi_archivemail_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/en_GB/akonadi_archivemail_agent.po	2020-03-03 00:33:59.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
-"PO-Revision-Date: 2019-03-24 20:56+0000\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2019-03-24 20:03+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
@@ -175,12 +175,12 @@
 msgstr ""
 "Cannot add a second archive for this folder. Modify the existing one instead."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Directory does not exist. Please verify settings. Archive postponed."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Start to archive %1"
diff -Nru kmail-19.04.3/po/en_GB/akonadi_followupreminder_agent.po kmail-19.12.3/po/en_GB/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/en_GB/akonadi_followupreminder_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/en_GB/akonadi_followupreminder_agent.po	2020-03-03 00:33:58.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2019-03-24 20:56+0000\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
+"PO-Revision-Date: 2019-03-24 20:03+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
@@ -17,97 +17,97 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 19.07.70\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Follow Up Reminder Agent"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Follow Up Reminder"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Maintainer"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Steve Allewell"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "steve.allewell@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "To"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Subject"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Dead Line"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Answer"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Received"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "On hold"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Show Message"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Delete"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Do you want to remove this selected item?"
 msgstr[1] "Do you want to remove these %1 selected items?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Answer from %1 received"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "You are still waiting for an answer about this mail:"
diff -Nru kmail-19.04.3/po/en_GB/akonadi_mailfilter_agent.po kmail-19.12.3/po/en_GB/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/en_GB/akonadi_mailfilter_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/en_GB/akonadi_mailfilter_agent.po	2020-03-03 00:33:58.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-10-27 17:45+0100\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
@@ -22,17 +22,17 @@
 msgid "Filter Log Viewer"
 msgstr "Filter Log Viewer"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Share..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Log filter activities"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -41,23 +41,23 @@
 "You can turn logging of filter activities on and off here. Of course, log "
 "data is collected and shown only when logging is turned on. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Logging Details"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Log pattern description"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Log filter &rule evaluation"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -72,34 +72,34 @@
 "about the result of the evaluation of all rules of a single filter will be "
 "given."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Log filter pattern evaluation"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Log size limit:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "unlimited"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -112,7 +112,7 @@
 "collected log data exceeds this limit then the oldest data will be discarded "
 "until the limit is no longer exceeded. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -121,63 +121,63 @@
 "Could not write the file %1:\n"
 "\"%2\" is the detailed error description."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail Error"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtering message %1 of %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Error applying mail filter move"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Error applying mail filter delete"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Error applying mail filter modifications"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Evaluating filter rules:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filter rules have matched.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtering messages"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Mail Filter Log Enabled"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Ready"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtering in %1"
diff -Nru kmail-19.04.3/po/en_GB/akonadi_sendlater_agent.po kmail-19.12.3/po/en_GB/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/en_GB/akonadi_sendlater_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/en_GB/akonadi_sendlater_agent.po	2020-03-03 00:33:58.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2019-03-24 20:56+0000\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
+"PO-Revision-Date: 2019-03-24 20:03+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
@@ -59,124 +59,124 @@
 msgid "Your emails"
 msgstr "steve.allewell@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "To"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Subject"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Send around"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Recurrent"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Message ID"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "No messages waiting..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Send now"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Delete"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Yes"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "No"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Do you want to delete the selected item?"
 msgstr[1] "Do you want to delete the selected items?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Remove items"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Do you want to remove the messages as well?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Remove messages"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "No message found."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "No message found."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Error during fetch message."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Cannot fetch message. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "We cannot create transport"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Message is not a real message"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Cannot send message."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Message sent"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "An error was found. Do you want to resend it?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Error found"
diff -Nru kmail-19.04.3/po/en_GB/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/en_GB/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/en_GB/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/en_GB/akonadi_unifiedmailbox_agent.po	2020-03-03 00:33:59.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-02 12:50+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Synchronising unified mailbox %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Add an Unified MailBox"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Name:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Pick icon..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Icon:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Inbox"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Sent"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Drafts"
diff -Nru kmail-19.04.3/po/en_GB/kmail.po kmail-19.12.3/po/en_GB/kmail.po
--- kmail-19.04.3/po/en_GB/kmail.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/en_GB/kmail.po	2020-03-03 00:33:58.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-03-24 20:59+0000\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-11-03 11:53+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
@@ -185,8 +185,8 @@
 msgstr "Multiple encryption keys per address"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -292,27 +292,27 @@
 "KMail was unable to fully detect a mailing list in this folder. Please fill "
 "in the addresses by hand."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Usage:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% full"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 of %2 used"
@@ -335,7 +335,7 @@
 "associate with this folder.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Templates"
@@ -346,106 +346,106 @@
 msgstr "&Use custom message templates in this folder"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copy Global Templates"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "View"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Use custom &icons"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Unread:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Show Sender/Receiver Column in List of Messages"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Sho&w column:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Default"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Sender"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Receiver"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Message List"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Use default aggregation"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Aggregation"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Use default theme"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Theme"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Message Default Format"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Prefer HTML to text"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Prefer text to HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Use Global Settings"
@@ -455,100 +455,105 @@
 msgid "Retrieval Options"
 msgstr "Retrieval Options"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identities"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Receiving"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Sending"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "LDAP server"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Outgoing accounts (add at least one):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Common Options"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Confirm &before send"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Check spelling before sending"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Never Automatically"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "On Manual Mail Checks"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "On All Mail Checks"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Send Now"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Send Later"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Send &messages in outbox folder:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Defa&ult send method:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Enable Undo Send"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Add Mail Account..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Custom Account..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -557,30 +562,30 @@
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Unable to start account wizard"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Include in Manual Mail Check"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Switch offline on KMail Shutdown"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Check mail on startup"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -637,7 +642,7 @@
 msgid "Fixed Width Font"
 msgstr "Fixed Width Font"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Composer"
@@ -942,61 +947,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "We cannot create tag. A tag with same name already exists."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "General"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standard Templates"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Custom Templates"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Subject"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Charset"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Headers"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Attachments"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autocorrection"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Auto Resize Image"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signature"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1005,12 +1010,12 @@
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Insert the signature above any quoted text"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1019,18 +1024,18 @@
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "When replying, do not quote any existing signature"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1041,7 +1046,7 @@
 "(instead of the complete message), if\n"
 "there is text selected in the message window."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1052,17 +1057,17 @@
 "even when the line was created by adding an additional line break while\n"
 "word-wrapping the text."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Enable automatic word wrapping at the specified width"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Set the text width for automatic word wrapping"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1073,7 +1078,7 @@
 "in the original format it was received.\n"
 "If unticked, the reply will be as plain text by default."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1084,34 +1089,34 @@
 "Bold, italic and underlined text, lists, and external references\n"
 "are supported."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Inline"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "As Attachment"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Set the default forwarded message format"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Default forwarding type:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Recipients"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1122,17 +1127,17 @@
 "You can select this on a per-message basis using \"Options - Request "
 "Disposition Notification\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Warn if too many recipients are specified"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Set the maximum number of recipients for the warning"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1149,7 +1154,7 @@
 "however, that it does not take account of distribution lists or\n"
 "mailing lists."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1158,18 +1163,18 @@
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "No save"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Maximum recent addresses retained:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1178,23 +1183,23 @@
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configure Completion..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Autosave"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "No autosave"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1202,18 +1207,18 @@
 msgstr[0] " minute"
 msgstr[1] " minutes"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Automatically save the message at this specified interval"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Repl&y Subject Prefixes"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1222,59 +1227,59 @@
 "Recognise any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "A&dd..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Re&move"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mod&ify..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Enter new reply prefix:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "For&ward Subject Prefixes"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Add..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Remo&ve"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modify..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Enter new forward prefix:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1284,88 +1289,88 @@
 "for a charset that contains all required characters."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modify..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Enter charset:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "&Keep original charset when replying or forwarding (if possible)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "This charset is not supported."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Use custom message-id suffix"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Custom message-&id suffix:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Define custom MIME header fields:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Name"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Value"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "Ne&w"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Name:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Value:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 "'Content-Type' is not an authorised string. This header will be not saved."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Invalid header"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-compatible attachment naming"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1374,39 +1379,39 @@
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "E&nable detection of missing attachments"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Recognise any of the following key words as intention to attach a file:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Enter new key word:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Maximum Attachment Size:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "No limit"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1492,8 +1497,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
+msgstr "Text Conversion Plugins"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1606,7 +1611,7 @@
 msgid "Archive Folder"
 msgstr "Archive Folder"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1672,19 +1677,19 @@
 msgid "Notification"
 msgstr "Notification"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 attachment (%2)"
 msgstr[1] "%1 attachments (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Hide attachment list"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Show attachment list"
@@ -1701,329 +1706,329 @@
 msgid "Encoding"
 msgstr "Encoding"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Select the dictionary to use when spell-checking this message"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Select the sent-mail folder where a copy of this message will be saved"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Select the outgoing account to use for sending this message"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Set the \"From:\" email address for this message"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Set a subject for this message"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identity:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Dictionary:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "&Sent-Mail folder:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Mail transport:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&From:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "S&ubject:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Send Mail"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Send Mail Via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Send"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Send &Later"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Send &Later Via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Queue"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Save as &Draft"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Save email in Draft folder"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Save as &Template"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Save email in Template folder"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Save as &File"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Save email as text or html file"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Insert Text File..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Insert Recent Text File"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Address Book"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Open Address Book"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&New Composer"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Select &Recipients..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Save &Distribution List..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Paste as Attac&hment"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Cl&ean Spaces"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Use Fi&xed Font"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgent"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Request Disposition Notification"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "&Request Delivery Confirmation"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Wordwrap"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Snippets"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatic Spellchecking"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Rich Text Editing"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rich Text"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Toggle rich text editing mode"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&All Fields"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identity"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Dictionary"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Sent-Mail Folder"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Mail Transport"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&From"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "S&ubject"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Append S&ignature"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Pr&epend Signature"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Insert Signature At C&ursor Position"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Spellchecker..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Spellchecker"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Encrypt Message"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Sign Message"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Sign"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Cryptographic Message Format"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Select a cryptographic format for this message"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Create Follow Up Reminder..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configure KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2032,53 +2037,53 @@
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Hide menu bar"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Line: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Column: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Spellcheck: on"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Spellcheck: off"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Re&save as Template"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Save as Draft"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2087,7 +2092,7 @@
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2096,82 +2101,82 @@
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Do you want to save the message for later or discard it?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Close Composer"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Autosave Message Failed"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Sending Message Failed"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Insert File"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Add as &Inline Image"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Add as &Attachment"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Name of the attachment:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Attachment name cannot be empty"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Invalid Attachment Name"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Add URL into Message"
 msgstr[1] "Add URLs into Message"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Add File as &Attachment"
 msgstr[1] "Add Files as &Attachment"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Insert clipboard text as attachment"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "unnamed"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2184,12 +2189,12 @@
 "encryption key to use for this.</p><p>Please select the key(s) to use in the "
 "identity configuration.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Undefined Encryption Key"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2200,12 +2205,12 @@
 "(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
 "in the identity configuration.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Undefined Signing Key"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2216,7 +2221,7 @@
 "your email address for all identities, so that you do not have to enter it "
 "for each message."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2225,37 +2230,37 @@
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "To: field is empty. Send message anyway?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "No To: specified"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "You did not specify a subject. Send message anyway?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "No Subject Specified"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "S&end as Is"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Specify the Subject"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2264,22 +2269,22 @@
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "About to send email..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Send Confirmation"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Send Now"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2288,22 +2293,22 @@
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Too many recipients"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Send as Is"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Edit Recipients"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2312,22 +2317,22 @@
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Lose the formatting?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Lose Formatting"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Add Markup Plain Text"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2336,7 +2341,7 @@
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2345,7 +2350,7 @@
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2354,7 +2359,7 @@
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2365,7 +2370,7 @@
 "encryption is unknown (the encryption key could not be verified). Click the "
 "icon for details."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Plugin Editor Information"
@@ -2442,7 +2447,7 @@
 msgid "External editor was started."
 msgstr "External editor was started."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2451,19 +2456,19 @@
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Sent Folder is not defined. Please set it before sending the mail."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 "Identity was not found. Please verify that you will use a correct identity."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2492,11 +2497,6 @@
 msgid "Message will not be encrypted"
 msgstr "Message will not be encrypted"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Text Snippets"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2541,27 +2541,27 @@
 msgid "Cannot move messages."
 msgstr "Cannot move messages."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Unable to fetch folder. Error reported: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "No folder returned."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Unable to fetch parent folder. Error reported: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Unable to return list of folders."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Messages archived"
@@ -2602,48 +2602,48 @@
 msgid "&Existing identities:"
 msgstr "&Existing identities:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Error while generating new key pair: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Key Generation Error"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "No key"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Generate a new key pair"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Generating new key pair..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Edit Identity"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "General"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Your name:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2654,12 +2654,12 @@
 "like it to appear in the email header that is sent out;</p><p>if you leave "
 "this blank your real name will not appear, only the email address.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Organisation:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2670,12 +2670,12 @@
 "organisation if you would like it to be shown in the email header that is "
 "sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Email address:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2690,12 +2690,12 @@
 "alias addresses in the field below.</p><p>If you leave this blank, or get it "
 "wrong, people will have trouble replying to you.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Email a&liases:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2712,12 +2712,12 @@
 "th><td>first@example.org<br>last@example.org</td></tr></table><p>Type one "
 "alias address per line.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Cryptography"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2732,12 +2732,12 @@
 "functions will not be affected.</p><p>You can find out more about keys at "
 "<a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP signing key:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2754,12 +2754,12 @@
 "mail functions will not be affected.</p><p>You can find out more about keys "
 "at <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP encryption key:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2772,12 +2772,12 @@
 "be able to digitally sign emails using S/MIME; normal mail functions will "
 "not be affected.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME signing certificate:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2792,39 +2792,39 @@
 "encrypt copies of outgoing messages to you using S/MIME; normal mail "
 "functions will not be affected.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME encryption certificate:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Preferred format:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Automatically sign messages"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Automatically encrypt messages when possible"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Advanced"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Reply-To address:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2841,12 +2841,12 @@
 "email in the <tt>From:</tt> field, but any responses to go to a group "
 "address.</p><p>If in doubt, leave this field blank.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&CC addresses:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2863,12 +2863,12 @@
 "separate the list of CC recipients.</p><p>If in doubt, leave this field "
 "blank.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC addresses:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2885,57 +2885,57 @@
 "yours.</p><p>To specify more than one address, use commas to separate the "
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&ictionary:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Sent-mail &folder:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Drafts folder:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Templates folder:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Outgoing Account:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Attach my vCard to message"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Create..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Autocorrection language:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Restore default domain name"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Defaul&t domain:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2944,33 +2944,33 @@
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Use custom message templates for this identity"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signature"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Picture"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Invalid Email Alias \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Invalid Email Address"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2983,7 +2983,7 @@
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2992,7 +2992,7 @@
 "One of the configured OpenPGP encryption keys does not contain any user ID "
 "with the configured email address for this identity (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3005,7 +3005,7 @@
 "This might result in warning messages on the receiving side when trying to "
 "verify signatures made with this configuration."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3014,22 +3014,22 @@
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Email Address Not Found in Key/Certificates"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "The signature file is not valid"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Edit Identity \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3038,7 +3038,7 @@
 "Some custom folder for identity does not exist (any more); therefore, "
 "default folders will be used."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Edit..."
@@ -3069,6 +3069,18 @@
 msgid "We cannot delete vCard file."
 msgstr "We cannot delete vCard file."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Do you really want to cancel?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmation"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3230,7 +3242,7 @@
 "Examples are available at <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Image"
@@ -3263,7 +3275,7 @@
 msgstr[0] "Distribution list %2 is empty, it cannot be used."
 msgstr[1] "Distribution lists %2 are empty, they cannot be used."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Add to Address Book"
@@ -3273,22 +3285,22 @@
 msgid "Contact created successfully"
 msgstr "Contact created successfully"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Contact cannot be stored: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Failed to store contact"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Do you want to attach this folder \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Attach Folder"
@@ -3499,14 +3511,14 @@
 msgstr "F&older"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Apply Filters on Folder"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3532,7 +3544,7 @@
 msgstr "&Forward"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&pply Filter"
@@ -3557,7 +3569,7 @@
 msgstr "&Help"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Main Toolbar"
@@ -3610,12 +3622,12 @@
 msgid "The file does not contain a message."
 msgstr "The file does not contain a message."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "The file contains multiple messages. Only the first message is shown."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3624,32 +3636,32 @@
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Send As Digest"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Send Individually"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtering messages"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtering message %1 of %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Moving messages"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Deleting messages"
@@ -3678,27 +3690,27 @@
 msgid "Text Direction Toolbar"
 msgstr "Text Direction Toolbar"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail is set to be offline; all network jobs are suspended"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Send Email"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Impossible to send email"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail is set to be online; all network jobs resumed"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3707,37 +3719,37 @@
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail is currently in offline mode. How do you want to proceed?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Work Online"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Network connection detected, all network jobs resumed"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "No network connection detected, all network jobs are suspended"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3746,12 +3758,12 @@
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Opening Autosave File Failed"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3759,7 +3771,7 @@
 msgstr[0] "This identity has been changed to use the default transport:"
 msgstr[1] "These %1 identities have been changed to use the default transport:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3768,43 +3780,47 @@
 msgstr[1] ""
 "These %1 identities have been changed to use the modified transport:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Sending messages"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Initiating sending process..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Resource %1 is broken.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Archive Mail Agent was not registered."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Send Later Agent was not registered."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Followup Reminder Agent was not registered."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3813,12 +3829,12 @@
 "Could not start certificate manager; please make sure you have Kleopatra "
 "properly installed."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail Error"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3827,26 +3843,26 @@
 "Could not start the import wizard. Please make sure you have ImportWizard "
 "properly installed."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Unable to start import wizard"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Unable to start \"PIM Data Exporter\" program"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3855,68 +3871,68 @@
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
 "properly installed."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Unable to start ImportWizard"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Another mailer was found on system. Do you want to import data from it?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Could not start the import wizard. Please check your installation."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "No Subject"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(no templates)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "This folder does not have any expiry options set"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Expire Folder"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Expire"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Empty Wastebin"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Move to Wastebin"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Are you sure you want to empty the wastebin folder?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3925,27 +3941,27 @@
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "wastebin?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Moved all messages to the wastebin"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Are you sure you want to expire all old messages?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Expire Old Messages?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Expire"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3956,17 +3972,17 @@
 "\"spam\" and may increase the likelihood that your system will be "
 "compromised by other present and anticipated security exploits."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Security Warning"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Load External References"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3981,531 +3997,531 @@
 "<qt>Do you really want to delete the %1 selected messages?<br />Once "
 "deleted, they cannot be restored.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Delete Messages"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Delete Message"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Moving messages..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Deleting messages..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Messages deleted successfully."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Messages moved successfully."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Deleting messages failed."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Deleting messages cancelled."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Moving messages failed."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Moving messages cancelled."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Move Messages to Folder"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Copying messages..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Messages copied successfully."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Copying messages failed."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Copying messages cancelled."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copy Messages to Folder"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Moving messages to wastebin..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Deleting and moving messages to wastebin..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Messages moved to wastebin successfully"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Messages moved to wastebin or deleted successfully"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Moving messages to wastebin failed."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Deleting or moving messages to wastebin failed."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Moving messages to wastebin cancelled."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Deleting or moving messages to wastebin cancelled."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Jump to Folder"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Save &As..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Expire All Folders"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Check &Mail"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Check Mail In"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Check Mail"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Send Queued Messages"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Online status (unknown)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Send Queued Messages Via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Certificate Manager"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Import Messages..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Debug Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filter &Log Viewer..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Import from another Email Client..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Edit \"Out of Office\" Replies..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configure Automatic Archiving..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Delayed Messages..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Followup Reminder Messages..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Delete"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "M&ove Thread to Wastebin"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Move thread to wastebin"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Delete T&hread"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Find Messages..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Select &All Messages"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Mailing List Management..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Assign Shortcut..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Expiration Settings"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Archive Folder..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Load E&xternal References"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copy Message To..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Move Message To..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&New Message..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "New"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Message From &Template"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "New Message t&o Mailing-List..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Create Filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filter on &Subject..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filter on &From..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filter on &To..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filter on &Cc..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Mark &Thread"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Mark Thread as &Read"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Mark all messages in the selected thread as read"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Mark Thread as &Unread"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Mark all messages in the selected thread as unread"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Mark Thread as &Important"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Remove &Important Thread Mark"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Mark Thread as &Action Item"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Remove &Action Item Thread Mark"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Watch Thread"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignore Thread"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Save A&ttachments..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copy Decrypted To..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Appl&y All Filters"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expand Thread / Group"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expand the current thread or group"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Collapse Thread / Group"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Collapse the current thread or group"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ex&pand All Threads"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expand all threads in the current folder"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "C&ollapse All Threads"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Collapse all threads in the current folder"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Display Message"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Next Message"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Go to the next message"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Next &Unread Message"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Next"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Go to the next unread message"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Previous Message"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Go to the previous message"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Previous Unread &Message"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Previous"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Go to the previous unread message"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Next Unread &Folder"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Go to the next folder with unread messages"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Previous Unread F&older"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Go to the previous folder with unread messages"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Next Unread &Text"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Go to the next unread text"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4514,223 +4530,228 @@
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configure &Filters..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Manage &Sieve Scripts..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Add Account..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail &Introduction"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Display KMail's Welcome Page"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configure &Notifications..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configure KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Expire..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Add Favourite Folder..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Serverside Subscription..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Apply All Filters"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Import/Export KMail Data..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "New AddressBook Contact..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copy Message to Folder"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Jump to Folder..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Abort Current Operation"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Focus on Next Folder"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Focus on Previous Folder"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Select Folder with Focus"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Focus on First Folder"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Focus on Last Folder"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Focus on Next Message"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Focus on Previous Message"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Select First Message"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Select Last Message"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Select Message with Focus"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Set Focus to Quick Search"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Extend Selection to Previous Message"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Extend Selection to Next Message"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Move Message to Folder"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Use Less Bandwidth"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Mark All Messages As Read in This Folder and All its Subfolder"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Remove Duplicates in This Folder and All its Subfolder"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Account &Settings"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Restart Account"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Add Favourite Folder"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "E&mpty Wastebin"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Move All Messages to the Wastebin"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Delete Search"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Edit Search..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Undo"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Undo: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Search... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4741,12 +4762,12 @@
 "increase the likelihood that your system will be compromised by other "
 "present and anticipated security exploits."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Use HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4761,118 +4782,118 @@
 "You can configure unified mailboxes, create custom ones or\n"
 "disable the feature completely in KMail's Plugin settings."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Enable Unified Mailboxes?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Enable Unified Mailboxes"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Cancel"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Starting..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Move to Wastebin"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Move to Wastebin"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Move message to wastebin"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Cannot copy item. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "New Message To..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Reply To..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Forward To..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Add to Existing Contact"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Open in Address Book"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Bookmark This Link"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Edit contact..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Save Link As..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Find in Message..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Save Image On Disk..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Show HTML Format"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Show HTML format when mail comes from this contact"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Load external reference when mail comes for this contact"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Share image..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4881,62 +4902,62 @@
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push email (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Improved searches"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Support for adding notes (annotations) to mails"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Less GUI freezes, mail checks happen in the background"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Plugins support"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "New HTML renderer (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Added Check for Phishing URL"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "The KDE Mail Client"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Retrieving Folder Contents"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Please wait . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Offline"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4945,7 +4966,7 @@
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4954,22 +4975,22 @@
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Contact modified successfully"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "New Messages In"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "There are no unread messages"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4992,8 +5013,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5086,17 +5107,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Select the plugin summaries to show on the summary page."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontact Summary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5142,27 +5163,27 @@
 msgid "All"
 msgstr "All"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact Summary"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontact Summary View"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2019 The Kontact developers"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5189,7 +5210,7 @@
 msgid "&Reply"
 msgstr "&Reply"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Reply..."
@@ -5199,12 +5220,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Reply to A&uthor..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Reply to &All..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Reply to Mailing-&List..."
@@ -5234,7 +5255,7 @@
 msgid "&Edit As New"
 msgstr "&Edit As New"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5425,114 +5446,114 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Search failed some errors were found: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Find Messages"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Search"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Inline..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "As &Attachment..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Save Attachments..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Clear Selection"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Jump to original folder"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 match"
 msgstr[1] "%1 matches"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Last Search"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "You did not selected a valid folder."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "You forgot to select collections."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "You forgot to define condition."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "All folders selected are empty or were not indexed."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "You forgot to add conditions."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Searching..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Cannot get search result. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Search failed."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Search complete."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Search stopped."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5543,21 +5564,21 @@
 "that another search folder with the same name already exists. Error returned "
 "\"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copy Message"
 msgstr[1] "Copy %1 Messages"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Cut Message"
 msgstr[1] "Cut %1 Messages"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Checking index status..."
@@ -5693,7 +5714,7 @@
 "(for internal use only)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5703,7 +5724,7 @@
 "email account is detected. We only ever ask once."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5713,26 +5734,26 @@
 "displayed."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Show folder quick search line edit"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Forward Inline As Default."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Warn if the number of recipients is more than:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5744,19 +5765,19 @@
 "off."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Check spelling before send"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automatically request &message disposition notifications"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5772,13 +5793,13 @@
 "Disposition Notification</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Autosave interval:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5790,151 +5811,151 @@
 "autosaving by setting it to the value 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Show the Text Snippet Management and Insertion Panel in the composer."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "When ticked, sent messages will be stored in the encrypted form"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "A list of all the recently used URLs"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "A list of all the recently used encodings"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Show crypto label indicator"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Validate Send Default Shortcut"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "The size of the identity dialogue (for internal use only)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "The width of the search window (for internal use only)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "The height of the search window (for internal use only)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "The width of the Configure KMail dialogue (for internal use only)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "The height of the Configure KMail dialogue (for internal use only)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Message Preview Pane"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Do not show a message preview pane"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Show the message preview pane below the message list"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Show the message preview pane next to the message list"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Folder List"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Long folder list"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Short folder list"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Message template for new message"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Message template for reply"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Message template for reply to all"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Message template for forward"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Quote characters"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Specifies the policy used when displaying policy"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5944,7 +5965,7 @@
 "(for internal use only)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5954,7 +5975,7 @@
 "internal use only)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5964,7 +5985,7 @@
 "internal use only)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5974,7 +5995,7 @@
 "internal use only)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5984,7 +6005,7 @@
 "internal use only)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6253,7 +6274,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6289,7 +6310,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6619,8 +6640,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Check Mail URL Tracking"
+msgid "Scan emails for tracking URLs"
+msgstr "Scan emails for tracking URLs"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7235,6 +7256,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Re-enable All \"Do not Ask Again\" Warnings"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 seconds"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Undo send"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7290,6 +7321,12 @@
 msgid "Zoom: %1%"
 msgstr "Zoom: %1%"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Text Snippets"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Check Mail URL Tracking"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Folder Name and Size When Close to Quota"
 
@@ -9914,10 +9951,6 @@
 #~ "><warning>There is no way to undo the removal.</warning>"
 
 #~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Do you really want to remove group \"%1\"?"
-
-#~ msgctxt "@info"
 #~ msgid ""
 #~ "Do you really want to remove snippet \"%1\"?<nl/><warning>There is no way "
 #~ "to undo the removal.</warning>"
@@ -10935,9 +10968,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Define if account uses the default identity"
 
-#~ msgid "Identity account"
-#~ msgstr "Identity account"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "RID path to the mailbox to watch for changes"
 
diff -Nru kmail-19.04.3/po/en_GB/kmail-refresh-settings.po kmail-19.12.3/po/en_GB/kmail-refresh-settings.po
--- kmail-19.04.3/po/en_GB/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/en_GB/kmail-refresh-settings.po	2020-03-03 00:33:58.000000000 +0000
@@ -0,0 +1,103 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Steve Allewell <steve.allewell@gmail.com>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-11 15:02+0100\n"
+"Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
+"Language-Team: British English <kde-i18n-doc@kde.org>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 19.07.70\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Steve Allewell"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "steve.allewell@gmail.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "KMail Assistant for refreshing settings"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Author"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "KMail Refresh Settings"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Warning"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Clean up Settings"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Finish"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Clean"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Remove obsolete \"TipOfDay\" settings: Done"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Delete Dialogue settings in file `%1`: Done"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Delete Filters settings in file `%1`: Done"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Clean Folder Settings in setting file `%1`: Done"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Clean Dialogue Size in setting file `%1`: Done"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Please close KMail/Kontact before using it."
diff -Nru kmail-19.04.3/po/en_GB/ktnef.po kmail-19.12.3/po/en_GB/ktnef.po
--- kmail-19.04.3/po/en_GB/ktnef.po	2019-07-09 00:20:19.000000000 +0000
+++ kmail-19.12.3/po/en_GB/ktnef.po	2020-03-03 00:33:58.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2017-12-29 15:40+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
diff -Nru kmail-19.04.3/po/eo/kmail.po kmail-19.12.3/po/eo/kmail.po
--- kmail-19.04.3/po/eo/kmail.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/eo/kmail.po	2020-03-03 00:33:59.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2007-11-17 19:41+0100\n"
 "Last-Translator: Oliver Kellogg <okellogg@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -204,8 +204,8 @@
 msgstr "pluraj ĉifroŝlosiloj po adreso"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -321,28 +321,28 @@
 msgstr ""
 "KMail ne eblas ekkoni dissendliston en la leterujo. Enigu mane la adreson."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvoto"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Uzado:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, fuzzy, kde-format
 #| msgid "Status: "
 msgid "Status:"
 msgstr "Stato: "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 %3 used"
 msgid "%1 of %2 used"
@@ -363,7 +363,7 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Ŝablonoj:"
@@ -375,12 +375,12 @@
 msgstr "&Uzi proprajn mesaĝoŝablonojn"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, fuzzy, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Anstataŭigu"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, fuzzy, kde-format
 #| msgctxt "to view something"
 #| msgid "View"
@@ -388,105 +388,105 @@
 msgid "View"
 msgstr "Rigardu"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Uzi proprajn p&iktogramojn"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, fuzzy, kde-format
 #| msgid "&Unread:"
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Nelegita:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Mon&tri kolumnon:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, fuzzy, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Uzu kiel apriora"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, fuzzy, kde-format
 #| msgid "Sender"
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Sendinto"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, fuzzy, kde-format
 #| msgid "Receiver"
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Ricevonto"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Mesaĝolisto"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default aggregation"
 msgstr "Forigi fa&denon"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, fuzzy, kde-format
 #| msgid "Suggestions"
 msgid "Aggregation"
 msgstr "Proponoj"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default theme"
 msgstr "Forigi fa&denon"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, fuzzy, kde-format
 #| msgid "Time"
 msgid "Theme"
 msgstr "Tempo"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "Nesukura mesaĝformo"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer H&TML to plain text"
 msgid "Prefer HTML to text"
 msgstr "&Preferu HTMLon al plena teksto"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "&Preferi HTMLon al plena teksto"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -498,14 +498,14 @@
 msgid "Retrieval Options"
 msgstr "Ĝeneralaj opcioj"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Identeco"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, fuzzy, kde-format
 #| msgid "&Receiving"
 msgctxt ""
@@ -513,90 +513,95 @@
 msgid "Receiving"
 msgstr "&Ricevado"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, fuzzy, kde-format
 #| msgid "&Sending"
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "&Sendado"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Elirantaj Kontoj (aldonu almenaŭ unu):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Ĝeneralaj opcioj"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Konfirmi antaŭ sendo"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Neniam aŭtomate"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Ĉe manaj retleterkontroladoj"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Ĉe ĉiuj retleterkontroladoj"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Sendi tuj"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Sendi poste"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "&Sendi mesaĝojn en elira leterujo:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Apriora sendmetodo:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Aldoni konton"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Custom Account..."
 msgstr "Aldoni konton"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -605,33 +610,33 @@
 msgstr ""
 "Ne eblis lanĉi la atestiladministrilon. Bonvolu kontroli vian instaladon."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start account wizard"
 msgstr "Ne eblis krei konton"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, fuzzy, kde-format
 #| msgid "Include in manual mail chec&k"
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Enmeti en la &kontrolon"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Check mail on startup"
 msgstr "&Rigardi je nova poŝto dum lanĉo"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -693,7 +698,7 @@
 msgid "Fixed Width Font"
 msgstr "Egallarĝa tiparo"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Mesaĝredaktilo"
@@ -1038,44 +1043,44 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Ĝenerale"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, fuzzy, kde-format
 msgid "Standard Templates"
 msgstr "&Anstataŭigu"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, fuzzy, kde-format
 #| msgid "&Custom Templates"
 msgid "Custom Templates"
 msgstr "&Propraj Shablonoj"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, fuzzy, kde-format
 #| msgid "Subject"
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Temo"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, fuzzy, kde-format
 #| msgid "Cha&rset"
 msgid "Charset"
 msgstr "&Signaro"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, fuzzy, kde-format
 #| msgid "H&eaders"
 msgid "Headers"
 msgstr "&Kaplinioj"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "A&ttachments"
@@ -1083,49 +1088,49 @@
 msgid "Attachments"
 msgstr "A&ldonoj"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Subskribo"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 #| msgid "Set Cursor Position"
 msgid "Insert the signature above any quoted text"
 msgstr "Meti kursilpozicion"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgctxt "Icon used for folders with no unread messages."
 #| msgid "&Normal:"
@@ -1133,7 +1138,7 @@
 msgid "Format"
 msgstr "&Normal:"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1141,7 +1146,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1149,17 +1154,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1167,7 +1172,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1175,7 +1180,7 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, fuzzy, kde-format
 #| msgctxt "View->attachments->"
 #| msgid "&Inline"
@@ -1183,31 +1188,31 @@
 msgid "Inline"
 msgstr "&Entekste"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "As Attachment"
 msgstr "Kun kunsendaĵo"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Default forwarding type:"
 msgstr "Nor&ma domajno:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "No recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Neniuj ricevantoj"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1215,18 +1220,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Filtroago"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1237,51 +1242,51 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Neniu aŭtomata konservo"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "Lasttempe uzita adreso"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 msgid "Configure Completion..."
 msgstr "Agordu konton"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Neniu aŭtomata konservo"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Neniu aŭtomata konservo"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1290,19 +1295,19 @@
 msgstr[0] " min"
 msgstr[1] " min"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "Aŭto&mate postuli ricevkonfirmojn"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Temo&prefiksoj por respondo"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1311,59 +1316,59 @@
 "Rekoni iun sinsekvon el la sekvaj prefiksoj\n"
 "(la eroj estas ne-usklecdistingaj regulesprimoj):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Aldoni..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Forigi"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Ŝa&nĝi..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Entajpi novan respondoprefikson:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "&Temoprefiksoj por plusendo"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Aldoni..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Forigi"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Ŝanĝi..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Entajpi novan plusendo-prefikson:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1373,92 +1378,92 @@
 "signaro, kiuj enhvas ĉiujn necesajn signojn."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Ŝ&anĝi..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Doni aldonendan signaron:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "&Lasi la originan signaron ĉe respondoj kaj plusendoj (se eblas)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Tiu signaro ne estas subtenata."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Uzi propran sufikson por mesaĝ-identigiloj:"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "&Propra sufikso por mesaĝ-identigiloj:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Difini proprajn MIME-kapliniojn:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, fuzzy, kde-format
 #| msgid "Name"
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nomo"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, fuzzy, kde-format
 #| msgid "Value"
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valoro"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, fuzzy, kde-format
 #| msgid "Ne&w"
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&va"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, fuzzy, kde-format
 #| msgid "&Name:"
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nomo:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valoro:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid header"
 msgstr "&Enŝalti subskribon"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomigi kunsendaĵojn kompreneble por MS-Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1467,41 +1472,41 @@
 "Marku tiun opcion por certigi, ke MS-Outlook povas kompreni kunsendaĵnomoj "
 "kun neanglaj literoj"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Ebligi ekkonon de ma&nkaj kunsendaĵoj"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Ekkoni iun de la sekvaj vortoj kiel intenco kunsendi dosieron:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Entajpi novan vorton:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Kun kunsendaĵo"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, fuzzy, kde-format
 #| msgid "MB"
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr "MB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "Protokolgrandeca limo:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1598,7 +1603,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Mesaĝredaktilo"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1720,7 +1725,7 @@
 msgid "Archive Folder"
 msgstr "Nova leterujo"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "List Archives"
 msgctxt "@action"
@@ -1796,7 +1801,7 @@
 msgid "Notification"
 msgstr "Nova Poŝtsciigo"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "Attachment: %1"
 msgid "1 attachment (%2)"
@@ -1804,13 +1809,13 @@
 msgstr[0] "Kunsendaĵo: %1"
 msgstr[1] "Kunsendaĵo: %1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Hide attachment list"
 msgstr "Konservi kunsendaĵon kiel"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Show attachment list"
@@ -1829,471 +1834,471 @@
 msgid "Encoding"
 msgstr "Kodprezento"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 #| msgid "Set subject of message"
 msgid "Set a subject for this message"
 msgstr "Difini temon de la mesaĝo"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identeco:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Vortaro:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Leterujo de &senditaj mesaĝoj:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Poŝt&transporto:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, fuzzy, kde-format
 #| msgid "S&ubject:"
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Temo:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Sendi poŝton"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Sendi poŝton per"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, fuzzy, kde-format
 msgid "Send"
 msgstr "&Sendu"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Sendi p&oste"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Sendi p&oste per"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, fuzzy, kde-format
 #| msgid "Queued"
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Atendvicigita"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "&Konservi kiel malnetaĵo"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "Traserĉi ĉiu&jn lokajn leterujojn"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Konservi kiel &ŝablono"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 #| msgid "Save as &Template"
 msgid "Save email in Template folder"
 msgstr "Konservi kiel &ŝablono"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "Sekurigi al dosiero"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgid "&Insert Text File..."
 msgstr "Enmet&i dosieron..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, fuzzy, kde-format
 #| msgid "&Insert File Recent"
 msgid "&Insert Recent Text File"
 msgstr "Enmet&i dosieron lastatempan"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adresaro"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "Open Address Book"
 msgstr "Malfermi en adresaro"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "Nova &redaktilo"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Elekti &ricevantojn..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Konservi &dissendoliston..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Alglui kiel &kunsendaĵo"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Forigi troajn spacsignojn"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Uzi e&gallarĝan tiparon"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, fuzzy, kde-format
 #| msgid "&Urgent"
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urĝe"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Postuli pozician noton"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Postuli pozician noton"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Linirompo"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Aŭtomate skribkontroli"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Rich Text Editing"
 msgstr "Ensalut-informoj"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Ĉ&iuj eroj"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identeco"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Vortaro"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Leterujo de &senditaj mesaĝoj"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Poŝtotransporto"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&De"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, fuzzy, kde-format
 #| msgid "S&ubject"
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Temo"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "&Alpendigi subskribon"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, fuzzy, kde-format
 #| msgid "Append S&ignature"
 msgid "Pr&epend Signature"
 msgstr "&Alpendigi subskribon"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, fuzzy, kde-format
 #| msgid "Set Cursor Position"
 msgid "Insert Signature At C&ursor Position"
 msgstr "Meti kursilpozicion"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Literumilo..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, fuzzy, kde-format
 #| msgid "&Spellchecker..."
 msgid "Spellchecker"
 msgstr "&Literumilo..."
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Ĉ&ifri mesaĝon"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Ĉifradi"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Subskribi mesaĝon"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Subskribi"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "%Ĉifromesaĝa formo"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Trovi mesaĝojn..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "A&gordi KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, fuzzy, kde-format
 #| msgid " Line: %1 "
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linio: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolumno: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Literumilo: ŝaltita"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Literumilo: malŝaltita"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Rekon&servi kiel ŝablono"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Konservi kiel malnetaĵo"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Ĉu vi volas konservi la mesaĝon aŭ forĵeti ĝin?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Fermi la redaktilon"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Autosave Message Failed"
 msgstr "Aŭtokonservado fiaskis."
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Sending Message Failed"
 msgstr "Aŭtokonservado fiaskis."
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Enmeti dosierenhavon"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add as &Attachment"
 msgstr "Aldoni kiel alpendaĵo"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nomo de la kunsendaĵo:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid Attachment Name"
 msgstr "&Enŝalti subskribon"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Quoted Message"
 msgid "Add URL into Message"
@@ -2301,7 +2306,7 @@
 msgstr[0] "Citita mesaĝo"
 msgstr[1] "Citita mesaĝo"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add File as &Attachment"
@@ -2309,17 +2314,17 @@
 msgstr[0] "Aldoni kiel alpendaĵo"
 msgstr[1] "Aldoni kiel alpendaĵo"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, fuzzy, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Kun kunsendaĵo"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "sennoma"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2331,12 +2336,12 @@
 "identeco ne difinas iajn ĉifroŝlosilojn por tiu uzo.</p> <p>Elektu la "
 "uzota(j)n ŝlosilo(j)n per la identeca agorda.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Nedifinita ĉifro-ŝlosilo"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2347,12 +2352,12 @@
 "subskriboŝlosilon.</p> <p>Elektu la uzotan ŝlosilon en la identeca agordo.</"
 "p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nedifinita subskriboŝlosilo"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2363,7 +2368,7 @@
 "agordas vian adreson por ĉiuj identecoj, por ke vi ne enigu ĝin por ĉiu nura "
 "mesaĝo."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2373,37 +2378,37 @@
 "as BCC."
 msgstr "Vi devas indiki almenaŭ unu ricevonton en Al aŭ Kopio aŭ Krome-al."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "\"Al:\"-kampo estas malplena. Ĉu tamen sendi la mesaĝon?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "\"Al:\" ne donita"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Vi ne donis temon. Ĉu tamen sendi la mesaĝon?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Temo ne donita"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "S&endi tiel"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "Doni la &temon"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2413,91 +2418,91 @@
 "draft."
 msgstr "Vi devas indiki almenaŭ unu ricevonton en Al aŭ Kopio aŭ Krome-al."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Sendonta retpoŝton..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Sendi konfirmon"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Sendi tuj"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, fuzzy, kde-format
 #| msgid "No recipients"
 msgid "Too many recipients"
 msgstr "Neniuj ricevantoj"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Sendi tiel"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, fuzzy, kde-format
 #| msgid "No recipients"
 msgid "&Edit Recipients"
 msgstr "Neniuj ricevantoj"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Lose Formatting"
 msgstr "Ensalut-informoj"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "Mesaĝo kiel plena teksto"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2505,7 +2510,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2591,25 +2596,25 @@
 msgid "External editor was started."
 msgstr "Ekstera redaktilo"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2640,11 +2645,6 @@
 msgid "Message will not be encrypted"
 msgstr "Konservi senditajn mesaĝojn ĉ&ifrite"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr ""
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2693,32 +2693,32 @@
 msgid "Cannot move messages."
 msgstr "Ŝovi mesaĝojn al leterujo"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Ne eblis krei dosierujon"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No Folder Selected"
 msgid "No folder returned."
 msgstr "Neniu leterujo elektita"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Ne eblis krei dosierujon"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Removed 1 old message from folder %2."
 #| msgid_plural "Removed %1 old messages from folder %2."
 msgid "Unable to return list of folders."
 msgstr "Foriginte %1 malnovan mesaĝon de leterujo %2."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Message was signed by %1."
 msgid "Messages archived"
@@ -2763,51 +2763,51 @@
 msgid "&Existing identities:"
 msgstr "&Ekzistantaj identecoj:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Eraro dum provo de nomŝanĝo de la leterujo %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Entajpi novan vorton:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Redakti identecon"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Ĝenerale"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Nomo:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2819,12 +2819,12 @@
 "vi ne uzas tion, via nomo ne estos montrata, sed nur la retpoŝtadreso.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Organizaĵo:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2839,12 +2839,12 @@
 "per tia maniero, per kio vi volas montri ĝin en la kaplinio de la sendota "
 "letero.</p> <p>Estas orde (kaj normale) ne uzi ĝin.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Retpoŝta adreso:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Email address</h3><p>This field should have your full email "
@@ -2861,13 +2861,13 @@
 "<p>Ne aŭ malkorete uzi ĝin signifas, ke la homoj havos problemojn resendi al "
 "vi.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 #| msgid "&Email address:"
 msgid "Email a&liases:"
 msgstr "&Retpoŝta adreso:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2878,13 +2878,13 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, fuzzy, kde-format
 #| msgid "Cryptograph&y"
 msgid "Cryptography"
 msgstr "Ĉ&ifreco"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2905,12 +2905,12 @@
 "leteraj funkcioj ne estas afekciataj.</p> <p>Vi trovos pli multa pri "
 "ŝlosiloj en <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-subskriba ŝlosilo:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2934,12 +2934,12 @@
 "per OpenPGP. Normalaj leteraj funkcioj ne estos afekciataj.</p> <p>Vi povos "
 "trovi pli multan pri ŝlosilo en <a>http://www.gnupg.org</a></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-ĉifriga ŝlosilo:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2952,12 +2952,12 @@
 "povos ĉifrigi kopiojn de senditaj mesaĝojn por vi per OpenPGP. Normalaj "
 "leteraj funkcioj ne estos afekciataj.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-subskriba atestilo:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2972,43 +2972,43 @@
 "kopiojn de senditaj mesaĝojn por vi per S/MIME. Normalaj leteraj funkcioj ne "
 "estos afekciataj.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-ĉifra atestilo:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred crypto message format:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Preferata ĉifromesaĝa formo:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "&Aŭtomate subskribi mesaĝojn"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Aŭtomate &ĉifri mesaĝojn kiam eble"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, fuzzy, kde-format
 #| msgid "&Advanced"
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "&Pliaj opcioj"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Respondadreso:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -3024,13 +3024,13 @@
 "<tt>De:</tt>, sed la sepondoj adresas la tutan grupon.</p> <p>Se ĝi diras "
 "nenion al vi, lasu ĝin malplena.</p> </qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "&Nevideblaj adresoj:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3054,12 +3054,12 @@
 "de vi.</p> <p>Uzu komojn por krei liston de adresatoj.</p><p>Se ĝi diras "
 "nenion al vi, lasu ĝin malplena.</p> </qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Nevideblaj adresoj:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3075,62 +3075,62 @@
 "de vi.</p> <p>Uzu komojn por krei liston de adresatoj.</p><p>Se ĝi diras "
 "nenion al vi, lasu ĝin malplena.</p> </qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Vortaro:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Sendaĵa &leterujo:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Malnetaĵoj:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Ŝablonujo:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 #| msgid "Configure Account"
 msgid "Outgoing Account:"
 msgstr "Agordi konton"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "Sendi 'kaplinion' al mesaĝo"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "Alinomi..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 #| msgid "Choose &language:"
 msgid "Autocorrection language:"
 msgstr "Elektu &lingvon:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Nor&ma domajno:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Nor&ma domajno:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3139,36 +3139,36 @@
 "<qt> <p>La apriora domajno estas uzata por kompletigi la retpoŝtadresojn, "
 "kiuj nur konsistas de uzantulaj nomoj.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, fuzzy, kde-format
 #| msgid "&Use custom message templates"
 msgid "&Use custom message templates for this identity"
 msgstr "&Uzi proprajn mesaĝoŝablonojn"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Subskribo"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, fuzzy, kde-format
 #| msgid "&Picture"
 msgid "Picture"
 msgstr "&Bildo"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Email Alias \"%1\""
 msgstr "Nelaŭregula retpoŝtadreso"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Nelaŭregula retpoŝtadreso"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3181,7 +3181,7 @@
 "Do ĝi povas kaŭzi avertmesaĝon ĉe la adresato, kiam tie estos provata la "
 "konfirmon de ĉi tiu subskribo."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3190,7 +3190,7 @@
 "Unu el la agorditaj OpenPGP-subskribaj ŝlosiloj ne havas iun uzantnomon, kiu "
 "konvenas al la retpoŝtadreson por tiu nomo (%1). "
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3203,7 +3203,7 @@
 "Do ĝi povas kaŭzi avertmesaĝon ĉe la adresato, kiam tie estos provata la "
 "konfirmon de ĉi tiu subskribo."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3212,22 +3212,22 @@
 "Unu el la agorditaj S/MIME-subskribaj testiloj ne havas iun uzantnomon, kiu "
 "konvenas al la retpoŝtadreson por tiu nomo (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Retpoŝtadreso ne trovita en ŝlosiloj aŭ testiloj"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "La subskribodosiero de estas valida"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Redakti identecon \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3239,7 +3239,7 @@
 "La malnetaĵoj-leterujo de la identeco \"%1\" (jam) ne ekzistas. Pro tio la "
 "apriora leterujo por senditaj mesaĝoj estos uzata."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Redakti..."
@@ -3275,6 +3275,20 @@
 msgid "We cannot delete vCard file."
 msgstr "Ne eblis samigi poŝtdosierujon."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "<qt>Ĉu vi vere volas lanĉi <b>%1</b>?</qt>"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Sendi konfirmon"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3424,7 +3438,7 @@
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3458,7 +3472,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Aldoni al adresaro"
@@ -3469,23 +3483,23 @@
 msgid "Contact created successfully"
 msgstr "Mesaĝoj sukcese forigitaj"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 msgid "Failed to store contact"
 msgstr "ne havas kunsendaĵon"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Ĉu vi vere volas malplenigi la rubujon?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "New Folder"
 msgid "Attach Folder"
@@ -3704,7 +3718,7 @@
 msgstr "&Leterujo"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3712,7 +3726,7 @@
 msgstr "Apliki ĉ&iujn filtrilojn"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current folder and all subfolders"
@@ -3739,7 +3753,7 @@
 msgstr "&Plusendi"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&pliki filtrilon"
@@ -3764,7 +3778,7 @@
 msgstr "&Pepu"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, fuzzy, kde-format
 msgid "Main Toolbar"
 msgstr "HTMLa ilobreto"
@@ -3821,44 +3835,44 @@
 msgid "The file does not contain a message."
 msgstr "La dosiero ne enhavas mesaĝon."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "La dosiero enhavas kelkajn mesaĝojn. Nur la unua estas montrata."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 msgid "Send As Digest"
 msgstr "Ĉu sendi nesubskribita?"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrante mesaĝojn"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrante mesaĝon %1 el %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Movante mesaĝojn"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Forigante mesaĝojn"
@@ -3887,79 +3901,79 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "per Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Sendonta retpoŝton..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr ""
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr ""
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Labori konektite"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Labori malkonektite"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Opening Autosave File Failed"
 msgstr "Aŭtokonservado fiaskis."
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3967,7 +3981,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3975,44 +3989,46 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Sendante mesaĝojn"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, fuzzy, kde-format
 #| msgid "Initiating sender process..."
 msgid "Initiating sending process..."
 msgstr "Initante sendprocedon..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -4020,12 +4036,12 @@
 "properly installed."
 msgstr "Ne eblis starti atestilo-manaĝeron. Bonvolu kontroli vian instaladon."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail eraro"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4034,28 +4050,28 @@
 msgstr ""
 "Ne eblis lanĉi la atestiladministrilon. Bonvolu kontroli vian instaladon."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start import wizard"
 msgstr "Ne eblis krei konton"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Ne eblis lanĉi la atestiladministrilon. Bonvolu kontroli vian instaladon."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to start external editor."
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Ne eblas lanĉi eksteran redaktilon."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4064,70 +4080,70 @@
 msgstr ""
 "Ne eblis lanĉi la atestiladministrilon. Bonvolu kontroli vian instaladon."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start ImportWizard"
 msgstr "Ne eblis krei konton"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Ne eblis lanĉi la atestiladministrilon. Bonvolu kontroli vian instaladon."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "sen temo"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, fuzzy, kde-format
 msgid "(no templates)"
 msgstr "&Uzu propran sufikson por mesaĝ-identigiloj:"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Tiu leterujo ne havas iujn opciojn pri malvalidiĝo"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Ĉu vi vere volas malvalidigi la leterujon <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Malplenigi leterujon"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Forigi"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Malplenigi rubujon"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "&Movi al rubujo"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Ĉu vi vere volas malplenigi la rubujon?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4136,27 +4152,27 @@
 "<qt>Ĉu vi vere volas ŝovi ĉiujn mesaĝojn de leterujo <b>%1</b> al la rubujo?"
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Ĉiuj mesaĝoj metitaj en la rubujon"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Ĉu vi vere volas forigi ĉiujn malnovajn mesaĝojn?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Forigi malnovajn mesaĝojn?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Forigi"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, fuzzy, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4166,17 +4182,17 @@
 "Uzo de HTML en retpoŝto faras vin pli vundebla de varbmesaĝoj kaj povus "
 "altigi la verŝajnecon, ke via sistemo estos damaĝata de malica kodo."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Sekurecaverto"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Ŝargi eksterajn referencojn"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, fuzzy, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4191,431 +4207,431 @@
 "<qt>Ĉu vi vere volas forigi la %1 elektajn mesaĝojn? <br>Forigite ili ne "
 "estas rekreblaj.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Forigi mesaĝojn"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Forigi mesaĝon"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Moving messages..."
 msgstr "Movante mesaĝojn"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Deleting messages..."
 msgstr "Forigante mesaĝojn"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, fuzzy, kde-format
 #| msgid "Messages deleted successfully."
 msgid "Messages deleted successfully."
 msgstr "Mesaĝoj sukcese forigitaj"
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved successfully."
 msgstr "Mesaĝoj sukcese movitaj"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Forigo de mesaĝoj fiaskis."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Forigo de mesaĝoj interrompita."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Movo de mesaĝoj fiaskis."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Movo de mesaĝoj interrompita."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Ŝovi mesaĝojn al leterujo"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Copying messages..."
 msgstr "Movante mesaĝojn"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages copied successfully."
 msgstr "Mesaĝoj sukcese movitaj"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Copying messages failed."
 msgstr "Movo de mesaĝoj fiaskis."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Copying messages canceled."
 msgstr "Movo de mesaĝoj interrompita."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, fuzzy, kde-format
 #| msgid "Copy Message to Folder"
 msgid "Copy Messages to Folder"
 msgstr "Kopii mesaĝon al leterujo"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Moving messages to trash..."
 msgstr "Ŝovi mesaĝon al rubujo"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Deleting and moving messages to trash..."
 msgstr "Ŝovi mesaĝon al rubujo"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash successfully."
 msgstr "Mesaĝoj sukcese movitaj"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Mesaĝoj sukcese movitaj"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Moving messages to trash failed."
 msgstr "Movo de mesaĝoj fiaskis."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Movo de mesaĝoj fiaskis."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Moving messages to trash canceled."
 msgstr "Movo de mesaĝoj interrompita."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Movo de mesaĝoj interrompita."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Salti al leterujo"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "&Konservi kiel..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Forigi malnovon el ĉiuj leterujoj"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Rigardi je &nova poŝto"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail In"
 msgstr "Rigardi je &nova poŝto"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail"
 msgstr "Rigardi je &nova poŝto"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Sendi &atendantajn mesaĝojn"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr ""
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Sendi &atendantajn mesaĝojn per"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, fuzzy, kde-format
 #| msgid "Certificate Manager..."
 msgid "Certificate Manager"
 msgstr "Atestilo administrado..."
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages..."
 msgid "&Import Messages..."
 msgstr "&Importi mesaĝojn..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Sencimigi kribrilon..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filtri &protokolvidigilo..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Redakti respondojn pri \"ne en oficejo\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "Agordi &notojn..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Delayed Messages..."
 msgstr "Forigante mesaĝojn"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Trovi mesaĝojn..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, fuzzy, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Forigita"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Ŝ&ovi fadenon al rubujo"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Ŝovi fadenon al rubujo"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Forigi fa&denon"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Trovi mesaĝojn..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "&Elekti ĉiujn mesaĝojn"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Dissendolista ad&ministrado..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Asigni fulmoklavon..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Agordo pri malnovigo"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "&Archive Folder..."
 msgstr "&Nova leterujo..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr ""
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Message To..."
 msgstr "&Nova mesaĝo al..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Move Message To..."
 msgstr "&Nova mesaĝo al..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nova mesaĝo..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, fuzzy, kde-format
 #| msgid "New"
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nova"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, fuzzy, kde-format
 msgid "Message From &Template"
 msgstr "Neniuj novaj mesaĝoj de la servilo"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "N&ova mesaĝo al dissendolisto..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Krei filtrilon"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtri per &temo..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtri per &sendinto..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtri per &ricevanto..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Filtri per &ricevanto..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marki &fadenon"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marki la fadenon kiel legita"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "&Marki ĉiujn mesaĝojn en la fadenon kiel legitaj"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marki la fadenon kiel nelegita"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marki ĉiujn mesaĝojn en la fadenon kiel nelegitaj"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marki la fadenon kiel grava"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Mark la fadenon kiel negrava"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, fuzzy, kde-format
 #| msgid "Mark Thread as &New"
 msgid "Mark Thread as &Action Item"
 msgstr "Marki la fadenon kiel &nova"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 #| msgid "Remove &Important Message Mark"
 msgid "Remove &Action Item Thread Mark"
 msgstr "Marki la mesaĝon kiel negrava"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Observi &fadenon"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Ignori &fadenon"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Konservi kunsendaĵon..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Decrypted To..."
 msgstr "&Nova mesaĝo al..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Apliki ĉ&iujn filtrilojn"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4623,13 +4639,13 @@
 msgid "&Expand Thread / Group"
 msgstr "&Malfaldu fadenon"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "Malfaldi nunan fadenon"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4637,124 +4653,124 @@
 msgid "&Collapse Thread / Group"
 msgstr "&Faldu fadenon"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "Faldi nunan fadenon"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Malfal&du ĉiujn fadenojn"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Malfaldi ĉiujn fadenojn en la nuna leterujo"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Fald&u ĉiujn fadenojn"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Faldi ĉiujn fadenojn en la nuna leterujo"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Montri mesaĝon"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Sekva mesaĝo"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Iri al la sekva mesaĝo"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Se&kva nelegita mesaĝo"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr ""
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Iri al la sekva nelegita mesaĝo"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "An&taŭa mesaĝo"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Iri al la antaŭa mesaĝo"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "An&taŭa nelegita mesaĝo"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, fuzzy, kde-format
 #| msgid "&Previous Card"
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "An&taŭa karto"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Iri al la antaŭa nelegita mesaĝo"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Sekva nelegita &leterujo"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Sekva leterujo kun nelegitaj mesaĝoj"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Antaŭa nelegita leteruj&o"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Antaŭa leterujo kun nelegitaj mesaĝoj"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Sekva &nelegita teksto"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Iri al la sekva nelegita teksto"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4763,240 +4779,246 @@
 "Ŝovu la mesaĝon malsupren. Se je fino de la mesaĝo, iru al la sekva nelegita "
 "mesaĝo."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Agordi &filtrilojn..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Administri kribril&skriptojn..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Aldoni konton"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail &Enkonduko"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Montri enkondukan paĝon de KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Agordi &notojn..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "A&gordi Poŝtilon..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Malnovigi..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "Add Favorite Folder..."
 msgstr "&Kreu leterujon"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Serverside Subscription..."
 msgstr "Subskribaĵo..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Apliki ĉ&iujn filtrilojn"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "A&gordi Poŝtilon..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "&Address Book..."
 msgid "New AddressBook Contact..."
 msgstr "&Adresaro..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopii mesaĝon al leterujo"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to Folder..."
 msgstr "Salti al leterujo"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Interrompi nunan trakton"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Fokusi al sekva leterujo"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Fokusi al antaŭa leterujo"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Elekti leterujon per fokuso"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "Fokusi al sekva leterujo"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "Fokusi al sekva leterujo"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Fokusi al sekva mesaĝo"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Fokusi al antaŭa mesaĝo"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "&Elekti ĉiujn mesaĝojn"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "&Elekti ĉiujn mesaĝojn"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Elekti mesaĝon per fokuso"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, fuzzy, kde-format
 #| msgid "Show Quick Search"
 msgid "Set Focus to Quick Search"
 msgstr "Montri rapidserĉon"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, fuzzy, kde-format
 #| msgid "Focus on Previous Message"
 msgid "Extend Selection to Previous Message"
 msgstr "Fokusi al antaŭa mesaĝo"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, fuzzy, kde-format
 #| msgid "Focus on Next Message"
 msgid "Extend Selection to Next Message"
 msgstr "Fokusi al sekva mesaĝo"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Ŝovi mesaĝon al leterujo"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message W&indow"
 msgid "Use Less Bandwidth"
 msgstr "Mesaĝofenestro"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 msgid "Account &Settings"
 msgstr "&Sendado"
 
 #: kmmainwidget.cpp:3590
 #, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "Identeco"
+
+#: kmmainwidget.cpp:3601
+#, fuzzy, kde-format
 msgid "Add Favorite Folder"
 msgstr "&Kreu leterujon"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Malplenigi rubujon"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Ŝovi ĉiujn mesaĝojn al la rubujo"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Forigi serĉon"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Redakti skripton..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtrilo %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Subskribaĵo..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -5006,12 +5028,12 @@
 "Uzo de HTML en retpoŝto faras vin pli vundebla de varbmesaĝoj kaj povus "
 "altigi la verŝajnecon, ke via sistemo estos damaĝata de malica kodo."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Uzi HTMLon"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -5021,225 +5043,225 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "Re&zigni"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Starting..."
 msgstr "Subskribaĵo..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Ŝovi al rubujo"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, fuzzy, kde-format
 #| msgid "trash"
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "rubo"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Ŝovi mesaĝon al rubujo"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Move Messages to Folder"
 msgid "Cannot copy item. %1"
 msgstr "Ŝovi mesaĝojn al leterujo"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "&Nova mesaĝo al..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Respondi al..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Plusendi al..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 msgid "Add to Existing Contact"
 msgstr "ne havas kunsendaĵon"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Malfermi en adresaro"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Konservi la ligon kiel legosigno"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 msgid "Edit contact..."
 msgstr "Redaktu..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Konservi la ligon kiel..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Trovi en mesaĝo..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "Konservi la ligon kiel..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Use HTML"
 msgid "Show HTML Format"
 msgstr "Uzi HTMLon"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 #| msgid "Load external references from the Internet for this message."
 msgid "Load external reference when mail comes for this contact"
 msgstr "Permesu &legi aleksterajn refrencojn el la reto"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "Konservi la ligon kiel..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG-subteno"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "&Konfirmi antaŭ sendo"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE-Poŝtilo"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folderlist"
 msgid "Retrieving Folder Contents"
 msgstr "Retrovante leterujan liston"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Bonvolu atendi"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "Labori malkonektite"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Contact modified successfully"
 msgstr "Mesaĝoj sukcese movitaj"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Novaj mesaĝoj en"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, fuzzy, kde-format
 #| msgid "There are no unread messages"
 msgid "There are no unread messages"
 msgstr "Estas neniuj nelegitaj mesaĝoj"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, fuzzy, kde-format
 #| msgid "Unread Message"
 msgid "1 unread message"
@@ -5263,8 +5285,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5358,18 +5380,18 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Kontaktoj"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5418,27 +5440,27 @@
 msgid "All"
 msgstr "Ĉiuj"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© 1997-2004, La Retpoŝtilo-programistoj"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5467,7 +5489,7 @@
 msgid "&Reply"
 msgstr "&Respondu"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "R&espondi..."
@@ -5477,12 +5499,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Respondi al aŭtoro..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Respondi &al ĉiuj..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Resondi al &dissendolisto..."
@@ -5514,7 +5536,7 @@
 msgid "&Edit As New"
 msgstr "&Redakti mesaĝon"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5723,121 +5745,121 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Trovi mesaĝojn"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, fuzzy, kde-format
 #| msgid "&Search"
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Serĉi"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, fuzzy, kde-format
 #| msgid "&Inline..."
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "E&ntekstigi..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Kunsendu..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "&Konservi kunsendaĵon..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Forigi la elekton"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "Salti al leterujo"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 trovo"
 msgstr[1] "%1 trovoj"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Lasta serĉo"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 #| msgid "Could not sync maildir folder."
 msgid "You did not selected a valid folder."
 msgstr "Ne eblis samigi poŝtdosierujon."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Searching..."
 msgstr "Subskribaĵo..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Move Messages to Folder"
 msgid "Cannot get search result. %1"
 msgstr "Ŝovi mesaĝojn al leterujo"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 msgid "Search failed."
 msgstr "Serĉo haltigita"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid " Spell check complete."
 msgid "Search complete."
 msgstr " Literumado preta."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid " Spell check stopped."
 msgid "Search stopped."
 msgstr " Literumado finita."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5845,7 +5867,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, fuzzy, kde-format
 #| msgid "Copy Messages"
 msgid "Copy Message"
@@ -5853,7 +5875,7 @@
 msgstr[0] "Kopii mesaĝojn"
 msgstr[1] "Kopii mesaĝojn"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, fuzzy, kde-format
 #| msgid "Cut Messages"
 msgid "Cut Message"
@@ -5861,7 +5883,7 @@
 msgstr[0] "Tondi mesaĝojn"
 msgstr[1] "Tondi mesaĝojn"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Checking index status..."
@@ -5990,7 +6012,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5998,7 +6020,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -6007,20 +6029,20 @@
 "La valoro estas uzata por decidi, ĉu la Poŝtila enkonduko estos vidigita."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 #| msgid "Show quick search line edit"
 msgid "Show folder quick search line edit"
 msgstr "Montri rapidserĉan liniredaktilon"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Warn if the number of recipients is more than:"
@@ -6028,7 +6050,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -6037,20 +6059,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "&Konfirmi antaŭ sendo"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Aŭto&mate postuli ricevkonfirmojn"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, fuzzy, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -6066,13 +6088,13 @@
 "ricevkonfirmojn</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Aŭtomate konservi ĉiun:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -6083,159 +6105,159 @@
 "La uzata intervalo estas agordebla ĉi tie. Vi povas neebligi ĝin per nulo."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 #| msgid "Show crypto &icons"
 msgid "Show crypto label indicator"
 msgstr "Montri ĉ&ifro-piktogramojn"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Mesaĝan antaŭrigardofenestron"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, fuzzy, kde-format
 #| msgid "&Do not show a message preview pane"
 msgid "Do not show a message preview pane"
 msgstr "N&e montri mesaĝan antaŭrigardofenestron"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane belo&w the message list"
 msgid "Show the message preview pane below the message list"
 msgstr "Montri mesaĝan antaŭrigardofenestron su&b la mesaĝolisto"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane ne&xt to the message list"
 msgid "Show the message preview pane next to the message list"
 msgstr "Montri mesaĝan antaŭrigardofenestron apu&d la mesaĝolisto"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Leterujolisto"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, fuzzy, kde-format
 #| msgid "Lon&g folder list"
 msgid "Long folder list"
 msgstr "Lon&ga leterujolisto"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, fuzzy, kde-format
 #| msgid "Shor&t folder list"
 msgid "Short folder list"
 msgstr "Mall&onga leterujolisto"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Mesaĝolisto - Dato"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, fuzzy, kde-format
 #| msgid "Message template for forward"
 msgid "Message template for reply"
 msgstr "Mesaĝoŝablono por plusendado"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, fuzzy, kde-format
 #| msgid "Message template for forward"
 msgid "Message template for reply to all"
 msgstr "Mesaĝoŝablono por plusendado"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Mesaĝoŝablono por plusendado"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Citsignoj"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6243,7 +6265,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6251,7 +6273,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6259,7 +6281,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6267,7 +6289,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6275,7 +6297,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6560,7 +6582,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6922,10 +6944,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check &Mail"
-msgid "Check Mail Url Tracking"
-msgstr "Rigardi je &nova poŝto"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7583,6 +7604,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Reebligu ĉiujn \"Ne demandu refoje\" avertojn"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7644,6 +7675,11 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Check &Mail"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Rigardi je &nova poŝto"
+
 #~ msgid "&Reply to:"
 #~ msgstr "&Respondo al:"
 
@@ -10850,11 +10886,6 @@
 #~ msgstr "Forigu identecon"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Identeco"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "La &servilo subtenas Sievon"
@@ -12702,12 +12733,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "Malfermante URLon..."
 
-#, fuzzy
-#~| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "<qt>Ĉu vi vere volas lanĉi <b>%1</b>?</qt>"
-
 #~ msgid "Execute"
 #~ msgstr "Lanĉi"
 
diff -Nru kmail-19.04.3/po/es/akonadi_archivemail_agent.po kmail-19.12.3/po/es/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/es/akonadi_archivemail_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/es/akonadi_archivemail_agent.po	2020-03-03 00:33:59.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-29 23:29+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
@@ -176,14 +176,14 @@
 "No se puede añadir un segundo archivo a esta carpeta. Modifique el existente "
 "en su lugar."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "El directorio no existe. Por favor, verifique las preferencias. Archivo "
 "pendiente."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Iniciar a archivo %1"
diff -Nru kmail-19.04.3/po/es/akonadi_followupreminder_agent.po kmail-19.12.3/po/es/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/es/akonadi_followupreminder_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/es/akonadi_followupreminder_agent.po	2020-03-03 00:33:59.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-29 23:29+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
@@ -17,97 +17,97 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 18.12.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agente de recordatorio de seguimiento"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Recordatorio de seguimiento"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Derechos de autor © 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Responsable"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Javier Viñal"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "fjvinal@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Asunto"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Línea muerta"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Respuesta"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Recibido"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Retenido"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Mostrar mensaje"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Borrar"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "¿Quiere usted eliminar el elemento seleccionado?"
 msgstr[1] "¿Quiere usted eliminar estos %1 elementos seleccionados?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Respuesta desde %1 recibida"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Usted todavía espera una respuesta sobre este correo:"
diff -Nru kmail-19.04.3/po/es/akonadi_mailfilter_agent.po kmail-19.12.3/po/es/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/es/akonadi_mailfilter_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/es/akonadi_mailfilter_agent.po	2020-03-03 00:33:59.000000000 +0000
@@ -2,19 +2,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Javier Vinal <fjvinal@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2018.
+# Eloy Cuadra <ecuadra@eloihr.net>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2018-10-03 22:35+0100\n"
-"Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
+"PO-Revision-Date: 2019-12-26 22:34+0100\n"
+"Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.12.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: filterlogdialog.cpp:67
@@ -22,43 +23,43 @@
 msgid "Filter Log Viewer"
 msgstr "Filtrar visor de registro"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Compartir..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Registrar actividades de filtrado"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
 "data is collected and shown only when logging is turned on. "
 msgstr ""
-"Usted puede activar o desactivar el registro de actividades de filtrado "
-"aquí. Por supuesto, los datos de registro se recolectan y muestran solo "
-"cuando el registro está activado. "
+"Aquí puede activar o desactivar el registro de actividades de filtrado. Por "
+"supuesto, los datos de registro se recopilan y se muestran solo cuando el "
+"registro está activado. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalles de registrado"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Descripción del patrón de registro"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Evaluación de &reglas de filtrado de registro"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -67,40 +68,40 @@
 "about the result of the evaluation of all rules of a single filter will be "
 "given."
 msgstr ""
-"Usted puede controlar la información en el registro relacionada con la "
-"evaluación de las reglas de filtrado de los filtros aplicados: si esta "
-"opción está marcada proporcionará sugerencias detalladas de cada regla "
-"individual, de otro modo, solo se proporcionarán sugerencias sobre la "
-"evaluación de todas las reglas de un filtro sencillo."
+"Puede controlar la información en el registro relacionada con la evaluación "
+"de las reglas de filtrado de los filtros aplicados: si esta opción está "
+"marcada proporcionará sugerencias detalladas de cada regla individual, de "
+"otro modo, solo se proporcionarán sugerencias sobre la evaluación de todas "
+"las reglas de un filtro sencillo."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Registrar la evaluación de patrones de filtrado"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Registrar acciones de filtrado"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Límite de tamaño del registro:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "ilimitado"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -108,12 +109,12 @@
 "collected log data exceeds this limit then the oldest data will be discarded "
 "until the limit is no longer exceeded. "
 msgstr ""
-"La recolección de datos de registro emplea memoria temporal para almacenar "
-"los datos: aquí usted puede limitar la cantidad máxima de memoria que se "
-"usa; si el tamaño de los datos de registro recolectados excede de este "
-"límite, los datos más antiguos se desechan hasta que el límite no se exceda. "
+"La recopilación de datos de registro emplea memoria temporal para almacenar "
+"los datos: aquí puede limitar la cantidad máxima de memoria que se usa; si "
+"el tamaño de los datos de registro recopilados excede de este límite, los "
+"datos más antiguos se desechan hasta que el límite no se exceda. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -122,63 +123,63 @@
 "No se ha podido escribir el archivo %1:\n"
 "«%2» es la descripción detallada del error."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Error de KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrando el mensaje %1 de %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Error aplicando movimiento de filtro de correo"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Error aplicando borrado de filtro de correo"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Error aplicando modificaciones de filtro de correo"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Evaluación de reglas de filtrado:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Las reglas de filtrado han coincidido.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Inicio del filtrado en el mensaje «%1»desde «%2» a «%3»:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrando mensajes"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Registro de filtro de correo activado"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Preparado"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrando en %1"
diff -Nru kmail-19.04.3/po/es/akonadi_sendlater_agent.po kmail-19.12.3/po/es/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/es/akonadi_sendlater_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/es/akonadi_sendlater_agent.po	2020-03-03 00:33:59.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-12-29 23:30+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
@@ -59,124 +59,124 @@
 msgid "Your emails"
 msgstr "fjvinal@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Para"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Asunto"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Enviar alrededor de"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Se repite"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Id. de mensaje"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "No hay mensajes esperando..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Enviar ahora"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Borrar"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Sí"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "No"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "¿Quiere usted borrar el elementos seleccionado?"
 msgstr[1] "¿Quiere usted borrar los elementos seleccionados?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Eliminar elementos"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "¿Quiere usted eliminar también todos los mensajes?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Eliminar mensajes"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "No se encontraron mensajes."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Ningún mensaje encontrado."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Error al recuperar mensaje."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "No se puede obtener el mensaje. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "No podemos crear el transporte"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "El mensaje no es un mensaje real"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "No se puede enviar el mensaje."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Mensaje enviado"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Se encontró un error. ¿Quiere usted reenviarlo?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Se encontró un error"
diff -Nru kmail-19.04.3/po/es/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/es/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/es/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/es/akonadi_unifiedmailbox_agent.po	2020-03-03 00:33:59.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-18 23:14+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Sincronizando la bandeja de correo unificada %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Añadir una bandeja de correo unificadas"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nombre:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Elegir icono..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Icono:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Enviado"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Borradores"
diff -Nru kmail-19.04.3/po/es/docs/akonadi_archivemail_agent/index.docbook kmail-19.12.3/po/es/docs/akonadi_archivemail_agent/index.docbook
--- kmail-19.04.3/po/es/docs/akonadi_archivemail_agent/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/akonadi_archivemail_agent/index.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -55,9 +55,9 @@
 >&FDLNotice;</legalnotice>
 
 <date
->2013-08-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.11</releaseinfo>
+>Aplicaciones 19.12</releaseinfo>
 </articleinfo>
 
 <sect1 id="introduction">
@@ -75,7 +75,7 @@
 <para
 >Use <menuchoice
 ><guimenu
->Herramientas</guimenu
+>Preferencias</guimenu
 ><guimenuitem
 >Configurar archivado automático...</guimenuitem
 > </menuchoice
@@ -123,7 +123,7 @@
 >, la ruta a la carpeta seleccionada en la lista de carpetas de &kmail;, la fecha en formato <userinput
 >año-mes-día</userinput
 > y la extensión de archivo seleccionada, &eg; <filename
->Archivo_Carpeta local_bandeja de entrada_2013-09-03.tar.bz2</filename
+>Archivo_Carpeta local_bandeja de entrada_2019-09-03.tar.bz2</filename
 >. </para
 ></listitem>
 <listitem
@@ -178,6 +178,18 @@
 <para
 >Usted puede usar la casilla de verificación de la izquierda de cada entrada de la lista para activar o desactivar el archivado de este trabajo. </para>
 <para
+>Se puede acceder a este diálogo de configuración en cualquier momento posterior usando <menuchoice
+><guimenu
+>Preferencias</guimenu
+> <guimenuitem
+>Configurar &kmail;...</guimenuitem
+></menuchoice
+> y seleccionando la página <guilabel
+>Complementos</guilabel
+> en la ventana principal de &kmail; y pulsando el botón de configuración del elemento <guilabel
+>Agente de archivado de correo</guilabel
+>. </para>
+<para
 >Usando el menú contextual lanzado con un &RMB; al pulsar sobre un trabajo de archivo, usted puede abrir la carpeta que contiene los archivos o iniciar el trabajo de archivo inmediatamente. Esto sobrescribirá un archivo existente creado antes en el mismo día sin notificación. </para>
 
 </sect2>
@@ -190,16 +202,15 @@
 <para
 >&i18n-archivemailagent;</para>
 <para
->Derechos de autor del programa 2013 Laurent Montel montel@kde.org </para>
+>Copyright del programa 2013-2019 Laurent Montel montel@kde.org </para>
 <para
->Derechos de autor de la documentación &copy; 2013 Laurent Montel montel@kde.org </para>
+>Copyright de la documentación &copy; 2013-2019 Laurent Montel montel@kde.org </para>
 
 <para
 >Traducido por Javier Viñal <email
 >fjvinal@gmail.com</email
 ></para
-> 
-&underFDL; &underGPL; </sect2>
+> &underFDL; &underGPL; </sect2>
 
 </sect1>
 
diff -Nru kmail-19.04.3/po/es/docs/akonadi_sendlater_agent/index.docbook kmail-19.12.3/po/es/docs/akonadi_sendlater_agent/index.docbook
--- kmail-19.04.3/po/es/docs/akonadi_sendlater_agent/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/akonadi_sendlater_agent/index.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -57,9 +57,9 @@
 </copyright>
 
 <date
->2013-11-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.12</releaseinfo>
+>Aplicaciones 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -122,13 +122,17 @@
 <para
 >Al iniciar una sesión de &kde;, el agente comprueba los mensajes planificados y envía todos los mensajes vencidos desde el último cierre de sesión si es necesario. </para>
 <para
->Para cambiar las opciones para correos que usted haya planificado para más tarde use <menuchoice
+>Para cambiar las opciones para los mensajes que haya programado para enviar más tarde, use <menuchoice
 ><guimenu
 >Preferencias</guimenu
 > <guimenuitem
->Configurar agente de enviar más tarde...</guimenuitem
+>Configurar &kmail;...</guimenuitem
 ></menuchoice
-> en &kmail;. </para>
+> y seleccione la página <guilabel
+>Complementos</guilabel
+> en &kmail; y pulse el botón de configuración del elemento <guilabel
+>Agente para enviar más tarde</guilabel
+>. </para>
 
 <screenshot>
 <screeninfo
@@ -164,16 +168,15 @@
 <para
 >&i18n-sendlateragent;</para>
 <para
->Derechos de autor del programa 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright del programa 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Derechos de autor de la documentación &copy; 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright de la documentación &copy; 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Traducido por Javier Viñal <email
 >fjvinal@gmail.com</email
 ></para
-> 
-&underFDL; &underGPL; </sect2>
+> &underFDL; &underGPL; </sect2>
 
 </sect1>
 
diff -Nru kmail-19.04.3/po/es/docs/kmail2/configure.docbook kmail-19.12.3/po/es/docs/kmail2/configure.docbook
--- kmail-19.04.3/po/es/docs/kmail2/configure.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/kmail2/configure.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -849,8 +849,8 @@
 ></term>
 <listitem>
 <para
->Use este campo para introducir una cadena arbitraria X-Face. Hay ejemplos disponibles en <ulink url="http://ace.home.xs4all.nl/X-Faces/"
->http://ace.home.xs4all.nl/X-Faces/</ulink
+>Use este campo para introducir una cadena arbitraria X-Face. Hay ejemplos disponibles en <ulink url="https://ace.home.xs4all.nl/X-Faces/"
+>https://ace.home.xs4all.nl/X-Faces/</ulink
 > </para>
 </listitem>
 </varlistentry>
@@ -1423,7 +1423,7 @@
 <para
 >Por omisión, <guilabel
 >Activar tecla de acceso</guilabel
-> está activado. Las teclas de acceso le permiten usar las teclas para funciones que quizás podrían realizarse normalmente con el ratón, tales como seguir enlaces. Para más información sobre teclas de acceso, por favor, consulte <ulink url="http://docs.kde.org/stable/en/applications/konqueror/accesskeys.html"
+> está activado. Las teclas de acceso le permiten usar las teclas para funciones que quizás podrían realizarse normalmente con el ratón, tales como seguir enlaces. Para más información sobre teclas de acceso, por favor, consulte <ulink url="https://docs.kde.org/stable/en/applications/konqueror/accesskeys.html"
 >Teclas de acceso</ulink
 >.</para>
 <para
@@ -2507,7 +2507,7 @@
          <listitem>
 	      <para
 >Introduzca la dirección del servidor de validación de certificados en línea. La &URL;, generalmente comienza por <emphasis
->http://</emphasis
+>https://</emphasis
 >. </para>
 	  </listitem>
 	</varlistentry>
diff -Nru kmail-19.04.3/po/es/docs/kmail2/credits-and-licenses.docbook kmail-19.12.3/po/es/docs/kmail2/credits-and-licenses.docbook
--- kmail-19.04.3/po/es/docs/kmail2/credits-and-licenses.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/kmail2/credits-and-licenses.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -76,8 +76,8 @@
 >Créditos y licencia</title>
 
 <para
->&kmail;: Derechos de autor, los desarrolladores de &kmail;, 1997-2013</para>
-&underGPL; &underFDL; <sect1 id="team">
+>&kmail;: Derechos de autor, los desarrolladores de &kmail;, 1997-2013</para
+>&underGPL; &underFDL; <sect1 id="team">
 <title
 >Equipo de desarrollo</title>
 <!-- please keep in sync with the authors list on the webpage -->
diff -Nru kmail-19.04.3/po/es/docs/kmail2/faq.docbook kmail-19.12.3/po/es/docs/kmail2/faq.docbook
--- kmail-19.04.3/po/es/docs/kmail2/faq.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/kmail2/faq.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -102,7 +102,7 @@
     </listitem>
   </itemizedlist>
 <para
->Usted también puede emplear el guion en <ulink url="http://userbase.kde.org/Special:myLanguage/Tutorials/Modify_KDE_Software_Defaults"
+>Usted también puede emplear el guion en <ulink url="https://userbase.kde.org/Special:myLanguage/Tutorials/Modify_KDE_Software_Defaults"
 >Tutorials/Modify_KDE_Software_Defaults</ulink
 ></para>
 </answer>
@@ -669,7 +669,7 @@
 <para
 ><emphasis
 >Síntoma:</emphasis
-> Usted quiere iniciar &kmail; desde un entorno de escritorio minimalista como <ulink url="http://en.wikipedia.org/wiki/Fvwm2"
+> Usted quiere iniciar &kmail; desde un entorno de escritorio minimalista como <ulink url="https://en.wikipedia.org/wiki/Fvwm2"
 >fvwm2</ulink
 >. No se inicia.</para>
 <para
@@ -1193,7 +1193,7 @@
 >Primero debería comprobar si su distribución permite hacer esto. Probablemente ya se haya configurado durante la instalación.</para>
 
 <para
->Si no fuera el caso, usted puede querer echar un vistazo al <ulink url="http://tldp.org/HOWTO/Mail-Queue.html"
+>Si no fuera el caso, usted puede querer echar un vistazo al <ulink url="https://www.tldp.org/HOWTO/Mail-Queue.html"
 >Cómo de las colas de correo</ulink
 >.</para
 ></answer>
diff -Nru kmail-19.04.3/po/es/docs/kmail2/intro.docbook kmail-19.12.3/po/es/docs/kmail2/intro.docbook
--- kmail-19.04.3/po/es/docs/kmail2/intro.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/kmail2/intro.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -168,8 +168,8 @@
 >. </para
 ></note>
 <para
->La página inicial de &kmail; se puede visitar en <ulink url="http://userbase.kde.org/KMail"
->http://userbase.kde.org/KMail</ulink
+>La página inicial de &kmail; se puede visitar en <ulink url="https://userbase.kde.org/Special:MyLanguage/KMail"
+>https://userbase.kde.org/KMail</ulink
 >. Allí podrá encontrar enlaces útiles, &eg; a las listas de correo de desarrolladores y usuarios. Haga el favor de informar sobre errores de &kmail; usando <menuchoice
 ><guimenu
 >Ayuda</guimenu
diff -Nru kmail-19.04.3/po/es/docs/kmail2/menus.docbook kmail-19.12.3/po/es/docs/kmail2/menus.docbook
--- kmail-19.04.3/po/es/docs/kmail2/menus.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/kmail2/menus.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -129,7 +129,7 @@
 ></term>
 <listitem
 ><para
->Aquí usted puede crear varios elementos nuevos como sigue:</para
+>Aquí puede crear varios elementos nuevos como se describe a continuación:</para
 ></listitem>
 </varlistentry>
 <varlistentry id="reader-file-new-newmessage">
@@ -169,7 +169,7 @@
 >Editar desde plantillas</link
 > para información adicional sobre la creación de plantillas.</para>
 <para
->Si usted no tiene ninguna plantilla de mensaje guardada, usted verá <menuchoice
+>Si no tiene ninguna plantilla de mensaje guardada, verá <menuchoice
 ><guimenu
 >Mensaje</guimenu
 ><guisubmenu
@@ -485,7 +485,7 @@
 >Comprueba si ha llegado correo nuevo a la carpeta que está seleccionada en ese momento y todas sus subcarpetas.</action
 ></para>
 <para
->Usted también puede seleccionar varias carpetas y la opción de menú se convertirá en <menuchoice
+>También puede seleccionar varias carpetas y la opción de menú se convertirá en <menuchoice
 ><guimenu
 >Archivo</guimenu
 ><guimenuitem
@@ -513,7 +513,7 @@
 >Envía los mensajes que están en su bandeja de salida.</action
 > Los mensajes pueden terminar en su bandeja de salida seleccionando <guibutton
 >encolar</guibutton
-> en el menú del editor. Edita un mensaje en modo desconectado y lo envía mientras usted no dispone de conexión a Internet.</para
+> en el menú del editor. Edita un mensaje en modo desconectado y lo envía mientras no dispone de conexión a Internet.</para
 ></listitem>
 </varlistentry>
 <varlistentry id="reader-send-queued-messages-via">
@@ -632,11 +632,11 @@
 ><para
 ><action
 >Abre una ventana de búsqueda</action
-> que le permite buscar mensajes con ciertas características, &eg; cierto asunto. Por favor, consulte <link linkend="filter-criteria"
+> que le permite buscar mensajes con ciertas características, &eg; cierto asunto. Consulte <link linkend="filter-criteria"
 >Criterios de filtro</link
 > para detalles sobre opciones de búsqueda.</para>
 <para
->Sus resultados de búsqueda se mostrarán en el cuadro de texto, en cuyo punto usted puede abrir la <guibutton
+>El resultado de la búsqueda se mostrará en el área de texto, en cuyo punto puede abrir la <guibutton
 >Carpeta de abrir búsqueda</guibutton
 > o resaltar el mensaje deseado y seleccionar <guibutton
 >Abrir mensaje</guibutton
@@ -754,7 +754,7 @@
 ><para
 ><guilabel
 >Remitente/destinatario inteligente</guilabel
-> mostrará el remitente cuando usted esté leyendo en su carpeta de bandeja de salida/plantilla y muestra el destinatario cuando usted está en subcarpetas de la bandeja de entrada/salida.</para
+> mostrará el remitente cuando esté leyendo en la carpeta de bandeja de salida/plantilla y muestra el destinatario cuando está en subcarpetas de la bandeja de entrada/salida.</para
 ></listitem>
     <listitem
 ><para
@@ -762,7 +762,7 @@
 >Por estado de elementos de acción</guilabel
 > y <guilabel
 >Por estado importante</guilabel
-> necesitan establecerse antes de que puedan clasificarse. Por favor, consulte <link linkend="reader-mark-messages"
+> necesitan establecerse antes de que puedan clasificarse. Consulte <link linkend="reader-mark-messages"
 >Marcar mensajes</link
 > para más información sobre el marcado de sus mensajes.</para
 ></listitem>
@@ -816,7 +816,7 @@
 <para
 ><guilabel
 >Configurar...</guilabel
-> le permite configurar temas, por favor consulte <link linkend="configure-appearance-message-list"
+> le permite configurar temas, consulte <link linkend="configure-appearance-message-list"
 >Configurar apariencia de la lista de mensajes</link
 > para más información sobre temas.</para
 ></listitem>
@@ -877,7 +877,7 @@
 ><para
 ><action
 >Seleccione su vista de encabezados.</action
-> Por favor, consulte <link linkend="using-header-options"
+> Consulte <link linkend="using-header-options"
 >Opciones de encabezados</link
 > para más detalles sobre encabezados.</para
 ></listitem>
@@ -897,7 +897,7 @@
 >Cambia el modo en el que aparecen los adjuntos en el <guilabel
 >Panel de vista previa del mensaje</guilabel
 ></action
-> (independientemente del árbol &MIME;). Por favor, consulte <link linkend="using-attachment-view-options"
+> (independientemente del árbol &MIME;). Consulte <link linkend="using-attachment-view-options"
 > Opciones de adjuntos</link
 > para más detalles sobre adjuntos.</para
 ></listitem>
@@ -1006,7 +1006,7 @@
 > Esto puede ser útil para encontrar el origen de un correo. </para>
 <note
 ><para
->Usted debería saber qué es fácil falsear el encabezado <literal
+>Debería saber qué es fácil falsear el encabezado <literal
 >De:</literal
 > de un correo, aunque siempre podrá investigar qué servidores de correo se han usado para enviar el mensaje observando las líneas <literal
 >Recibido:</literal
@@ -1372,9 +1372,9 @@
 ></para>
 <note
 ><para
->Esto solo está disponible si la carpeta actualmente seleccionada no es una papelera, usted verá <guilabel
+>Esto solo está disponible si la carpeta actualmente seleccionada no es una papelera, verá <guilabel
 >Vaciar papelera</guilabel
->. Por favor, consulte la siguiente sección para más detalles.</para
+>. Consulte la siguiente sección para más detalles.</para
 ></note
 ></listitem>
 </varlistentry>
@@ -1411,7 +1411,7 @@
 ><para
 ><action
 >Muestra un diálogo que le permite crear un archivo de la carpeta actualmente selecciona.</action
-> Por favor, consulte <link linkend="folder-archive"
+> Consulte <link linkend="folder-archive"
 >Archivado de carpetas</link
 > para más detalles.</para>
  </listitem>
@@ -1432,7 +1432,7 @@
 ></para>
 <warning
 ><para
->Por favor, tenga en cuenta que no hay forma de acceder al contenido de una carpeta una vez que haya sido eliminada.</para
+>Tenga en cuenta que no hay forma de acceder al contenido de una carpeta una vez que haya sido eliminada.</para
 ></warning
 ></listitem>
 </varlistentry>
@@ -1471,7 +1471,7 @@
 ><para
 ><action
 >Aplica todos los filtros configurados a la carpeta actualmente seleccionada.</action
-> Por favor, consulte <link linkend="filter-dialog-id"
+> Consulte <link linkend="filter-dialog-id"
 >Diálogo de filtros</link
 > para más información sobre filtros.</para
 ></listitem>
@@ -1507,7 +1507,7 @@
 ></term>
 <listitem
 ><para
->Si usted tiene activados los mensajes &html; (consulte arriba), entonces dispone de la opción de activar esto para que <action
+>Si tiene activados los mensajes &html; (consulte arriba), entonces dispone de la opción de activar esto para que <action
 >las imágenes y recursos enlazados desde la web se carguen automáticamente.</action
 ></para>
 <warning
@@ -1580,7 +1580,7 @@
 >Abre la <link linkend="the-composer-window"
 >ventana del editor</link
 ></action
-> para que usted pueda escribir un mensaje nuevo.</para
+> para que pueda escribir un mensaje nuevo.</para
 ></listitem>
 </varlistentry>
 <varlistentry id="reader-message-new-message-to-mailing-list">
@@ -1601,7 +1601,7 @@
 <listitem
 ><para
 ><action
->Abre la ventana del editor para que usted pueda escribir un mensaje nuevo.</action
+>Abre la ventana del editor para que pueda escribir un mensaje nuevo.</action
 > Si la carpeta actual alberga una lista de correo y tiene definida una dirección de envío, esta dirección será la usada de forma predeterminada en el campo <guilabel
 >Para:</guilabel
 >.</para
@@ -1625,8 +1625,8 @@
 ><action
 >Abre la ventana del editor, inserta el texto citado del mensaje y define el campo <guilabel
 >Para:</guilabel
-> como la dirección de la lista de correo (si es que usted está respondiendo al mensaje de una lista de correo) o con la dirección de respuesta del remitente.</action
-> Si usted quiere controlar qué dirección debe mostrar el campo <guilabel
+> como la dirección de la lista de correo (si es que está respondiendo al mensaje de una lista de correo) o con la dirección de respuesta del remitente.</action
+> Si quiere controlar qué dirección debe mostrar el campo <guilabel
 >Para:</guilabel
 > de forma predefinida debería, o usar <link linkend="reader-message-reply-special"
 >Responder especial</link
@@ -1929,7 +1929,7 @@
 >Ofrece diversas opciones para mensajes de listas de correo.</para>
 <note
 ><para
->La carpeta de trabajo actual debe configurarse como una lista de correo para que esto esté disponible. Por favor, consulte <link linkend="folders-properties-mailinglist"
+>La carpeta de trabajo actual debe configurarse como una lista de correo para que esto esté disponible. Consulte <link linkend="folders-properties-mailinglist"
 >Propiedades de carpeta de la lista de correo</link
 > para más información sobre como configurar listas de correo. Las siguientes opciones están disponibles para las carpetas de lista de correo.</para
 ></note>
@@ -2008,7 +2008,7 @@
 ><para
 ><action
 >Copia los mensajes seleccionados a una carpeta específica,</action
-> usted puede elegir desde carpetas recientes, carpetas locales o a una carpeta de cuenta específica.</para
+> puede elegir desde carpetas recientes, carpetas locales o a una carpeta de cuenta específica.</para
 ></listitem>
 </varlistentry>
 <varlistentry id="reader-message-move-message-to">
@@ -2022,7 +2022,7 @@
 ></term>
 <listitem
 ><para
->Lo mismo que copiar un mensaje a, excepto que usted <action
+>Lo mismo que copiar un mensaje a, excepto que <action
 >mueve permanentemente los mensajes seleccionados a una carpeta específica.</action
 ></para
 ></listitem>
@@ -2344,7 +2344,7 @@
 >Le permite <guimenuitem
 >Aplicar todos los filtros</guimenuitem
 >.</action
-> Si usted tiene configurado el filtrado de correo basura mediante <link linkend="the-anti-spam-wizard"
+> Si tiene configurado el filtrado de correo basura mediante <link linkend="the-anti-spam-wizard"
 > Asistente anti correo basura</link
 >, las opciones <guimenuitem
 >Clasificar como correo basura</guimenuitem
@@ -2411,11 +2411,11 @@
 ><para
 ><action
 >Abre una ventana de búsqueda</action
-> que le permite buscar mensajes con ciertas características, &eg; cierto asunto. Por favor, consulte <link linkend="filter-criteria"
+> que le permite buscar mensajes con ciertas características, &eg; cierto asunto. Consulte <link linkend="filter-criteria"
 >Criterios de filtro</link
 > para detalles sobre opciones de búsqueda.</para>
 <para
->Sus resultados de búsqueda se mostrarán en el cuadro de texto, en cuyo punto usted puede abrir la <guibutton
+>El resultado de la búsqueda se mostrará en el área de texto, en cuyo punto puede abrir la <guibutton
 >Carpeta de abrir búsqueda</guibutton
 > o resaltar el mensaje deseado y seleccionar <guibutton
 >Abrir mensaje</guibutton
@@ -2459,7 +2459,7 @@
 >,</action
 > una herramienta que presenta la salida de depuración de la aplicación <application
 >GnuPG</application
->. Si el firmado, el cifrado o la verificación dejan de funcionar misteriosamente, usted puede encontrar las causas echando un vistazo a este registro.</para
+>. Si el firmado, el cifrado o la verificación dejan de funcionar misteriosamente, puede encontrar las causas echando un vistazo a este registro.</para
 ></listitem>
 </varlistentry>
 <varlistentry id="reader-tools-edit-out-of-office-replies">
@@ -2503,10 +2503,10 @@
 >Lanza el diálogo <guilabel
 >Diagnósticos de Sieve</guilabel
 >.</action
-> Esto es útil para depurar sieve si usted tiene problemas con él.</para>
+> Esto es útil para depurar sieve si tiene problemas con él.</para>
 <note
 ><para
->Usted debe tener implementación de sieve en su servidor de correo.</para
+>Debe tener implementación de sieve en su servidor de correo.</para
 ></note
 ></listitem>
 </varlistentry>
@@ -2539,7 +2539,7 @@
 ><para
 ><action
 >Muestra el diálogo del asistente de importación</action
-> que asiste en la importación fácil de preferencias y correo. Por favor, consulte <ulink url="help:/importwizard"
+> que asiste en la importación fácil de preferencias y correo. Consulte <ulink url="help:/importwizard"
 >Asistente de importación</ulink
 > para más detalles.</para
 ></listitem>
@@ -2557,7 +2557,7 @@
 ><para
 ><action
 >Muestra el diálogo del exportador de preferencias de PIM</action
-> que asiste en la exportación fácil de preferencias y correo. Por favor, consulte <ulink url="help:/pimsettingexporter"
+> que asiste en la exportación fácil de preferencias y correo. Consulte <ulink url="help:/pimsettingexporter"
 >pimsettingexporter</ulink
 > para más detalles.</para
 ></listitem>
@@ -2575,7 +2575,7 @@
 ><para
 ><action
 >Muestra el diálogo del asistente de cuentas</action
-> que asiste en configurar cuentas fácilmente. Por favor, consulte <link linkend="account-wizard"
+> que asiste en configurar cuentas fácilmente. Consulte <link linkend="account-wizard"
 >Asistente de cuentas</link
 > para más detalles.</para
 ></listitem>
@@ -2593,7 +2593,7 @@
 ><para
 ><action
 >Muestra el asistente anti correo basura</action
-> que puede ayudarle a configurar el filtrado del correo basura. Por favor, consulte <link linkend="the-anti-spam-wizard"
+> que puede ayudarle a configurar el filtrado del correo basura. Consulte <link linkend="the-anti-spam-wizard"
 >Asistente anti correo basura</link
 > para más detalles.</para
 ></listitem>
@@ -2611,7 +2611,7 @@
 ><para
 ><action
 >Muestra el asistente antivirus</action
-> que puede ayudarle en configurar mensajes de exploración para virus. Por favor, consulte <link linkend="the-anti-virus-wizard"
+> que puede ayudarle en configurar mensajes de exploración para virus. Consulte <link linkend="the-anti-virus-wizard"
 >Asistente antivirus</link
 > para más detalles.</para
 ></listitem>
@@ -2680,7 +2680,7 @@
 ></term>
 <listitem
 ><para
->Si su servidor de correo admite sieve (filtrado del lado del servidor), usted podría <action
+>Si su servidor de correo admite sieve (filtrado del lado del servidor), podría <action
 >configurar sus guiones aquí</action
 >.</para
 ></listitem>
@@ -2698,7 +2698,7 @@
 ><para
 ><action
 >Muestra el asistente para configurar el archivado automático</action
->. Por favor, consulte <ulink url="help:/akonadi_archivemail_agent"
+>. Consulte <ulink url="help:/akonadi_archivemail_agent"
 >Archivado automático</ulink
 > para más detalles.</para
 ></listitem>
@@ -2734,7 +2734,7 @@
 ><para
 ><action
 >Muestra un diálogo que le permite configurar cuentas que se usan la característica de agente de archivado de carpetas.</action
-> Por favor, consulte <ulink url="help:/akonadi_folderarchive_agent"
+> Consulte <ulink url="help:/akonadi_folderarchive_agent"
 >Agente de archivado de carpetas</ulink
 > para más detalles.</para
 ></listitem>
@@ -2848,7 +2848,7 @@
 ><para
 ><action
 >Envía el mensaje inmediatamente.</action
-> Si usa &SMTP; para enviar sus mensajes y no se puede llegar al servidor &SMTP;, el mensaje se pondrá en la bandeja de salida y se le mostrará un mensaje de error. Después de que los problemas de conexión se resuelvan, usted puede enviar los mensajes de la bandeja de salida usando <menuchoice
+> Si usa &SMTP; para enviar sus mensajes y no se puede llegar al servidor &SMTP;, el mensaje se pondrá en la bandeja de salida y se le mostrará un mensaje de error. Después de que los problemas de conexión se resuelvan, puede enviar los mensajes de la bandeja de salida usando <menuchoice
 ><guimenu
 >Archivo</guimenu
 ><guimenuitem
@@ -2884,7 +2884,7 @@
 ><para
 ><action
 >Muestra el diálogo de enviar más tarde.</action
->. Por favor, consulte <link linkend="account-wizard"
+>. Consulte <link linkend="account-wizard"
 >Enviar más tarde</link
 > para más detalles.</para
 ></listitem>
@@ -2956,7 +2956,7 @@
 ><para
 >Le permite <action
 >guardar su mensaje como plantilla.</action
-> Por favor, consulte <link linkend="new-compose-from-templates"
+> Consulte <link linkend="new-compose-from-templates"
 >Editar desde plantillas</link
 > para más detalles sobre plantillas.</para
 ></listitem>
@@ -3262,7 +3262,7 @@
 </itemizedlist>
 
 <para
->Por favor, consulte <link linkend="composer-headers"
+>Consulte <link linkend="composer-headers"
 >Encabezados de editor</link
 > para más detalles sobre esas opciones.</para>
 
@@ -3294,7 +3294,7 @@
 ></term>
 <listitem
 ><para
->Muestra una columna en el lado derecho de la ventana del editor que le permite usar y crear recortes. Por favor, consulte <link linkend="setup-text-snippets"
+>Muestra una columna en el lado derecho de la ventana del editor que le permite usar y crear recortes. Consulte <link linkend="setup-text-snippets"
 >Recortes</link
 > para más información.</para
 ></listitem>
@@ -3371,7 +3371,7 @@
 ><para
 >Firma digitalmente el mensaje usando <application
 >OpenPGP</application
->. Usted puede aprender más sobre esto en el <link linkend="pgp"
+>. Puede aprender más sobre esto en el <link linkend="pgp"
 >capítulo sobre OpenPGP</link
 >.</para
 ></listitem>
@@ -3389,7 +3389,7 @@
 ><para
 >Cifra el mensaje usando <application
 >OpenPGP</application
->. Usted puede aprender más sobre esto en el <link linkend="pgp"
+>. Puede aprender más sobre esto en el <link linkend="pgp"
 >capítulo sobre OpenPGP</link
 >.</para
 ></listitem>
@@ -3405,7 +3405,7 @@
 ></term>
 <listitem
 ><para
->Elije el formato de cifrado del mensaje que se va a usar para firmar o cifrar digitalmente el mensaje. Por favor, consulte <link linkend="cryptographic-message-formats"
+>Elije el formato de cifrado del mensaje que se va a usar para firmar o cifrar digitalmente el mensaje. Consulte <link linkend="cryptographic-message-formats"
 >Formatos de cifrado de mensajes</link
 > para más información.</para
 ></listitem>
@@ -3451,7 +3451,7 @@
 ></term>
 <listitem
 ><para
->Conmuta el ajuste automático de palabras. Puede ser útil para desactivarlo si usted quiere pegar líneas largas que no se deberían cortar.</para
+>Conmuta el ajuste automático de palabras. Puede ser útil para desactivarlo si quiere pegar líneas largas que no se deberían cortar.</para
 ></listitem>
 </varlistentry>
 <varlistentry id="composer-options-automatic-spellchecking">
@@ -3530,7 +3530,7 @@
 ></term>
 <listitem
 ><para
->Añade su firma al mensaje en la ubicación actual de su cursor. Por favor, consulte <link linkend="configure-identity-signature"
+>Añade su firma al mensaje en la ubicación actual de su cursor. Consulte <link linkend="configure-identity-signature"
 >Configurar firma de identidad</link
 > para más detalles sobre la configuración de su firma.</para
 ></listitem>
@@ -3582,7 +3582,7 @@
 ></term>
 <listitem
 ><para
->Adjunta uno o más archivos al mensaje actual. Por omisión, los adjuntos no están cifrados, por favor, consulte <link linkend="cryptographic-message-formats"
+>Adjunta uno o más archivos al mensaje actual. Por omisión, los adjuntos no están cifrados. Consulte <link linkend="cryptographic-message-formats"
 >Formatos de cifrado de mensajes</link
 > para más información sobre cifrado y adjuntos.</para
 ></listitem>
@@ -3644,7 +3644,7 @@
 <para
 >Muestra las <link linkend="attachments"
 >propiedades del adjunto</link
-> que está seleccionado en la ventana del adjunto. También le permite firmar/cifrar el adjunto. Por favor, consulte <link linkend="configure-security-composing"
+> que está seleccionado en la ventana del adjunto. También le permite firmar/cifrar el adjunto. Consulte <link linkend="configure-security-composing"
 >Configurar edición de seguridad</link
 > para configurar el cifrado.</para>
 </listitem>
diff -Nru kmail-19.04.3/po/es/docs/kmail2/troubleshooting.docbook kmail-19.12.3/po/es/docs/kmail2/troubleshooting.docbook
--- kmail-19.04.3/po/es/docs/kmail2/troubleshooting.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/kmail2/troubleshooting.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -5,8 +5,8 @@
 <author>
 <personname
 ><firstname
->Este capítulo se convirtió de la página de la KDE User Base<ulink url="http://userbase.kde.org/KMail/FAQs Hints and Tips"
->Preguntas frecuentes consejos y ayudas de KMail.</ulink
+>Este capítulo se convirtió de la página de la KDE User Base<ulink url="https://userbase.kde.org/Special:MyLanguage/KMail/FAQs_Hints_and_Tips"
+>Preguntas frecuentes, consejos y ayudas de KMail.</ulink
 ></firstname
 > <surname
 ></surname
diff -Nru kmail-19.04.3/po/es/docs/kmail2/using-kmail.docbook kmail-19.12.3/po/es/docs/kmail2/using-kmail.docbook
--- kmail-19.04.3/po/es/docs/kmail2/using-kmail.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/kmail2/using-kmail.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -3259,7 +3259,7 @@
 >GnuPG</application
 > funcione. Si quiere más detalles, puede echarle un vistazo a la excelente documentación de <application
 >GnuPG</application
-> o al <ulink url="http://www.gnupg.org/docs.html#guides"
+> o al <ulink url="https://www.gnupg.org/docs.html#guides"
 >Manual de privacidad &GNU;</ulink
 >.</para>
 
diff -Nru kmail-19.04.3/po/es/docs/ktnef/index.docbook kmail-19.12.3/po/es/docs/ktnef/index.docbook
--- kmail-19.04.3/po/es/docs/ktnef/index.docbook	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/es/docs/ktnef/index.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -66,7 +66,7 @@
 
 <abstract
 ><para
->El visor de archivos TNEF es una aplicación para adjuntos de correo <ulink url="http://en.wikipedia.org/wiki/TNEF"
+>El visor de archivos TNEF es una aplicación para adjuntos de correo <ulink url="https://en.wikipedia.org/wiki/TNEF"
 >TNEF</ulink
 >.</para
 ></abstract>
@@ -168,7 +168,6 @@
 >Traducido por Javier Viñal <email
 >fjvinal@gmail.com</email
 ></para
-> 
-&underFDL; &underGPL; </sect1>
+> &underFDL; &underGPL; </sect1>
 
 </article>
diff -Nru kmail-19.04.3/po/es/kmail.po kmail-19.12.3/po/es/kmail.po
--- kmail-19.04.3/po/es/kmail.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/es/kmail.po	2020-03-03 00:33:59.000000000 +0000
@@ -3,20 +3,21 @@
 #
 # Javier Viñal <fjvinal@gmail.com>, 2012, 2013, 2014.
 # Javier Vinal <fjvinalgmail.com>, 2012, 2014, 2015, 2016, 2017, 2018, 2019.
+# Eloy Cuadra <ecuadra@eloihr.net>, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-04-30 17:40+0200\n"
-"Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2020-01-02 20:01+0100\n"
+"Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 19.04.0\n"
+"X-Generator: Lokalize 19.12.0\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -67,8 +68,8 @@
 "incoming as well as outgoing mail account."
 msgstr ""
 "Por favor, tome un momento para rellenar en el panel de configuración de "
-"KMail en Preferencias->Configurar KMail. Usted necesita crear al menos una "
-"identidad predeterminada y una cuenta de correo tanto entrante como saliente."
+"KMail en Preferencias->Configurar KMail. Debe crear al menos una identidad "
+"predeterminada, una cuenta de correo entrante y otra saliente."
 
 #: about/introduction_kmail.html:38
 msgid "We hope that you will enjoy KMail."
@@ -183,8 +184,8 @@
 msgstr "Múltiples claves de cifrado por dirección"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -292,27 +293,27 @@
 "KMail no pudo detectar completamente una lista de correo en esta carpeta. "
 "Rellene las direcciones a mano, por favor."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Cuota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Uso:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Estado:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% lleno"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 de %2 usado"
@@ -335,7 +336,7 @@
 "o las teclas que quiera asociar con esta carpeta.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Plantillas"
@@ -346,106 +347,106 @@
 msgstr "&Usar plantillas personalizadas de mensajes en esta carpeta"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copiar plantillas globales"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Ver"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Usar &iconos personalizados"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "N&o leído:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Mostrar columna de remitente y destinatario en la lista de mensajes"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Mostrar co&lumna:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Predeterminado"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Remitente"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatario"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Lista de mensajes"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Usar agregación predeterminada"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregación"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Usar tema predeterminado"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Formato predeterminado de mensaje"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Preferir HTML a texto"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Preferir texto a HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Usar preferencias globales"
@@ -455,132 +456,137 @@
 msgid "Retrieval Options"
 msgstr "Opciones de recuperación"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identidades"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Recepción"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Envío"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Servidor LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
-msgstr "Cuentas de salida(añada al menos una):"
+msgstr "Cuentas de salida (añada al menos una):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opciones comunes"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Confirmar antes de enviar"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Comprobar ortografía antes de enviar"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nunca automáticamente"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "En las comprobaciones manuales de correo"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "En todas las comprobaciones de correo"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Enviar ahora"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
-msgstr "Enviar después"
+msgstr "Enviar más tarde"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
-msgstr "Enviar &mensajes de la carpeta bandeja de salida:"
+msgstr "Enviar &mensajes de la carpeta de la bandeja de salida:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Méto&do de envío predeterminado:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Activar que se pueda deshacer el envío"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Añadir cuenta de correo..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Cuenta personalizada..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
 msgstr ""
 "No se ha podido iniciar el asistente de cuentas. Por favor, asegúrese de que "
-"usted tiene AccountWizard instalado adecuadamente."
+"tiene AccountWizard instalado adecuadamente."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "No es posible iniciar el asistente de cuentas"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Incluir en la comprobación manual del correo"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Cambiar a desconectado al cerrar KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Comprobar correo al inicio"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -638,7 +644,7 @@
 msgid "Fixed Width Font"
 msgstr "Tipo de letra de ancho fijo"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Editor"
@@ -661,17 +667,17 @@
 #: configuredialog/configureappearancepage.cpp:322
 #, kde-format
 msgid "Quoted Text - First Level"
-msgstr "Texto citado - Primer nivel"
+msgstr "Texto citado (primer nivel)"
 
 #: configuredialog/configureappearancepage.cpp:323
 #, kde-format
 msgid "Quoted Text - Second Level"
-msgstr "Texto citado - Segundo nivel"
+msgstr "Texto citado (segundo nivel)"
 
 #: configuredialog/configureappearancepage.cpp:324
 #, kde-format
 msgid "Quoted Text - Third Level"
-msgstr "Texto citado - Tercer nivel"
+msgstr "Texto citado (tercer nivel)"
 
 #: configuredialog/configureappearancepage.cpp:325
 #, kde-format
@@ -696,22 +702,22 @@
 #: configuredialog/configureappearancepage.cpp:329
 #, kde-format
 msgid "HTML Status Bar Background - No HTML Message"
-msgstr "Fondo de la barra de estado HTML - mensaje no HTML"
+msgstr "Fondo de la barra de estado HTML (mensaje no HTML)"
 
 #: configuredialog/configureappearancepage.cpp:330
 #, kde-format
 msgid "HTML Status Bar Foreground - No HTML Message"
-msgstr "Primer plano de la barra de estado HTML - mensaje no HTML"
+msgstr "Primer plano de la barra de estado HTML (mensaje no HTML)"
 
 #: configuredialog/configureappearancepage.cpp:331
 #, kde-format
 msgid "HTML Status Bar Background - HTML Message"
-msgstr "Fondo de la barra de estado HTML - mensaje HTML"
+msgstr "Fondo de la barra de estado HTML (mensaje HTML)"
 
 #: configuredialog/configureappearancepage.cpp:332
 #, kde-format
 msgid "HTML Status Bar Foreground - HTML Message"
-msgstr "Primer plano de la barra de estado HTML - mensaje HTML"
+msgstr "Primer plano de la barra de estado HTML (mensaje HTML)"
 
 #: configuredialog/configureappearancepage.cpp:341
 #, kde-format
@@ -721,7 +727,7 @@
 #: configuredialog/configureappearancepage.cpp:346
 #, kde-format
 msgid "&Do not change color from original HTML mail"
-msgstr "No cambiar el color &del el correo HTMLoriginal"
+msgstr "No cambiar el color &del correo HTML original"
 
 #: configuredialog/configureappearancepage.cpp:361
 #, kde-format
@@ -860,9 +866,9 @@
 "li><li>m - minutos sin cero (0-59)</li><li>mm - minutos con cero (00-59)</"
 "li><li>s - segundos sin cero (0-59)</li><li>ss - segundos con cero (00-59)</"
 "li><li>z - milisegundos sin ceros (0-999)</li><li>zzz - milisegundos con "
-"ceros (000-999)</li><li>AP - cambiar al formato AM/PM. AP será remplazado "
-"por «AM» o «PM».</li><li>ap - cambiar a formato AM/PM. ap sera remplazado "
-"por «am» o «pm».</li><li>Z - zona horaria en formato numérico (-0500)</li></"
+"ceros (000-999)</li><li>AP - cambiar al formato AM/PM. AP se sustituirá por "
+"«AM» o «PM».</li><li>ap - cambiar a formato AM/PM. ap se sustituirá por «am» "
+"o «pm».</li><li>Z - zona horaria en formato numérico (-0500)</li></"
 "ul><p><strong>Cualquier otro carácter se ignorará.</strong></p></qt>"
 
 #: configuredialog/configureappearancepage.cpp:846
@@ -894,7 +900,7 @@
 #: settings/kmail.kcfg.cmake:88
 #, kde-format
 msgid "Start minimized to tray"
-msgstr "Iniciar minimizado en la bandeja"
+msgstr "Iniciar minimizado en la bandeja del sistema"
 
 #: configuredialog/configureappearancepage.cpp:893
 #, kde-format
@@ -934,7 +940,7 @@
 #: configuredialog/configureappearancepage.cpp:1204
 #, kde-format
 msgid "Do you want to remove tag '%1'?"
-msgstr "¿Quiere usted eliminar la etiqueta: «%1»?"
+msgstr "¿Desea eliminar la etiqueta «%1»?"
 
 #: configuredialog/configureappearancepage.cpp:1249
 #: configuredialog/configureappearancepage.cpp:1288
@@ -942,61 +948,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "No podemos crear etiqueta. Una etiqueta con el mismo nombre ya existe."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "General"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Plantillas estándar"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Plantillas personalizadas"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Asunto"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Juego de caracteres"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Encabezados"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Adjuntos"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autocorrección"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Autoredimensionar imagen"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Firma"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1005,12 +1011,12 @@
 "Insertar automáticamente la firma configurada\n"
 "al comenzar a editar un mensaje"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Insertar la firma encima de cualquier texto citado"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1019,18 +1025,18 @@
 "Insertar el separador de firma RFC-compatible\n"
 "(dos guiones y un espacio en una línea) antes de la firma"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Al responder, no citar ninguna firma existente"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formato"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1041,7 +1047,7 @@
 "(en lugar del mensaje completo), si\n"
 "hay texto seleccionado en la ventana del mensaje."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1054,17 +1060,17 @@
 "mientras que\n"
 "se ajustaban las palabras del texto."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Activar el ajuste automático de palabras al ancho especificado"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Establecer la anchura de texto para el ajuste automático de palabras"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1075,7 +1081,7 @@
 "en el formato original en el que se recibió.\n"
 "Si no está marcada, la respuesta será texto sin formato por omisión."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1087,55 +1093,55 @@
 "Se admiten\n"
 "negrita, cursiva, textos subrayados, listas y referencias externas."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Intercalado"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Como adjunto"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Establecer el formato predeterminado de reenvío"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tipo de reenvío predeterminado:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
 "You can select this on a per-message basis using \"Options - Request "
 "Disposition Notification\""
 msgstr ""
-"Por omisión, pedir un MDN cuando se empieza a editar un mensaje.\n"
-"Usted puede seleccionar esto en una base por mensaje usando «Opciones - "
-"Pedir notificación de disposición»"
+"Por omisión, pedir un MDN cuando se empieza a componer un mensaje.\n"
+"Puede seleccionar esto para cada mensaje usando «Opciones - Pedir "
+"notificación de disposición»"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Advertir si se especifican demasiados destinatarios"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Establecer el máximo número de destinatarios para el aviso"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1145,17 +1151,17 @@
 "however, that it does not take account of distribution lists or\n"
 "mailing lists."
 msgstr ""
-"Solo permitir especificar estos cuantos destinatarios para el mensaje.\n"
-"Esto se aplica haciendo un «Responder a todos», introduciendo los "
-"destinatarios manualmente\n"
-"o usando el recolector «Seleccionar...». El establecimiento de este límite "
-"le ayuda a\n"
+"Permitir especificar solo estos destinatarios para el mensaje.\n"
+"Esto se aplica al «Responder a todos», introducir los destinatarios "
+"manualmente\n"
+"o usar el recopilador «Seleccionar...». El establecimiento de este límite le "
+"ayuda a\n"
 "evitar enviar un mensaje accidentalmente a demasiada gente. Tenga en "
 "cuenta,\n"
-"sin embargo, que esto no tiene en cuenta listas de distribución o\n"
-"listas de correo."
+"sin embargo, que esto no tiene en cuenta las listas de distribución ni\n"
+"las listas de correo."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1164,18 +1170,18 @@
 "Recordar las direcciones recientes introducidas,\n"
 "y ofrecerlas para completado de destinatarios"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "No guardar"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Máximo de direcciones recientes retenidas:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1184,23 +1190,23 @@
 "El número máximo de direcciones recientes que se\n"
 "recordarán para el completado"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configurar completado..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Guardar automáticamente"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "No guardar automáticamente"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1208,18 +1214,18 @@
 msgstr[0] " minuto"
 msgstr[1] " minutos"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Guardar automáticamente el mensaje en este intervalo especificado"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefi&jos para los asuntos de la respuesta"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1228,59 +1234,59 @@
 "Reconocer cualquier secuencia de los siguientes prefijos\n"
 "(las entradas con expresiones regulares no sensibles a mayúsculas):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Añadir..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Eli&minar"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Modif&icar..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Introducir nuevo prefijo:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefijo de asunto al reen&viar"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Añadir..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Eli&minar"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modificar..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Introducir nuevo prefijo de reenvío:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1290,73 +1296,73 @@
 "caracteres requerido por cada mensaje saliente."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modificar..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Introduzca el juego de caracteres:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Mantener el juego de caracteres original al responder o reenviar (si es "
 "posible)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Este juego de caracteres no está implementado."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Usar este sufijo de Id-mensaje"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Personalizar sufijo de &Id-mensaje:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definir etiquetas personalizadas para los campos de cabecera mime:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nombre"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valor"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "Nue&vo"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nombre:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
@@ -1364,17 +1370,17 @@
 "«Tipo de contenido» no es una cadena autorizada. Este encabezado no se "
 "guardará."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Encabezado inválido"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nombrado de adjuntos compatible con Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1383,40 +1389,40 @@
 "Active esta opción para hacer que Outlook(tm) entienda los nombres de "
 "adjuntos que tengan caracteres no ingleses"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Activar la detecció&n de adjuntos perdidos"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Reconocer cualquiera de las siguientes palabras como la intención de "
 "adjuntar un archivo:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Introduzca nueva palabra clave:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Máximo tamaño del adjunto:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Sin límite"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1503,8 +1509,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "Complementos de texto Convertor"
+msgid "Text Conversion Plugins"
+msgstr "Complementos de conversión de texto"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1618,7 +1624,7 @@
 msgid "Archive Folder"
 msgstr "Carpeta de archivo comprimido"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1684,19 +1690,19 @@
 msgid "Notification"
 msgstr "Notificación"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 adjunto (%2)"
 msgstr[1] "%1 adjuntos (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Ocultar lista de adjuntos"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Mostrar lista de adjuntos"
@@ -1713,388 +1719,388 @@
 msgid "Encoding"
 msgstr "Codificación"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Seleccione el diccionario a utilizar cuando se revise la ortografía de este "
 "mensaje"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Seleccione la carpeta de envío de correo en la que se guardará una copia de "
 "este mensaje"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Seleccione la cuenta de salida a utilizar para enviar el mensaje"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Establezca la dirección de correo «Desde:» para este mensaje"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Establecer el asunto para este mensaje"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identidad:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Diccionario:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Carpeta de correo e&nviado:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Transporte de correo:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&De:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "As&unto:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "En&viar correo"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
-msgstr "En&viar correo por"
+msgstr "En&viar correo usando"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
-msgstr "Envío"
+msgstr "Enviar"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
-msgstr "Enviar d&espués"
+msgstr "Enviar más &tarde"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
-msgstr "Enviar des&pués por"
+msgstr "Enviar más &tarde usando"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
-msgstr "Cola"
+msgstr "Poner en cola"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Guar&dar como borrador"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Guardar correo en la carpeta «Borradores»"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Guardar como plan&tilla"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Guardar correo en la carpeta «Plantillas»"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Guardar como arc&hivo"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Guardar correo como texto o archivo html"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Insertar archivo de texto..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Insertar archivo de texto reciente"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Libret&a de direcciones"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Abrir libreta de direcciones"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nuevo editor"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Seleccionar destinata&rios..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Guardar la lista de &distribución..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Pegar como ad&junto"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Limpiar &espacios"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Tipo de letra de ancho &fijo"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgente"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Con acuse de &recibo"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Solicitar acuse de &recibo"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Cortar palabras"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "Recorte&s"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Comprobación ortográfica &automática"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Edición de texto enriquecido"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Texto enriquecido"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Cambiar modo de edición de texto enriquecido"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Todos los c&ampos"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identidad"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Diccionario"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Carpeta de c&orreo enviado"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Transporte de correo"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&De"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "As&unto"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Añadir f&irma"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Incluir fi&rma"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Insertar firmar en la posición del c&ursor"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Corrector orto&gráfico..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Corrector ortográfico"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Cifrar mensaje"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Cifrar"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Firmar men&saje"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Firma"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Formato de mensaje &cifrado"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Seleccione un formato de cifrado para este mensaje"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Crear recordatorio de seguimiento..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configurar KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
-"<qt>Esto ocultará la barra de menú completamente. Usted puede mostrarla de "
-"nuevo tecleando %1.</qt>"
+"<qt>Esto ocultará la barra de menú completamente. Puede volver a mostrarla "
+"tecleando %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Ocultar barra de menú"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Línea: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Columna: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Corrector ortográfico: activo"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Corrector ortográfico: inactivo"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Volver a g&uardar como plantilla"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Guardar como borrador"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2103,7 +2109,7 @@
 "Volver a guardar este mensaje en la carpeta Plantillas. En este caso, se "
 "puede utilizar más tarde."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2112,82 +2118,82 @@
 "Guarda este mensaje en la carpeta «Borradores». Posteriormente, se podrá "
 "editar y enviar."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "¿Quiere guardar el mensaje para más tarde o descartarlo?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Cerrar el editor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "El autoguardado de mensajes ha fallado"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "El envío de mensajes ha fallado"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Insertar archivo"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Añadir como &imagen intercalada"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Añadir como &adjunto"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nombre del adjunto:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "El nombre del adjunto no puede estar vacío"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Nombre de adjunto inválido"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Añadir URL en el mensaje"
 msgstr[1] "Añadir los URL en el mensaje"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Añadir archivo como &adjunto"
 msgstr[1] "Añadir archivos como &adjuntos"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Insertar el texto del portapapeles como adjunto"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "sin nombre"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2200,12 +2206,12 @@
 "(OpenPGP o S/MIME) para que pueda usarla.</p><p>Haga el favor de elegir las "
 "claves en la configuración de la identidad.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Clave de cifrado no definida"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2216,12 +2222,12 @@
 "firma (OpenPGP o S/MIME) que se debe usar.</p><p>Puede seleccionar la clave "
 "en la configuración de la identidad.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Clave de firma no definida"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2232,70 +2238,70 @@
 "configurar su dirección de correo para todas sus identidades, para que no "
 "tenga que indicarla para cada mensaje."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr ""
-"Usted debe especificar al menos un destinatario, bien en el campo «Para:», o "
-"bien como CC o CCO."
+"Debe especificar al menos un destinatario, bien en el campo «Para:», o bien "
+"como CC o CCO."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "El campo «Para:» está vacío. ¿Quiere enviar en mensaje así?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "No se ha especificado «Para:»"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "No escribió ningún asunto. ¿Enviar el mensaje de todos modos?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "No se escribió asunto"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&Enviar tal cual"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "E&specificar el asunto"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr ""
-"Usted debe especificar al menos un destinatario para que sea posible cifrar "
-"un borrador."
+"Debe especificar al menos un destinatario para que sea posible cifrar un "
+"borrador."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Acerca de enviar correo..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Enviar confirmación"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "En&viar ahora"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2304,22 +2310,22 @@
 "Está intentando enviar el correo a más de %1 destinatarios. ¿Desea enviar el "
 "mensaje?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Demasiados destinatarios"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Enviar &tal cual"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Editar destinatarios"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2327,22 +2333,22 @@
 msgstr ""
 "Al desactivar el modo HTML perderá el formateo del texto, ¿está seguro?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "¿Perder el formateo?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perder formateo"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Añadir marcado de texto sin formato"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2351,7 +2357,7 @@
 "Se usara cifrado de alta seguridad para este destinatario (la clave de "
 "cifrado es completamente fiable). Pulse el icono para más detalles."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2360,7 +2366,7 @@
 "Se usara cifrado de seguridad media para este destinatario (la clave de "
 "cifrado es marginalmente fiable). Pulse el icono para más detalles."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2369,7 +2375,7 @@
 "Se usara cifrado de baja seguridad para este destinatario (la clave de "
 "cifrado es no fiable) Pulse el icono para más detalles."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2380,7 +2386,7 @@
 "desconocida (la clave de cifrado no puede verificarse). Pulse en el icono "
 "para más detalles."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Información del editor de complementos"
@@ -2411,7 +2417,7 @@
 "What do you want to do?"
 msgstr ""
 "Este acceso rápido permite enviar correo directamente. El correo puede "
-"enviarse accidentalmente. ¿Qué quiere usted hacer?"
+"enviarse accidentalmente. ¿Qué quiere hacer?"
 
 #: editor/validatesendmailshortcut.cpp:44
 #, kde-format
@@ -2439,8 +2445,8 @@
 "The message you have composed seems to refer to an attached file but you "
 "have not attached anything. Do you want to attach a file to your message?"
 msgstr ""
-"El mensaje que usted ha editado parece referirse a un archivo adjunto, pero "
-"usted no ha adjuntado nada. ¿Quiere adjuntar un archivo a su mensaje?"
+"El mensaje que ha creado parece hacer referencia a un archivo adjunto, "
+"aunque no ha adjuntado ninguno. ¿Quiere adjuntar un archivo al mensaje?"
 
 #: editor/warningwidgets/attachmentmissingwarning.cpp:34
 #, kde-format
@@ -2457,37 +2463,37 @@
 msgid "External editor was started."
 msgstr "Se inició el editor externo."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
-"No se ha encontrado el transporte. Por favor, verifique que usted usa un "
+"No se ha encontrado el transporte. Por favor, compruebe que va a usar un "
 "transporte de correo correcto."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Carpeta de enviados no definida. Por favor, establézcala antes de enviar el "
 "correo."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
-"No se ha encontrado la identidad. Por favor, verifique que usted use una "
+"No se ha encontrado la identidad. Por favor, compruebe que va a usar una "
 "identidad correcta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
 "dictionary."
 msgstr ""
-"No se ha encontrado el diccionario. Por favor, verifique que usted use un "
+"No se ha encontrado el diccionario. Por favor, compruebe que va a usar un "
 "diccionario correcto."
 
 #: editor/widgets/cryptostateindicatorwidget.cpp:93
@@ -2510,11 +2516,6 @@
 msgid "Message will not be encrypted"
 msgstr "El mensaje no será cifrado"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Recortes de texto"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2562,27 +2563,27 @@
 msgid "Cannot move messages."
 msgstr "No se pueden mover mensajes."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "No es posible obtener la carpeta. Error informado: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "No se devolvió ninguna carpeta."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "No es posible obtener la carpeta padre. Error informado: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "No es posible devolver la lista de carpetas."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Mensajes archivados"
@@ -2623,48 +2624,48 @@
 msgid "&Existing identities:"
 msgstr "Identidades &existentes:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Error en la generación del nuevo par de claves: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Error en la generación de la clave"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Sin clave"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Generar nuevo par de claves"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Generando nuevo par de claves..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Editar identidad"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "General"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "S&u nombre:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2676,12 +2677,12 @@
 "lo deja en blanco, su nombre real no aparecerá. Solo se mostrará su "
 "dirección de correo.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zación:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2693,12 +2694,12 @@
 "mensaje que envíe.</p><p>Es seguro (y habitual) dejar este campo vacío.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Dir&ección correo:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2708,18 +2709,18 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 "<qt><h3>Dirección de correo</h3><p>Este campo debería contener su dirección "
-"de correo completa.</p> <p>Esta es la dirección primaria, utilizada para "
-"todo el correo saliente. Si usted tiene más de una dirección, bien cree una "
-"nueva identidad, o añada alias de direcciones en el campo de más abajo.</p> "
-"<p>Si usted deja este campo en blanco, o lo rellena con información "
-"incorrecta, la gente tendrá problemas para responderle.</p></qt>"
+"de correo completa.</p> <p>Esta es la dirección primaria que se va a usar "
+"para el correo saliente. Si posee más de una dirección, cree una nueva "
+"identidad o añada alias de direcciones en el campo inferior.</p> <p>Si deja "
+"este campo en blanco o lo rellena con información incorrecta, los "
+"destinatarios tendrán problemas para responderle.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "&Alias de correo:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2736,12 +2737,12 @@
 "th><td>primero@ejemplo.org<br>último@ejemplo.org</td></tr></table> <p>Teclee "
 "un alias de dirección por línea.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Cifrado"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2757,12 +2758,12 @@
 "p><p>Puede obtener más información sobre las claves en <a>http://www.gnupg."
 "org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Clave para firma OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2780,12 +2781,12 @@
 "verán afectadas.</p> <p>Puede obtener más información sobre las claves en "
 "<a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Clave de cifrado OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2798,12 +2799,12 @@
 "firmar digitalmente los correos usando S/MIME.Las funciones de correo más "
 "frecuentes no se verán afectadas.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificado para firma S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2818,39 +2819,39 @@
 "podrá cifrar las copias de sus mensajes salientes usando S/MIME. Las "
 "funciones de correo más frecuentes no se verán afectadas.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificado de cifrado S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Formato preferido:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Firmar mensajes automáticamente"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Cifrar mensajes automáticamente cuando sea posible"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Dirección res&ponder a:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2868,12 +2869,12 @@
 "<tt>From:</tt> (n.t. De) y que cualquier respuesta fuera a la dirección de "
 "un grupo.</p> <p>En caso de duda, deje este campo vacío.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Direcciones &CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2890,12 +2891,12 @@
 "separar la lista de destinatarios de CC.</p><p>En caso de duda, deje vacío "
 "este campo.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Direcciones &CCO:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2913,57 +2914,57 @@
 "de destinatarios de CCO.</p><p>En caso de duda, deje vacío este campo.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&iccionario:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Carpeta de correo en&viado:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Carpeta borra&dores:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Carpeta de plan&tillas:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Cuenta saliente:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Añadir mi vCard al mensaje"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Crear..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Idioma de autocorrección:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Restaurar nombre de dominio predeterminado"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Dominio prede&terminado:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2972,33 +2973,33 @@
 "<qt><p>El nombre de dominio predeterminado se usa para completar la "
 "dirección de correo que Solo consista en un nombre de usuario.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Usar plantillas personalizadas de mensajes para esta identidad"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Firma"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Imagen"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Alias de correo no válido «%1»"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Dirección de correo no válida"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3011,7 +3012,7 @@
 "Esto podría dar como resultado mensajes de advertencia en el lado receptor "
 "cuando se intenten verificar las firmas hechas con esta configuración."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3020,7 +3021,7 @@
 "Una de las claves de cifrado OpenPGP configurada no tiene ningún ID de "
 "usuario con la dirección de correo configurada para esta identidad (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3033,7 +3034,7 @@
 "Esto podría dar como resultado mensajes de advertencia en el lado receptor "
 "cuando se intenten verificar las firmas hechas con esta configuración."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3042,22 +3043,22 @@
 "Uno de los certificados de cifrado S/MIME configurado no tiene ningún ID de "
 "usuario con la dirección de correo configurada para esta identidad (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Dirección de correo no encontrada en clave/certificados"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "El archivo de firma no es válido"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Editar identidad «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3066,7 +3067,7 @@
 "Alguna carpeta personalizada para la identidad no existe (nuca más); por lo "
 "tanto, se usarán las carpetas predeterminadas."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Editar..."
@@ -3084,7 +3085,7 @@
 #: identity/identityeditvcarddialog.cpp:71
 #, kde-format
 msgid "Are you sure you want to delete this vCard?"
-msgstr "¿Está usted seguro de que quiere borrar esta vCard?"
+msgstr "¿Seguro que quiere borrar esta vCard?"
 
 #: identity/identityeditvcarddialog.cpp:71
 #: identity/identityeditvcarddialog.cpp:88
@@ -3097,6 +3098,18 @@
 msgid "We cannot delete vCard file."
 msgstr "No podemos borrar el archivo vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "¿Realmente quiere cancelar?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmación"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3262,7 +3275,7 @@
 "Hay ejemplos disponibles en <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Imagen"
@@ -3297,7 +3310,7 @@
 msgstr[1] ""
 "Las listas de distribución «%2» están vacías, no se pueden utilizar."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Añadir a la libreta de direcciones"
@@ -3307,22 +3320,22 @@
 msgid "Contact created successfully"
 msgstr "Contacto creado correctamente"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "El contacto no puede almacenarse: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Ha fallado al almacenar el contacto"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
-msgstr "¿Quiere usted adjuntar esta carpeta «%1»?"
+msgstr "¿Quiere adjuntar esta carpeta «%1»?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Adjuntar carpeta"
@@ -3365,9 +3378,9 @@
 "contents will be discarded as well. <p><b>Beware</b> that discarded messages "
 "are not saved into your Trash folder and are permanently deleted.</p></qt>"
 msgstr ""
-"<qt>¿Está usted seguro de que quiere borrar la carpeta vacía <resource>%1</"
-"resource> y todas sus subcarpetas? Esas subcarpetas podrían no estar vacías "
-"y su contenido se descartará igualmente. <p><b>Tenga en cuenta</b> que los "
+"<qt>¿Seguro que quiere borrar la carpeta vacía <resource>%1</resource> y "
+"todas sus subcarpetas? Esas subcarpetas podrían no estar vacías y su "
+"contenido se descartará igualmente. <p><b>Tenga en cuenta</b> que los "
 "mensajes descartados no se guardan en la papelera y se borran "
 "permanentemente.</p></qt>"
 
@@ -3378,10 +3391,10 @@
 "discarding its contents? <p><b>Beware</b> that discarded messages are not "
 "saved into your Trash folder and are permanently deleted.</p></qt>"
 msgstr ""
-"<qt>¿Está usted seguro de que quiere borrar la carpeta <resource>%1</"
-"resource>, descartando su contenido? <p><b>Tenga en cuenta</b> que los "
-"mensajes descartados no se guardan en la papelera y se borran "
-"permanentemente.</p></qt>"
+"<qt>¿Seguro que quiere borrar la carpeta <resource>%1</resource>, "
+"descartando su contenido? <p><b>Tenga en cuenta</b> que los mensajes "
+"descartados no se guardan en la papelera y se borran permanentemente.</p></"
+"qt>"
 
 #: job/removecollectionjob.cpp:99
 #, kde-format
@@ -3391,10 +3404,10 @@
 "discarded messages are not saved into your Trash folder and are permanently "
 "deleted.</p></qt>"
 msgstr ""
-"<qt>¿Está usted seguro de que quiere borrar la carpeta <resource>%1</"
-"resource> y todas sus subcarpetas, descartando su contenido? <p><b>Tenga en "
-"cuenta</b> que los mensajes descartados no se guardan en la papelera y se "
-"borran permanentemente.</p></qt>"
+"<qt>¿Seguro que quiere borrar la carpeta <resource>%1</resource> y todas sus "
+"subcarpetas, descartando su contenido? <p><b>Tenga en cuenta</b> que los "
+"mensajes descartados no se guardan en la papelera y se borran "
+"permanentemente.</p></qt>"
 
 #: job/removecollectionjob.cpp:106
 #, kde-format
@@ -3536,14 +3549,14 @@
 msgstr "Car&peta"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Aplicar filtros en la carpeta"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3569,7 +3582,7 @@
 msgstr "Reen&viar"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&plicar filtro"
@@ -3594,7 +3607,7 @@
 msgstr "A&yuda"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barra de herramientas principal"
@@ -3620,8 +3633,7 @@
 #, kde-kuit-format
 msgctxt "@info"
 msgid "File <filename>%1</filename> exists.<nl/>Do you want to replace it?"
-msgstr ""
-"El archivo <filename>%1</filename> existe.<nl/>¿Quiere usted remplazarlo?"
+msgstr "El archivo <filename>%1</filename> existe.<nl/>¿Desea sustituirlo?"
 
 #: kmcommands.cpp:545
 #, kde-format
@@ -3631,7 +3643,7 @@
 #: kmcommands.cpp:545
 #, kde-format
 msgid "&Replace"
-msgstr "&Remplazar"
+msgstr "&Sustituir"
 
 #: kmcommands.cpp:732
 #, kde-format
@@ -3648,12 +3660,12 @@
 msgid "The file does not contain a message."
 msgstr "El archivo no tiene un mensaje."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "El archivo tiene varios mensajes. Solo se mostrará el primero."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3662,32 +3674,32 @@
 "Quiere reenviar los mensajes seleccionados como adjuntos en un mensaje (como "
 "un resumen MIME) o como mensajes individuales?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Enviar como resumen"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Enviar individualmente"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrando los mensajes"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrando el mensaje %1 de %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Moviendo mensajes"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Eliminando mensajes"
@@ -3716,31 +3728,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Barra de herramientas de dirección de texto"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail está en modo desconectado. Todas las tareas relacionadas con la red se "
 "han suspendido"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Enviar correo"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Imposible enviar correo"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail está en modo conectado. Todas las tareas relacionadas con la red se "
 "han reanudado"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3749,41 +3761,41 @@
 "KMail está en modo conectado. Todas las tareas de red se reanudarán cuando "
 "se detecte una conexión de red"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail está ahora en modo desconectado. ¿Quiere seguir adelante?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Conectado/desconectado"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Trabajar conectado"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "Conexión de red detectada, todas las tareas relacionadas con la red se han "
 "reanudado"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "No se ha detectado conexión de red, todas las tareas relacionadas con la red "
 "se han suspendido"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3792,12 +3804,12 @@
 "Ha fallado al abrir el archivo de autoguardado en %1.\n"
 "Motivo: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "La apertura del archivo de autoguardado ha fallado"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3807,7 +3819,7 @@
 msgstr[1] ""
 "Estas %1 identidades se han cambiado para usar el transporte predefinido:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3816,160 +3828,162 @@
 msgstr[1] ""
 "Estas %1 identidades se han cambiado para usar el transporte modificado:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Enviando mensajes"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Iniciando el proceso de envío..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "El recurso %1 está dañado."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"El recurso %1 está dañado.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "El agente de archivado de correo no estaba registrado."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "El agente de enviar más tarde no estaba registrado."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "El agente de seguimiento no estaba registrado."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
 "properly installed."
 msgstr ""
-"No se ha podido iniciar el gestor de certificados; asegúrese de que usted "
-"tiene Kleopatra instalado adecuadamente."
+"No se ha podido iniciar el gestor de certificados; asegúrese de que tiene "
+"Kleopatra instalado correctamente."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Error de KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
 "No se ha podido iniciar el asistente de importación. Por favor, asegúrese de "
-"que usted tiene ImportWizard instalado adecuadamente."
+"que tiene ImportWizard instalado correctamente."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "No es posible iniciar el asistente de importación"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "No se ha podido iniciar el «Asistente de exportación PIM». Por favor, "
 "verifique su instalación."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr ""
-"No es posible iniciar el programa «Asistente de preferencias de exportación "
-"PIM»"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "No es posible iniciar el programa «Exportación de datos PIM»"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
-"No se ha podido iniciar ImportWizard. Por favor, asegúrese de que usted "
-"tiene ImportWizard instalado adecuadamente."
+"No se ha podido iniciar ImportWizard. Por favor, asegúrese de que tiene "
+"ImportWizard instalado correctamente."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "No es posible iniciar el asistente de importación"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
-"Otro gestor de correo se encontró en su sistema. ¿Quiere usted importar los "
-"datos de él?"
+"Se ha encontrado otro gestor de correo en su sistema. ¿Quiere importar los "
+"datos que contiene?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "No se ha podido iniciar el asistente de importación. Por favor, verifique su "
 "instalación."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Sin asunto"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(ninguna plantilla)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Esta carpeta no tiene configurada ninguna opción de caducidad"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>¿Realmente quiere hacer que expire la carpeta <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Caducar carpeta"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Ca&ducar"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Vaciar papelera"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Mover a la papelera"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "¿Realmente quiere vaciar la papelera?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3978,27 +3992,27 @@
 "<qt>¿Realmente quiere mover todos los mensajes de la carpeta <b>%1</b> a la "
 "papelera?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Movidos todos los mensajes a la papelera"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "¿Realmente quiere caducar todos los mensajes antiguos?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "¿Caducar mensajes antiguos?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Caducar"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4009,17 +4023,17 @@
 "correo basura y puede incrementar la posibilidad de que su sistema se vea "
 "comprometido por otros fallos de seguridad presentes y futuros."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Aviso de seguridad"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Cargar referencias externas"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4034,532 +4048,532 @@
 "<qt>¿Está seguro de que quiere eliminar los %1 mensajes seleccionados?<br /"
 ">Una vez que los elimine, no podrá recuperarlos.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Borrar mensajes"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Borrar mensajes"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Moviendo mensajes..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Eliminando mensajes..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Mensajes borrados correctamente."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Mensajes movidos correctamente."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "El borrado de los mensajes ha fallado."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Eliminando los mensajes cancelados."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "El movimiento de los mensajes ha fallado."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Moviendo los mensajes cancelados."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Mover los mensajes a la carpeta"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Copiando mensajes..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Mensajes copiados correctamente."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "La copia de los mensajes ha fallado."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Cancelada la copia de mensajes."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copiar mensajes a la carpeta"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Moviendo mensajes a la papelera..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Borrando y moviendo mensajes a la papelera..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Mensajes movidos a la papelera correctamente."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Mensajes movidos a la papelera o borrados correctamente."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "El movimiento de los mensajes a la papelera ha fallado."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "El movimiento o borrado de los mensajes a la papelera ha fallado."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Cancelado el movimiento de mensajes a la papelera."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Cancelado el movimiento o borrado de mensajes a la papelera."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Saltar a la carpeta"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Gu&ardar como..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Caducar todas las &carpetas"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Co&mprobar correo"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Comprobar correo entrante"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Comprobar correo"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Enviar mensaje&s en cola"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Estado de conexión (desconocido)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
-msgstr "Enviar mensajes en cola mediante"
+msgstr "Enviar mensajes en cola usando"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gestor de certificados"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importar mensajes..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Depurar Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visor de registros de fi&ltrado..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importar desde otro cliente de correo..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Editar las respuestas «Ausente de la oficina»..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configurar archivado automático..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Mensajes retrasados..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Seguimiento de mensajes de recordatorio..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Borrar"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "M&over el hilo de discusión a la papelera"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Mover el hilo de discusión a la papelera"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Borrar el &hilo"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Buscar mensajes..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Seleccion&ar todos los mensajes"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Gestió&n de listas de correo..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Asignar acceso rápido..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Preferencia&s de caducidad"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Carpeta de archivo comprimido..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Cargar referencias e&xternas"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copiar mensaje a..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Mover mensaje a..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nuevo mensaje..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nuevo"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Mensaje desde plan&tilla"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nuevo mensaje a lista de corre&o..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Crear filtro"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtrar el a&sunto..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filt&rar De..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Fil&trar Para..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtrar &Cc..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marcar el hi&lo de discusión"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marca&r el hilo de discusión como leído"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr ""
 "Marca todos los mensajes del hilo de discusión seleccionado como leídos"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marcar el hilo de disc&usión como no leído"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marca todos los mensajes del hilo seleccionado como no leídos"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marcar el hilo de discusión como &importante"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Quitar la marca de &importante del hilo de discusión"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marcar el hilo de discusión como elemento de &acción"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Quitar la marca de elemento de &acción del hilo de discusión"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Hilo de discusión leído"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Hilo de discusión &ignorado"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Guardar ad&juntos..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copiar descifrado a..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Apl&icar todos los filtros"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expandir hilo de discusión / grupo"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expande el hilo de discusión actual o grupo"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Contraer hilo de discusión / grupo"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Contrae el hilo de discusión actual o grupo"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ex&pandir todos los hilos de discusión"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expandir todos los hilos de discusión en la carpeta actual"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Contraer t&odos los hilos de discusión"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Contraer todos los hilos de discusión en la carpeta actual"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Mostrar el mensa&je"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Mensaje siguie&nte"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Ir al siguiente mensaje"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Mensaje sig&uiente por leer"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Siguiente"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Ir al siguiente mensaje por leer"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Mensa&je anterior"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Ir al mensaje anterior"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Mensaje anterior no leído"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Anterior"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Ir al mensaje anterior por leer"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Car&peta siguiente por leer"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Va a la siguiente carpeta que tenga mensajes no leídos"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Carpeta anterior p&or leer"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Carpeta anterior con mensajes no leídos"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Siguiente &texto por leer"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Ir al texto sin leer siguiente"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4568,224 +4582,229 @@
 "Desplazar hacia abajo el mensaje actual. Si se llega al final del mensaje, "
 "ir al siguiente mensaje."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configurar &filtros..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Gestionar guiones de &Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Añadir cuenta..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introducción a KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Mostrar la página de bienvenida de KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configurar &notificaciones..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Confi&gurar KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Caducar..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Añadir carpeta favorita..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Suscripción en el servidor..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Aplicar todos los filtros"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importar/Exportar datos de KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nuevo contacto de libreta de direcciones..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copiar mensaje a la carpeta"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Saltar a la carpeta..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Interrumpir la operación en curso"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Apunta a la siguiente carpeta"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Apunta a la carpeta anterior"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Seleccionar carpeta con el foco"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Foco en la primera carpeta"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Foco en la última carpeta"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Foco sobre el siguiente mensaje"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Foco sobre el mensaje anterior"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Seleccionar primer mensaje"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Seleccionar último mensaje"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Seleccionar el mensaje con el foco"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Centrarse en búsqueda rápida"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Extender la selección al mensaje anterior"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Extender la selección al mensaje siguiente"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Mover mensaje a la carpeta"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Usar menos ancho de banda"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 "Marcar todos los mensajes como leídos en esta carpeta y todas sus subcarpetas"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Eliminar duplicados en esta carpeta y todas sus subcarpetas"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Preferencia&s de cuentas"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Reiniciar cuenta"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Añadir carpeta favorita"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Vaciar pap&elera"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Mover todos los mensajes a la papelera"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Borrar búsqueda"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Búsqueda de edición..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Deshacer"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Deshacer: «%1»"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtro %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Buscar... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4796,12 +4815,12 @@
 "incrementar la posibilidad de que su sistema se vea comprometido por otros "
 "fallos de seguridad presentes y futuros."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Usar HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4810,126 +4829,126 @@
 "You can configure unified mailboxes, create custom ones or\n"
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
-"Usted tiene configurada más de una cuenta de correo.\n"
+"Tiene configurada más de una cuenta de correo.\n"
 " ¿Quiere activar la característica de bandeja de correo unificada para "
-"mostrarle contenido unificado en su bandeja de entrada, correos enviados y "
+"mostrarle contenido unificado en la bandeja de entrada, correos enviados y "
 "borradores?\n"
-"Usted puede configurar bandejas de correo unificadas, crearlas "
-"personalizadas o desactivar completamente esta característica en las "
-"preferencias del complemento de KMail."
+"Puede configurar bandejas de correo unificadas, crearlas personalizadas o "
+"desactivar completamente esta característica en las preferencias del "
+"complemento de KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "¿Activar las bandejas de correo unificadas?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Activar bandejas de correo unificadas"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Iniciando..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Mover a la papelera"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Papelera"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Mover mensaje a la papelera"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "No se puede copiar el elemento. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Mensaje nuevo para..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Responder a..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Reenviar a..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Añadir a contacto existente"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Abrir en la libreta de direcciones"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Marcador para este enlace"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Editar contacto..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Guardar como..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Encontrar en mensaje..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Guardar imagen en disco..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Mostrar formato HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Mostrar formato HTML cuando el correo viene de este contacto"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Cargar referencia externa cuando el correo viene de este contacto"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Compartir imagen..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4938,64 +4957,64 @@
 "KMail se basa ahora en la infraestructura Akonadi de gestión de información "
 "personal, que trae muchos cambios por todas partes."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Empujar correo (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Búsquedas mejoradas"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Implementación de añadir notas (anotaciones) a correos"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Menos cuelgues de la interfaz gráfica, las comprobaciones de correo se "
 "ejecutan como tareas de fondo"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Uso de complementos"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Nuevo procesador de HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Añadida comprobación de suplantación de URL"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "El cliente de correo de KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Recuperando contenidos de la carpeta"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Por favor, espere..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Desconectado"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5004,7 +5023,7 @@
 "KMail está actualmente en modo desconectado. Pulse <a href=\"kmail:goOnline"
 "\">aquí</a> para ir en línea...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5013,22 +5032,22 @@
 "La cuenta está actualmente en modo desconectado. Pulse <a href=\"kmail:"
 "goResourceOnline\">aquí</a> para ir en línea...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Contacto modificado correctamente"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Mensajes nuevos en"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "No hay mensajes por leer"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5048,11 +5067,11 @@
 #: kontactplugin/kmail/kcmkmailsummary.cpp:68
 #, kde-format
 msgid "Copyright © 2004–2010 Tobias Koenig"
-msgstr "Derechos de autor © 2004–2010 Tobias Koenig"
+msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5076,9 +5095,9 @@
 "in the summary. If this option is not enabled, then only the base folder "
 "path will be shown."
 msgstr ""
-"Active esta opción si usted quiere ver la ruta completa de cada carpeta "
-"listada en el resumen. Si esta opción no está activada, solo se mostrará la "
-"ruta de la carpeta base."
+"Active esta opción si prefiere ver la ruta completa de cada carpeta listada "
+"en el resumen. Si esta opción no está activada, solo se mostrará la ruta de "
+"la carpeta base."
 
 #: kontactplugin/kmail/kmail_plugin.cpp:60
 #, kde-format
@@ -5093,8 +5112,8 @@
 "You will be presented with a dialog where you can create and send a new "
 "email message."
 msgstr ""
-"Se le mostrará un diálogo donde usted puede crear y enviar un nuevo mensaje "
-"de correo."
+"Se le mostrará un diálogo donde puede crear y enviar un nuevo mensaje de "
+"correo."
 
 #: kontactplugin/kmail/kmail_plugin.cpp:74
 #, kde-format
@@ -5146,17 +5165,17 @@
 msgstr ""
 "Selecciona los complementos de resumen para mostrar en la página de resumen."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "resumen del contacto"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Resumen de KDE Kontact"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "© 2004 Tobias Koenig"
@@ -5202,27 +5221,27 @@
 msgid "All"
 msgstr "Todo"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Resumen de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Vista de resumen de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© 2003-2019, los desarrolladores de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5251,7 +5270,7 @@
 msgid "&Reply"
 msgstr "&Responder"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Responder..."
@@ -5261,12 +5280,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Responder al a&utor..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Responder a &todos..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Responder a &lista de correo..."
@@ -5296,7 +5315,7 @@
 msgid "&Edit As New"
 msgstr "&Editar como nuevo"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5488,82 +5507,82 @@
 msgstr ""
 "La búsqueda ha fallado, se encontraron algunos errores: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Buscar mensajes"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Buscar"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Intercalado..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Como &adjunto..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Guardar adjuntos..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Borrar selección"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Saltar a la carpeta original"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 coincidencia"
 msgstr[1] "%1 coincidencias"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Última búsqueda"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
-msgstr "Usted no seleccionó una carpeta válida."
+msgstr "No ha seleccionado una carpeta válida."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
-msgstr "Usted olvidó seleccionar colecciones."
+msgstr "Ha olvidado seleccionar colecciones."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
-msgstr "Usted olvidó definir la condición."
+msgstr "Se ha olvidado de definir la condición."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Todas las carpetas seleccionadas están vacías o no se indexaron."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
-msgstr "Usted olvidó añadir condiciones."
+msgstr "Se ha olvidado de añadir condiciones."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5571,32 +5590,32 @@
 "Contiene una condición que no se puede usar con un número de caracteres "
 "inferior a 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "No se puede obtener el resultado de la búsqueda. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "La búsqueda ha fallado."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Búsqueda completada."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Búsqueda detenida."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5607,21 +5626,21 @@
 "habitual para ello es que exista otra carpeta de búsqueda con el mismo "
 "nombre. Error devuelto «%1»."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copiar mensaje"
 msgstr[1] "Copiar %1 mensajes"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Cortar mensaje"
 msgstr[1] "Cortar %1 mensajes"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Comprobando el estado del índice..."
@@ -5758,7 +5777,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5768,7 +5787,7 @@
 "se detecta más de una cuenta de correo. Solo se pregunta una vez."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5777,26 +5796,26 @@
 "Este valor se usa para decir si se debe mostrar la introducción a KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Mostrar la linea de edicion de búsqueda rápida de carpeta"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Enviar incluido por omisión."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Advertir si el número de destinatarios es mayor que:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5808,19 +5827,19 @@
 "aviso se puede desactivar."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Comprobar ortografía antes de enviar"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Solicitar auto&máticamente acuse de recibo"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5836,13 +5855,13 @@
 "<em>Opciones</em>-><em>Petición de acuse de recibo</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Guardar automáticamente cada:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5855,7 +5874,7 @@
 "0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5863,147 +5882,147 @@
 "editor."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "Si está marcada, los mensajes enviados se almacenarán en formato cifrado"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Una lista de URL usados recientemente"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Una lista de las codificaciones usadas recientemente"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Mostrar indicador de nivel de cifrado"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Validar acceso rápido de envío por omisión"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "El tamaño del diálogo de identidad (solo para uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "El ancho de la ventana de búsqueda (solo para uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "La altura de la ventana de búsqueda (solo para uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "El ancho del diálogo de configuración de KMail (solo para uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "La altura del diálogo de configuración de KMail (solo para uso interno)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Zona de visionado de mensajes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "No mostrar la zona de visionado de mensajes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
-msgstr "Mostrar el panel de vista previa bajo la lista de mensajes"
+msgstr "Mostrar el panel de vista previa debajo de la lista de mensajes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Mostrar el panel de vista previa junto a la lista de mensajes"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Lista de carpetas"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lista larga de carpetas"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Lista corta de carpetas"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Plantilla para mensajes nuevos"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Plantilla para responder"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Plantilla para responder a todos"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Plantilla para reenviar"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Caracteres de citado"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Especifica la política usada cuando se muestre la política"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6013,7 +6032,7 @@
 "(solo para uso interno)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6023,7 +6042,7 @@
 "(solo para uso interno)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6033,7 +6052,7 @@
 "(solo para uso interno)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6043,7 +6062,7 @@
 "búsqueda (solo para uso interno)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6053,7 +6072,7 @@
 "(solo para uso interno)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6287,11 +6306,11 @@
 "for priority reindexing. If you uncheck a folder it may still be indexed "
 "later, unless it was manually excluded from indexing."
 msgstr ""
-"Alguna de las carpetas que usted quiere buscar no están completamente "
+"Alguna de las carpetas en las que quiere buscar no están completamente "
 "indexadas todavía o han sido excluidas del indexado. Todas las carpetas "
-"marcadas abajo se planificarán para indexado prioritario. Si usted desmarca "
-"una carpeta, todavía se indexará más tarde, salvo que se excluya manualmente "
-"del indexado."
+"marcadas abajo se planificarán para indexado prioritario. Si desmarca una "
+"carpeta, se indexará más tarde, salvo que se excluya manualmente del "
+"indexado."
 
 #. i18n: ectx: property (text), widget (QPushButton, selectAllBtn)
 #: ui/incompleteindexdialog.ui:40
@@ -6325,7 +6344,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6692,8 +6711,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Comprobar seguimiento de Url del correo"
+msgid "Scan emails for tracking URLs"
+msgstr "Explorar correos electrónicos para rastrear URL"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7076,9 +7095,9 @@
 msgstr ""
 "Al introducir aquí un servidor LDAP, hace que todas las peticiones LDAP se "
 "dirijan, en primer lugar, a ese servidor. De forma más precisa, esta opción "
-"remplaza la especificada en cualquier otra máquina y puerto que indique en "
-"un URL de LDAP y también se usará si es que omite la máquina y el puerto en "
-"el URL. Se usarán otros servidores LDAP Solo si ha fallado la conexión al "
+"sustituye a la especificada en cualquier otra máquina y puerto que indique "
+"en un URL de LDAP y también se usará si es que omite la máquina y el puerto "
+"en el URL. Se usarán otros servidores LDAP Solo si ha fallado la conexión al "
 "proxy.\n"
 "La sintaxis es «SERVIDOR» o «SERVIDOR:PUERTO». Si se omite el PUERTO, se usa "
 "el 389 (el puerto estándar para LDAP)."
@@ -7313,6 +7332,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Reactivar todas las advertencias de «No volver a preguntar»"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 segundos"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Deshacer el envío"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7368,6 +7397,12 @@
 msgid "Zoom: %1%"
 msgstr "Zum: %1%"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Recortes de texto"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Comprobar seguimiento de Url del correo"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Nombre de la carpeta y tamaño cuando esté cercana a la cuota"
 
diff -Nru kmail-19.04.3/po/es/kmail-refresh-settings.po kmail-19.12.3/po/es/kmail-refresh-settings.po
--- kmail-19.04.3/po/es/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/es/kmail-refresh-settings.po	2020-03-03 00:33:59.000000000 +0000
@@ -0,0 +1,104 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Javier Vinal <fjvinal²gmail.com>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-29 22:17+0200\n"
+"Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
+"Language-Team: Spanish <kde-l10n-es@kde.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 19.08.0\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Javier Viñal"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "fjvinal@gmail.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Asistente de KMail para refrescar preferencias"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "© 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Preferencias de refresco de KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Aviso"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Limpiar preferencias"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Terminar"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Limpiar"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Eliminar preferencias obsoletas de \"Consejo del día\": Hecho"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Borrar preferencias de diálogo en el archivo '%1': Hecho"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Borrar preferencias de filtros en el archivo '%1': Hecho"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+"Limpiar preferencias de carpeta en las preferencias del archivo '%1': hecho"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Limpiar tamaño de diálogo en las preferencias del archivo '%1': hecho"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Por favor, cierre KMail/Kontact antes de usarlo."
diff -Nru kmail-19.04.3/po/es/ktnef.po kmail-19.12.3/po/es/ktnef.po
--- kmail-19.04.3/po/es/ktnef.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/es/ktnef.po	2020-03-03 00:33:59.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-27 22:06+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <l10n-kde-es@kde.org>\n"
diff -Nru kmail-19.04.3/po/et/akonadi_archivemail_agent.po kmail-19.12.3/po/et/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/et/akonadi_archivemail_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/et/akonadi_archivemail_agent.po	2020-03-03 00:34:00.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2016-07-27 20:00+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -177,14 +177,14 @@
 msgstr ""
 "Teist arhiivi ei saa selle kausta puhul lisada. Muuda parem olemasolevat."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "Kataloogi ei ole olemas. Palun kontrolli seadistusi. Arhiveerimine lükati "
 "edasi."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "%1 arhiveerimise alustamine"
diff -Nru kmail-19.04.3/po/et/akonadi_followupreminder_agent.po kmail-19.12.3/po/et/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/et/akonadi_followupreminder_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/et/akonadi_followupreminder_agent.po	2020-03-03 00:34:00.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2016-07-27 20:00+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -17,87 +17,87 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Vastamise meeldetuletuse agent"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, fuzzy, kde-format
 #| msgid "Follow Up Reminder Agent"
 msgid "Follow Up Reminder"
 msgstr "Vastamise meeldetuletuse agent"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, fuzzy, kde-format
 #| msgid "Copyright (C) 2014-2016 Laurent Montel"
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Autoriõigus (C) 2014-2016: Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Hooldaja"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Marek Laane"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "qiilaq69@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Saaja"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Teema"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Tähtaeg"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Vastus"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Saadud"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Ootel"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Näita kirja"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Kustuta"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, fuzzy, kde-format
 #| msgid "Do you want to remove selected item?"
 msgid "Do you want to remove this selected item?"
@@ -105,12 +105,12 @@
 msgstr[0] "Kas eemaldada valitud element?"
 msgstr[1] "Kas eemaldada valitud element?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "%1 saatis vastuse"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Ootad endiselt vastust kirjale:"
diff -Nru kmail-19.04.3/po/et/akonadi_mailfilter_agent.po kmail-19.12.3/po/et/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/et/akonadi_mailfilter_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/et/akonadi_mailfilter_agent.po	2020-03-03 00:34:00.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2016-01-15 13:24+0200\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -22,17 +22,17 @@
 msgid "Filter Log Viewer"
 msgstr "Filtrilogi näitaja"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Filtri tegevuste &logimine"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -42,23 +42,23 @@
 "kogutakse ja näidatakse mõistagi ainult siis, kui logimine on sisse "
 "lülitatud."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Logimise üksikasjad"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Logimustri kirjeldus"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Filtri &reegli hindamise logimine"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -72,34 +72,34 @@
 "filtrireegli kohta, vastasel juhul aga ainult iga filtri kõigi reeglite "
 "hindamise tulemus."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Filtri mustri hindamise logimine"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Filtri toimingute logimine"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Logi suuruse piirang:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "piiramatu"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -112,7 +112,7 @@
 "suurus ületab limiidi, kustutatakse vanemad andmed, et taas jõuda allapoole "
 "limiiti."
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -121,64 +121,64 @@
 "Faili %1 kirjutamine nurjus:\n"
 "\"%2\" on üksikasjalik veakirjeldus."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMaili tõrge"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "%1. kirja filtreerimine (kokku %2)"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Tõrge kirja liigutava filtri rakendamisel"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Tõrge kirja kustutava filtri rakendamisel"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Tõrge kirja muutva filtri rakendamisel"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Filtri reeglite hindamine:</b>"
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filtri reeglid sobivad.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr ""
 "<b>Filtreerimist alustatakse kirjast \"%1\" saatjalt \"%2\" \"%3\":</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Kirjade filtreerimine"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Kirjade filtreerimise logi on lubatud"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Valmis"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtreerimine ressursis %1"
diff -Nru kmail-19.04.3/po/et/akonadi_sendlater_agent.po kmail-19.12.3/po/et/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/et/akonadi_sendlater_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/et/akonadi_sendlater_agent.po	2020-03-03 00:34:00.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2016-07-27 20:01+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -60,57 +60,57 @@
 msgid "Your emails"
 msgstr "qiilaq69@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Saaja"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Teema"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Saatmise aeg"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Korduv"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Kirja ID"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Ühtegi kirja pole ootel..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Saada kohe"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Kustuta"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Jah"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Ei"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected item? Do you want to continue?"
 #| msgid_plural ""
@@ -120,68 +120,68 @@
 msgstr[0] "Kas kustutada valitud element? Kas jätkata?"
 msgstr[1] "Kas kustutada valitud elemendid? Kas jätkata?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Elementide eemaldamine"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Kas eemaldada ka kirjad?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Kirjade eemaldamine"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Ühtegi kirja ei leitud."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Ühtegi kirja ei leitud."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Tõrge kirja hankimisel."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Kirja ei õnnestunud hankida. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Transpordiviisi loomine nurjus"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "See ei ole tegelik kiri"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Kirja saatmine nurjus."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Kiri saadetud"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Tekkis tõrge. Kas saata uuesti?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Tekkis tõrge"
diff -Nru kmail-19.04.3/po/et/kmail.po kmail-19.12.3/po/et/kmail.po
--- kmail-19.04.3/po/et/kmail.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/et/kmail.po	2020-03-03 00:34:00.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2016-12-09 21:36+0200\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-i18n-doc@kde.org>\n"
@@ -188,8 +188,8 @@
 msgstr "Mitu krüptovõtit aadressi kohta"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -296,27 +296,27 @@
 "KMail ei suutnud selles kaustas postiloendit tuvastada. Palun määra "
 "aadressid käsitsi."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvoot"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Kasutus:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Olek:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% täis"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 / %2 kasutatud"
@@ -339,7 +339,7 @@
 "mida soovid kausta valimiseks kasutada.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Mallid"
@@ -350,106 +350,106 @@
 msgstr "Kohandat&ud kirjamallide kasutamine selles kaustas"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Globaalsete mallide kopeerimine"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vaade"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "&Kasutatakse kohandatud ikoone"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "N&ormaalne:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Lugemata:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Saatja/saaja veeru näitamine kirjade nimekirjas"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Näidatakse veergu:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Saatja"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Saaja"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Kirjade nimekiri"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Vaikimisi koondamisviisi kasutamine"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Koondamisviis"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Vaikimisi teema kasutamine"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Teema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Kirja vaikevormindus"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "HTML-i eelistamine tekstile"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Teksti eelistamine HTML-ile"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Globaalse seadistuse kasutamine"
@@ -459,104 +459,109 @@
 msgid "Retrieval Options"
 msgstr "Tõmbamise valikud"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Identiteet"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Vastuvõtmine"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Saatmine"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, fuzzy, kde-format
 #| msgid "IMAP server"
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "IMAP server"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Väljaminevate kirjade kontod (lisa vähemalt üks!):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Üldised valikud"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Enne saatmist nõutakse kinnitust"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Õigekirja kontroll enne saatmist"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Mitte kunagi automaatselt"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Kirjade käsitsikontrollimisel"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Alati uute kirjade kontrollimistel"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Saada kohe"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Saada hiljem"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Kirjad kaustast 'väljuvad' &saadetakse:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Saatmise vaikemeetod:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Konto lisamine"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "Kohanda kontode järjestust..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -565,30 +570,30 @@
 "Kontonõustaja käivitamine nurjus. Palun kontrolli, kas AccountWizard on "
 "korrektselt paigaldatud."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Kontonõustaja käivitamine nurjus"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Kaasatakse uute kirjade kontrollimisel käsitsi"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Võrguta režiimi lülitumine KMailist väljumisel"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Uute kirjade hankimine käivitamisel"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -648,7 +653,7 @@
 msgid "Fixed Width Font"
 msgstr "Fikseeritud laiusega font"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Redaktor"
@@ -954,61 +959,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Sildi loomine nurjus. Selle nimega silt on juba olemas."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Üldine"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardmallid"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Kohandatud mallid"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Teema"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Kooditabel"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Päised"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Kaasatud failid"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Automaatkorrigeerimine"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Piltide suuruse automaatne muutmine"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Allkiri"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1017,12 +1022,12 @@
 "Määratud allkirja automaatne lisamine\n"
 "kohe kirja koostamise alustamisel"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Allkiri lisatakse tsiteeritava teksti ette"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1031,18 +1036,18 @@
 "RFC-le vastava allkirja eraldaja (kaks kriipsu ja\n"
 "tühimärk ühel real) lisamine allkirja ette"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Vastamisel ei tsiteerita ühtegi kirjas olnud allkirja"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Vorming"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1052,7 +1057,7 @@
 "Vastamisel ainult valitud teksti tsiteerimine\n"
 "terve kirja asemel, kui kirjaaknas on tekst valitud."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1063,17 +1068,17 @@
 " ridade ette, isegi kui rida on loodud teksti murdmisel\n"
 "täiendavat reavahetust lisades."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Automaatse reamurdmise lubamine määratud kaugusel"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Tekstilaiuse määramine automaatsele reamurdmisele"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1084,7 +1089,7 @@
 "selle algses vormingus, vastasel juhul saadetakse\n"
 "algne kiri vaikimisi lihttekstina"
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1095,34 +1100,34 @@
 "Toetatud on rasvane ja kaldkiri, allajoonimine, loendid ning\n"
 "välised viited."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Kirja sees"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Kaasatud failiga"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Edastatava kirja vaikevormingu määramine"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Vaikimisi edasisaatmise tüüp:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Saajad"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1134,17 +1139,17 @@
 "Seda saab kirjade kaupa määrata menüükäsuga Eelistused - Lisa kättesaamise/"
 "lugemise soov"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Hoiatus, kui määratud on liiga palju saajaid"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Saajate maksimaalse arvu määramine hoiatuse tarbeks"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1160,7 +1165,7 @@
 "aitab vältida kirja saatmist kogemata liiga paljudele inimestele.\n"
 "Pane siiski tähele, et siin ei arvestata postiloendite liikmete arvu."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1169,18 +1174,18 @@
 "Viimati sisestatud aadresside meelespidamine\n"
 "ja nende pakkumine saaja aadressi lõpetamiseks"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Ei salvestata"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Viimati kasutatud aadresside maksimaalne arv:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1189,24 +1194,24 @@
 "Viimati sisestatud aadresside maksimaalne arv,\n"
 "mida aadresside lõpetamise huvides meeles peetakse"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Seadista lõpetamist..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Ei salvestata automaatselt"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Ei salvestata automaatselt"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1214,77 +1219,77 @@
 msgstr[0] " minut"
 msgstr[1] " minutit"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Kirja automaatne salvestamine määratud intervalliga"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "T&eemale eelneb vastamisel"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 msgstr "Järgmiste prefiksite äratundmine (sobivus on tõstutundetu):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Lisa..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Ee&malda..."
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Muuda..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Uus vastamise prefiks:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Tee&male eelnevad edasisaatmisel"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Lisa..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Eemalda"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Muuda..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Uus edasisaatmise prefiks"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1294,90 +1299,90 @@
 "kooditabelit, mis sisaldab kõiki vajalikke märke."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Muuda..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Kooditabel:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Vastamisel või edasisaatmisel kasutatakse originaali kooditabelit (kui "
 "võimalik)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Seda kooditabelit pole võimalik kasutada."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Järgneva Message-Id sufiksi kasutamine:"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "&Message-Id sufiks:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Kohandatud MIME päiste siltide defineerimine väljuvatele kirjadele:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nimi"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Väärtus"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Uus"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nimi:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Väärtus:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "Vigane kuupäev"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlookiga ühilduvad kaasatud failide nimed"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1386,39 +1391,39 @@
 "Sisselülitamisel mõistab Outlook(tm) erisümboleid (näiteks täpitähti) "
 "sisaldavaid lisatud failide nimesid (loodetavasti...)"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Puuduvate kaasatud failide tuvastamine"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Järgmisi võtmesõnu peetakse kavatsuseks kaasata fail:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Uus võtmesõna:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Kaasatud failiga"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Piirang puudub"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1508,7 +1513,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer Plugins"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Kirja koostamise pluginad"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1622,7 +1627,7 @@
 msgid "Archive Folder"
 msgstr "Kausta arhiveerimine"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1688,19 +1693,19 @@
 msgid "Notification"
 msgstr "Märguanne"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 manus (%2)"
 msgstr[1] "%1 manust (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Kaasatud failide nimekirja peitmine"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Kaasatud failide nimekirja näitamine"
@@ -1717,331 +1722,331 @@
 msgid "Encoding"
 msgstr "Kodeering"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Sõnaraamatu valimine kirja õigekirja kontrollimiseks"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Saadetud kirjade kausta valimine selle kirja koopia salvestamiseks"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Väljuvate kirjade konto valimine selle kirja saatmiseks"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Selle kirja saatja e-posti aadressi määramine"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Selle kirja teema määramine"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identiteet:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Sõnaraamat:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Saa&detud kirjade kaust:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Kirja saat&mise viis:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Kellelt:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Teema:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Saada kiri"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Saada kiri kasutades"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Saada"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Saada &hiljem"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Saada &hiljem kasutades"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Pane järjekorda"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "&Salvesta mustandina"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Kirja salvestamine mustandite kausta"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Salvesta &mallina"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Kirja salvestamine mallide kausta"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Salvesta &faili"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Kirja salvestamine teksti- või HTML-failina"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "L&isa tekstifail..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "L&isa viimati kasutatud tekstifail"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Aadressiraamat"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Ava aadressiraamat"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "Uus &redaktor"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Vali saa&jad..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Salvesta postiloen&d..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Aseta kaasatud &failina"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Pu&hasta tühikutest"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Fikseeri&tud fondi kasutamine"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Kiire"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Lisa kättesaamise/lugemise kinnituse &soov"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "Lisa kättesaamise/lugemise kinnituse &soov"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Reamurdmine"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "Teksti&jupid"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "A&utomaatne õigekirja kontroll"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Vormindatud teksti redigeerimine"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Vormindatud tekst"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Vormindatud teksti redigeerimise režiimi lülitamine"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Kõik &väljad"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identiteet"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Sõnaraamat"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Saadetud kirjade ka&ust"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Kirja saatmise viis"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Kellelt"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Teema"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Lisa allk&iri järele"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Lisa all&kiri ette"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Lisa allkiri k&ursori asukohta"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Õi&gekirja kontroll..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Õigekirja kontroll"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Krüpti kiri"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Krüptimine"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Allkir&jasta kiri"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Allkirjastamine"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Krüptitud kir&ja vorming"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Selle kirja krüptovormingu valimine"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "Add Followup Reminder..."
 msgid "Create Follow Up Reminder..."
 msgstr "Lisa vastamise meeldetuletus..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMaili seadistamine..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2049,53 +2054,53 @@
 msgstr ""
 "<qt>See peidab üldse menüüriba. Seda saab näha uuesti, kui kirjutada %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Peida menüüriba"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Rida: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Veerg: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ÜLEKIRJ"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "LISAMINE"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Õigekirja kontroll: sees"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Õigekirja kontroll: väljas"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "&Salvesta uuesti mallina"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Salvesta mustan&dina"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2103,7 +2108,7 @@
 msgstr ""
 "Salvestab kirja uuesti mallide kausta. Nii saab seda ka edaspidi kasutada."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2112,85 +2117,85 @@
 "Salvestab kirja mustandite kausta. Nii saab seda edasi redigeerida ning "
 "soovi korral hiljem ära saata."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
 "Kas salvestada kiri mustandite kausta hilisemaks kasutamiseks või unustada "
 "see?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Redaktori sulgemine"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Kirja automaatne salvestamine nurjus"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Kirja saatmine nurjus"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Faili lisamine"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "L&isa kirjasisese pildina"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Lis&a kaasatud failina"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Kaasatud faili nimi:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "Vigane kuupäev"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Lisa kirja URL"
 msgstr[1] "Lisa kirja URL-id"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Lis&a fail manusena"
 msgstr[1] "Lis&a failid manusena"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Lisa lõikepuhvri tekst kaasatud failina"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "nimetu"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2202,12 +2207,12 @@
 "identiteedile ei ole selleks määratud ühtki (OpenPGP või S/MIME) krüptovõtit."
 "</p><p>Palun vali kasutatavad võtmed identiteedi seadistuses.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Määramata krüptovõti"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2218,12 +2223,12 @@
 "OpenPGP või S/MIME allkirjastamisvõti.</p><p>Palun vali kasutatav võti "
 "identiteedi seadistustes.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Määramata allkirjastamisvõti"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2234,7 +2239,7 @@
 "posti aadressi kehtestada kõigile identiteetidele, et sa ei peaks seda iga "
 "kirja korral aina uuesti sisestama."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2243,59 +2248,59 @@
 "Vaja on sisestada vähemalt üks saaja kas väljale Kellele: või koopia või "
 "pimekoopia väljale."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Sa ei sisestanud saajat. Kas saata kiri ikkagi teele?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Saaja on määramata"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Sa ei sisestanud teemat. Kas saata kiri ilma teemata?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Teema sisestamata"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "S&aada nagu on"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Ei, ma sisestan teema"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Mustandi krüptimiseks on vaja määrata vähemalt üks saaja."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Kirja saatmine..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Saada kinnitus"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Saada k&ohe"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2304,22 +2309,22 @@
 "Proovid saata kirja rohkem kui %1 saajale. Kas sellest hoolimata saata kiri "
 "ära?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Liiga palju saajaid"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Saada nagu on"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Muuda saajaid"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2327,22 +2332,22 @@
 msgstr ""
 "HTML-režiimi väljalülitamisel läheb vormindus kaotsi. Kas tõesti jätkata?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Kas kaotada vormindus?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Kaota vorming"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Lisa märkekeele lihttekst"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2351,7 +2356,7 @@
 "Selle saaja puhul kasutatakse üliturvalist krüptimist (krüptovõti on "
 "täielikult usaldusväärne). Üksikasjade nägemiseks klõpsa ikoonile."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2360,7 +2365,7 @@
 "Selle saaja puhul kasutatakse keskmiselt turvalist krüptimist (krüptovõti on "
 "kesise usaldusväärsusega). Üksikasjade nägemiseks klõpsa ikoonile."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2369,7 +2374,7 @@
 "Selle saaja puhul kasutatakse vähese turvalisusega krüptimist (krüptovõti ei "
 "ole usaldusväärne) Üksikasjade nägemiseks klõpsa ikoonile."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2379,7 +2384,7 @@
 "Kiri sellele saajale küll krüptitakse, aga selle turvalisus on teadmata "
 "(krüptovõtme kontroll nurjus). Üksikasjade nägemiseks klõpsa ikoonile."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2457,27 +2462,27 @@
 msgid "External editor was started."
 msgstr "Käivitati väline redaktor."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Arhiivikaust ei ole määratud. Palun kontrolli konto %1 seadistust"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Arhiivikaust ei ole määratud. Palun kontrolli konto %1 seadistust"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2505,11 +2510,6 @@
 msgid "Message will not be encrypted"
 msgstr "Kirja ei krüptita"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Tekstijupid"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2553,27 +2553,27 @@
 msgid "Cannot move messages."
 msgstr "Kirjade liigutamine nurjus."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Kausta hankimine nurjus. Teatati tõrkest: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Ühtegi kausta ei tagastatud."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Ülemkausta hankimine nurjus. Teatati tõrkest: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Kaustade nimekirja ei tagastatud."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Kirjad on arhiveeritud"
@@ -2614,48 +2614,48 @@
 msgid "&Existing identities:"
 msgstr "&Olemasolevad identiteedid:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Viga uue võtmepaari genereerimisel: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Võtme genereerimise tõrge"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Võti puudub"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Genereeri uus võtmepaar"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Uue võtmepaari genereerimine..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Identiteedi muutmine"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Üldine"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Sinu nimi:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2666,12 +2666,12 @@
 "see peab esinema saadetava e-kirja päises.</p><p>Kui jätad selle tühjaks, ei "
 "näidata sinu nime, vaid ainult e-posti aadressi.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Organisatsioon:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2683,12 +2683,12 @@
 "p><p>Täiesti turvaline (ja igati normaalne) on see väli tühjaks jätta.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-posti aadress:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2703,12 +2703,12 @@
 "allpool aliasaadressid.</p><p>Kui jätad selle tühjaks või sisestad valesti, "
 "on teistel lausa võimatu sulle vastata.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "&E-posti aliased:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2725,12 +2725,12 @@
 "ee<br>perekonnanimi@kuskil.ee</td></tr></table><p>Kirjuta igale reale üks "
 "aliasaadress.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Krüptograafia"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2751,12 +2751,12 @@
 "Tavalisi e-kirja võimalusi see valik ei puuduta.</p><p>Rohkem infot võtmete "
 "kohta leiab internetis aadressilt <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP allkirjastamisvõti:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2780,12 +2780,12 @@
 "võimalusi see valik ei puuduta.</p><p>Rohkem infot võtmete kohta leiab "
 "internetis aadressilt <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP krüptovõti:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2798,12 +2798,12 @@
 "sellisel juhul kirju S/MIME-ga signeerida. Tavalisi e-kirja võimalusi see "
 "valik ei puuduta.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME allkirja sertifikaat:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2818,39 +2818,39 @@
 "sellisel juhul kirju S/MIME-ga krüptida. Tavalisi e-kirja võimalusi see "
 "valik ei puuduta.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME krüptosertifikaat:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Eelistatud vorming:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Kirjad allkirjastatakse automaatselt"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Kirjad k&rüptitakse automaatselt, kui vähegi võimalik"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Muu"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Vastamise aadress:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2868,12 +2868,12 @@
 "posti aadress, aga vastused lähevad grupi aadressile.</p><p>Kui kahtled, "
 "jäta see väli tühjaks.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&Koopia aadressid:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2889,12 +2889,12 @@
 "p><p>Rohkem kui ühe aadressi määramiseks eralda need komadega.</p><p>Kui sa "
 "ei ole kindel, mida teha, jäta see väli tühjaks.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Sala&koopia aadressid:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2911,57 +2911,57 @@
 "eralda need komadega.</p><p>Kui sa ei ole kindel, mida teha, jäta see väli "
 "tühjaks.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Sõnaraamat:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Saadetud kir&jade kaust:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Mustan&dite kaust:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Mallide kaust:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Väljuvate kirjade konto:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Oma vCardi lisamine kirjale"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Loo..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Automaatkorrektuuri keel:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Vaikedomeeni nime taastamine"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "&Vaikedomeen:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2970,33 +2970,33 @@
 "<qt><p>Vaikedomeeni kasutatakse e-posti aadressi lõpetamiseks, mis koosneb "
 "ainult kasutajanimest.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Kohandat&ud kirjamallide kasutamine selle identiteedi puhul"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Allkiri"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Pilt"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Sobimatu e-posti alias \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Sobimatu e-posti aadress"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3009,7 +3009,7 @@
 "Selle tulemuseks võivad olla hoiatusteated saaja poolel, kui ta püüab selle "
 "seadistusega loodud allkirja kontrollida."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3018,7 +3018,7 @@
 "Üks seadistatud OpenPGP krüptovõtmeid ei sisalda ühtki määratud e-posti "
 "aadressiga kasutaja ID-d sellele identiteedile (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3031,7 +3031,7 @@
 "Selle tulemuseks võivad olla hoiatusteated saaja poolel, kui ta püüab selle "
 "seadistusega loodud allkirja kontrollida."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3040,22 +3040,22 @@
 "Üks seadistatud S/MIME krüptosertifikaate ei sisalda ühtki määratud e-posti "
 "aadressiga kasutaja ID-d sellele identiteedile (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-posti aadressi ei leitud võtmest/sertifikaadist"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Allkirjafail ei ole kehtiv"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Identiteedi \"%1\" muutmine"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3064,7 +3064,7 @@
 "Mõningaid identiteedile määratud kohandatud kaustu ei ole (enam) olemas. "
 "Seepärast kasutatakse tavalisi kaustu."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Muuda..."
@@ -3096,6 +3096,21 @@
 msgid "We cannot delete vCard file."
 msgstr "Me ei saa vCardi faili kustutada"
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgctxt "@info"
+#| msgid "Do you really want to remove group \"%1\"?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Kas tõesti eemaldada see grupp \"%1\"?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Saada kinnitus"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3261,7 +3276,7 @@
 "Näited saab näha aadressil <a href=\"http://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Pilt"
@@ -3294,7 +3309,7 @@
 msgstr[0] "Postiloend %2 on tühi, seda ei saa kasutada."
 msgstr[1] "Postiloendid %2 on tühjad, neid ei saa kasutada."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Lisa aadressiraamatusse"
@@ -3304,22 +3319,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakt loodi edukalt"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kontakti ei saa salvestada: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Kontakti salvestamine nurjus"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Kas lisada manusena kataloog \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Kataloogi lisamine manusena"
@@ -3530,7 +3545,7 @@
 msgstr "Ka&ust"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3538,7 +3553,7 @@
 msgstr "Rakenda kõik &filtrid kaustale"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Remove Duplicates in This Folder and All its Subfolder"
@@ -3565,7 +3580,7 @@
 msgstr "&Edasisaatmine"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Rakenda f&ilter"
@@ -3590,7 +3605,7 @@
 msgstr "&Abi"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Peamine tööriistariba"
@@ -3644,12 +3659,12 @@
 msgid "The file does not contain a message."
 msgstr "Fail ei sisalda kirja."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fail sisaldab mitu kirja, näidatakse ainult esimest."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3658,32 +3673,32 @@
 "Kas soovid valitud kirjad edastada kaasatud failidena ühes kirjas (MIME "
 "referaadina) või eraldi kirjadena?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Saada referaadina"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Saada eraldi"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Kirjade filtreerimine"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "%1. kirja filtreerimine (kokku %2)"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Kirjade liigutamine"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Kirjade kustutamine"
@@ -3712,30 +3727,30 @@
 msgid "Text Direction Toolbar"
 msgstr "Tekstisuuna riba"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail töötab võrguühenduseta, kõik võrguga seotud toimingud lükatakse edasi"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Kirja saatmine..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail töötab võrgus, sooritatakse kõik võrguga seotud toimingud"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3744,37 +3759,37 @@
 "KMail töötab võrgus, kõik võrguga seotud toimingud sooritatakse "
 "võrguühenduse tuvastamisel"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail on praegu võrguühenduseta režiimis. Mida soovid ette võtta?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Võrgus/Võrgust ära"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Töötamine võrgus"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Töötamine võrguta"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Tuvastati võrguühendus, jätkatakse kõiki võrguga seotud toiminguid"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Võrguühendust ei leitud, kõik võrguga seotud toimingud lükatakse edasi"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3783,12 +3798,12 @@
 "Automaatselt salvestatud faili avamine asukohas %1 nurjus.\n"
 "Põhjus: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Automaatselt salvestatud faili avamine nurjus"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3797,7 +3812,7 @@
 msgstr[1] ""
 "Need %1 identiteeti on pandud kasutama vaikimisi kirjade saatmise viisi:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3805,43 +3820,46 @@
 msgstr[0] "See identiteet on pandud kasutama muud kirjade saatmise viisi:"
 msgstr[1] "Need %1 identiteeti on pandud kasutama muud kirjade saatmise viisi:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Kirjade saatmine"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Saatmisprotsessi initsialiseerimine..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Ressurss %1 on katki."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Kirjade arhiveerimise agent ei ole registreeritud."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Kirjade hilisema saatmise agent ei ole registreeritud."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Vastamise meeldetuletuse agent ei ole registreeritud."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3850,12 +3868,12 @@
 "Sertifikaadihalduri käivitamine nurjus. Palun kontrolli, kas Kleopatra on "
 "korrektselt paigaldatud."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMaili viga"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3864,26 +3882,30 @@
 "Impordinõustaja käivitamine nurjus. Palun kontrolli, kas ImportWizard on "
 "korrektselt paigaldatud."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Impordinõustaja käivitamine nurjus"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "PIM-i seadistuste eksportimise programmi käivitamine nurjus. Palun kontrolli "
 "paigaldust."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "PIM-i seadistuste eksportimise programmi käivitamine nurjus"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3892,67 +3914,67 @@
 "Impordinõustaja käivitamine nurjus Palun kontrolli, kas ImportWizard on "
 "korrektselt paigaldatud."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Impordinõustaja käivitamine nurjus"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr "Süsteemis leiti veel üks e-posti rakendus. Kas importida selle andmed?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Impordinõustaja käivitamine nurjus. Palun kontrolli paigaldust."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Teema puudub"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(mallid puuduvad)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Sellele kaustale ei ole seatud mingeid kirjade aegumise tähtaegu"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Kas tõesti tühjendada kaust <b>%1</b> vanadest kirjadest?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Tühjenda"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Kustuta a&egunud"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Prügikasti tühjendamine"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Prügikasti liigutamine"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Kas tõesti tühjendada prügikast?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3960,27 +3982,27 @@
 msgstr ""
 "<qt>Kas tõesti liigutada kõik kirjad kaustast <b>%1</b> prügikasti?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Kõik kirjad liigutati prügikasti"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Kas tõesti kustutada kõik aegunud kirjad?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Kas kustutada vanad kirjad?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Kirjade aegumine"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3991,17 +4013,17 @@
 "haavatamaks ja võib suurendada tõenäosust, et sinu süsteemile võivad kahju "
 "tekitada nii praegused kui tulevased turvaohud."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Turvahoiatus"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Väliste viidete laadimine"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4016,536 +4038,536 @@
 "<qt>Kas tõesti kustutada valitud %1 kirja?<br />Kustutamise korral pole "
 "võimalik neid taastada.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Kirjade kustutamine"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Kirja kustutamine"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Kirjade liigutamine..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Kirjade kustutamine..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Kirjad edukalt kustutatud."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Kirjad edukalt liigutatud."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Kirjade kustutamine nurjus."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Kirjade kustutamine katkestati."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Kirjade liigutamine nurjus."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Kirjade liigutamine katkestati."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Kirjade liigutamine kausta"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kirjade kopeerimine..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Kirjad edukalt kopeeritud."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Kirjade kopeerimine nurjus."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kirjade kopeerimine katkestati."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kirjade kopeerimine kausta"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Kirjade viskamine prügikasti..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Kirjade viskamine prügikasti..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Kirjad on edukalt prügikasti visatud."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Kirjad on edukalt prügikasti visatud."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Kirjade viskamine prügikasti nurjus."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Kirjade viskamine prügikasti nurjus."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Kirjade viskamine prügikasti katkestati."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Kirjade viskamine prügikasti katkestati."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Hüppa kausta"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "&Salvesta kui..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Kustuta aegunud kirjad kõigist kaustadest"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Kontrolli &posti"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Kontrolli posti"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Kontrolli posti"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Saada &järjekorras ootavad kirjad"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Olekuteade (tundmatu)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Saada järjekorras ootavad kirjad kasutades"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Sertifikaadihaldur"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "K&irjade importimine..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Sieve silumine..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filtrilo&gi näitaja..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Import teistest e-posti klientidest..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Puhkuseteate muutmine..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "A&utomaatse arhiveerimise seadistamine..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Edasilükatud kirjad..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Vastamise meeldetuletused..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Kustuta"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Liiguta lõi&m prügikasti"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Liiguta lõim prügikasti"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "&Kustuta lõim"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Otsi kirjadest..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "&Vali kõik kirjad"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Postiloendi haldus..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Omista kiirklahv..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "A&egumisseadistused"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arhiveeri kaust..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "&Väliste viidete laadimine"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopeeri kiri..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Liiguta kiri..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Uus kiri..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Uus"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "&Kiri malli põhjal"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Uus ki&ri postiloendisse..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Loo filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "&Teema järgi..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "S&aatja järgi..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Saa&ja järgi..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Koo&pia saaja järgi..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Lõi&me märgistus"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Märgi lõim l&oetuks"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Märgi kõik kirjad valitud lõimes loetuks"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Märgi lõim &lugemata lõimeks"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Märgi kõik kirjad valitud lõimes lugemata kirjadeks"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Märgi lõim &tähtsaks lõimeks"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Eemalda &tähtsa lõime märge"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Märgi lõim ülesan&deks"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Eemalda ülesan&de märge"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Jälgi lõi&me"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignoreeri lõime"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Salvesta kaasatud failid..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Kopeeri element..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Rakenda kõik &filtrid"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Ava lõim/grupp"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Avab aktiivse lõime või grupi"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Sulge lõim/grupp"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Sulgeb aktiivse lõime või grupi"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "A&va kõik lõimed"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Avab kõik aktiivse kausta lõimed"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Sul&ge kõik lõimed"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Sulgeb kõik aktiivse kausta lõimed"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Näita kirja"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Järgmine kiri"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Liigu järgmisele kirjale"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Jä&rgmine lugemata kiri"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Järgmine"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Liigu järgmisele lugemata kirjale"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Eelmine kiri"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Liigu eelmisele kirjale"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Ee&lmine lugemata kiri"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Eelmine"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Liigu eelmisele lugemata kirjale"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Jär&gmine lugemata kaust"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Liigu järgmisse lugemata kirjadega kausta"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Eel&mine lugemata kaust"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Liigu eelmisesse lugemata kirjadega kausta"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Järgm&ine lugemata tekst"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Liigu järgmisele lugemata tekstile"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4554,220 +4576,226 @@
 "Kerib aktiivset kirja. Aktiivse kirja lõppu jõudes liigub järgmisele "
 "lugemata kirjale."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "&Filtrite seadistamine..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "&Sieve skriptide haldamine..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Konto lisamine"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&KMaili sissejuhatus"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "KMaili tervituslehekülje näitamine"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "&Märguannete seadistamine..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "KMaili &seadistamine..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Kirjade aegumine..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Lisa lemmikkaust..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Serveripoolne tellimine..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Rakenda kõik &filtrid"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "KMaili andmete import/eksport..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Uus aadressiraamatu kontakt..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopeeri kiri kausta"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Hüppa kausta..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Loobu käesolevast tegevusest"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Liigu järgmisesse kausta"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Liigu eelmisesse kausta"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Vali aktiivne kaust"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Liigu esimesse kausta"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Liigu viimasesse kausta"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Liigu järgmisele kirjale"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Liigu eelmisele kirjale"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Vali esimene kiri"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Vali viimane kiri"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Vali aktiivne kiri"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Fookus kiirotsingule"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Laienda valikut eelmisele kirjale"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Laienda valikut järgmisele kirjale"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Liiguta kiri kausta"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Väiksema ühenduse mahu kasutamine"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Märgi selles kaustas ja kõigis alamkaustades kõik kirjad loetuks"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Eemalda topeltkirjad selles kaustas ja kõigis selle alamkaustades"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Seadistused"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity account"
+msgid "Restart Account"
+msgstr "Identiteedi konto"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Lemmikkausta lisamine"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Tühjenda &prügikast"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Liiguta kõik kirjad prügikasti"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Kustuta otsing"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Muuda otsingut..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Võta tagasi"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Võta tagasi: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4775,7 +4803,7 @@
 msgid "Search... <%1>"
 msgstr "Otsing...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4786,12 +4814,12 @@
 "võib suurendada tõenäosust, et sinu süsteemile võivad kahju tekitada nii "
 "praegused kui tulevased turvaohud."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML-i kasutamine"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4801,118 +4829,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Alustamine..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Liiguta prügikasti"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Prügikasti"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Liiguta kiri prügikasti"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Elemendi kopeerimine nurjus. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Uus kiri..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Vasta..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Edasta..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Lisa olemasolevale kontaktile"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Ava aadressiraamatus"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Lisa viit järjehoidjatesse"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Muuda kontakti..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Salvesta viit kui..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Otsi kirjast..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Salvesta pilt kettale..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Näita HTML-vormingut"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "HTML-vormingu näitamine, kui kiri tuleb antud kontaktilt"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Väliste viidete näitamine, kui kiri tuleb antud kontaktilt"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Jaga pilti..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4921,62 +4949,62 @@
 "KMaili aluseks on nüüd Akonadi personaalse teabe haldamise raamistik, mis "
 "toob kaasa palju muudatusi."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "E-kirjade aktiivlevi (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Täiustatud otsing"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Märkuste (annotatsioonide) lisamine võimalus kirjadele"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Vähem kasutajaliidese hangumist, uusi kirju kontrollitakse taustal"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Pluginate toetus"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Uus HTML- renderdaja (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "URL-i õngitsemise kontrollimise lisamine"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "KDE e-posti klient."
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Kaustade sisu tõmbamine"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Palun oota . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Võrguühenduseta"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4985,7 +5013,7 @@
 "KMail töötab praegu võrguühenduseta režiimis. Võrguühenduse loomiseks klõpsa "
 "<a href=\"kmail:goOnline\">siia</a> . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4994,22 +5022,22 @@
 "Konto on praegu võrguühenduseta režiimis. Võrguühenduse loomiseks klõpsa <a "
 "href=\"kmail:goResourceOnline\">siia</a> . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontakti muudeti edukalt"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Uued kirjad kaustas"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Lugemata kirju pole"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5032,8 +5060,8 @@
 msgstr "Autoriõigus © 2004–2010: Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5123,17 +5151,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Vali kokkuvõttepluginad, mida näidata kokkuvõtte leheküljel."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontacti kokkuvõte"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c) 2004: Tobias Koenig"
@@ -5179,28 +5207,28 @@
 msgid "All"
 msgstr "Kõik"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontacti kokkuvõte"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontacti kokkuvõttevaade"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 2003-2016 The Kontact developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2016: Kontacti arendajad"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5227,7 +5255,7 @@
 msgid "&Reply"
 msgstr "&Vasta"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Vasta..."
@@ -5237,12 +5265,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Vasta &autorile..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Vasta &kõigile..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Vasta &postiloendisse..."
@@ -5273,7 +5301,7 @@
 msgid "&Edit As New"
 msgstr "&Muuda kirja"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5468,113 +5496,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Otsing nurjus. Leiti vigu: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Kirjadest otsimine"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "Ot&si"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Kirja sees..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "K&aasatud failina..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "&Salvesta kaasatud failid..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Puhasta valik"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Hüppa algkausta"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 sobivus"
 msgstr[1] "%1 sobivust"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Viimane otsing"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Sa ei ole valinud sobivat kausta."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Unustasid kogu valida."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Unustasid tingimuse määrata."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Kõik valitud kaustad on tühjad või indekseerimata."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Unustasid lisada tingimusi."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Sisaldab-tingimust ei saa kasutada, kui märkide arv on alla nelja."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Otsimine..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Otsing ei andnud tulemusi. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Otsing nurjus."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Otsing on lõpetatud."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Otsing on peatatud."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5584,21 +5612,21 @@
 "Otsingukausta nime muutmisega tekkis probleem. Tavaliselt peitub põhjus "
 "selles, et sama nimega otsingukaust on juba olemas. Tagastati viga \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Kopeeri kiri"
 msgstr[1] "Kopeeri %1 kirja"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Lõika kiri"
 msgstr[1] "Lõika %1 kirja"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Indekseerimise oleku kontrollimine..."
@@ -5733,7 +5761,7 @@
 "sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5741,7 +5769,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5751,26 +5779,26 @@
 "mitte."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Kiirotsingu sisendrea näitamine"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Vaikimisi edastatakse kirja sees."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Hoiatus, kui saajate arv on suurem kui:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5781,19 +5809,19 @@
 "enne kirja saatmist kinnitust. Hoiatuse näitamist saab ka välja lülitada."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Õigekirja kontroll enne saatmist"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "&Vastuvõtu ja lugemise kinnitus saadetakse automaatselt"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5809,13 +5837,13 @@
 "p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Automaatsalvestuse intervall:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5827,151 +5855,151 @@
 "automaatset salvestamist ei kasutata."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Tekstijuppide haldamise ja lisamise paneeli näitamine koostajas."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Märkimise korral salvestatakse saadetud kirjad krüptitud kujul"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Kõigi viimati kasutatud URL-ide nimekiri"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Kõigi viimati kasutatud kodeeringute nimekiri"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Krüptopealdise indikaatori näitamine"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Saatmise vaikimisi kiirklahvi valideerimine"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Identiteedidialoogi suurus (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Otsinguakna laius (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Otsinguakna kõrgus (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "KMaili seadistustedialoogi laius (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "KMaili seadistustedialoogi kõrgus (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Kirja eelvaatluse paneel"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Kirja eelvaatluse paneeli ei näidata"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Kirja eelvaatluse paneel allpool kirjade nimekirja"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Kirja eelvaatluse paneel kirjade nimekirja kõrval"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Kaustade nimekiri"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Pikk kaustade nimekiri"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Lühike kaustade nimekiri"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Uue kirja kirjamall"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Vastuse kirjamall"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Kõigile vastamise kirjamall"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Edasisaatmise kirjamall"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Tsitaadimärgid"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Reegli näitamisel kasutatava reegli määramine"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5980,7 +6008,7 @@
 "Otsingudialoogi koguvälja laiuse määramine (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5989,7 +6017,7 @@
 "Otsingudialoogi teemavälja laiuse määramine (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5998,7 +6026,7 @@
 "Otsingudialoogi saatjavälja laiuse määramine (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6007,7 +6035,7 @@
 "Otsingudialoogi saajavälja laiuse määramine (ainult sisemiseks kasutamiseks)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6017,7 +6045,7 @@
 "kasutamiseks)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6283,10 +6311,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6652,10 +6717,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Kontrolli posti"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7272,6 +7336,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Kõigi \"Rohkem ei pärita\" hoiatuste taaslubamine"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7329,6 +7403,14 @@
 msgid "Zoom: %1%"
 msgstr "Suurendus"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Tekstijupid"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Kontrolli posti"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Kausta nimi ja suurus kvoodile lähenemisel"
 
@@ -9953,10 +10035,6 @@
 #~ "<warning>Eemaldamist ei saa tagasi võtta.</warning>"
 
 #~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Kas tõesti eemaldada see grupp \"%1\"?"
-
-#~ msgctxt "@info"
 #~ msgid ""
 #~ "Do you really want to remove snippet \"%1\"?<nl/><warning>There is no way "
 #~ "to undo the removal.</warning>"
@@ -10971,9 +11049,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Määramine, kas konto kasutab vaikeidentiteeti"
 
-#~ msgid "Identity account"
-#~ msgstr "Identiteedi konto"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "RID postkasti asukoht muutuste jälgimiseks"
 
diff -Nru kmail-19.04.3/po/et/ktnef.po kmail-19.12.3/po/et/ktnef.po
--- kmail-19.04.3/po/et/ktnef.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/et/ktnef.po	2020-03-03 00:33:59.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-12-09 21:38+0200\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
diff -Nru kmail-19.04.3/po/eu/kmail.po kmail-19.12.3/po/eu/kmail.po
--- kmail-19.04.3/po/eu/kmail.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/eu/kmail.po	2020-03-03 00:34:00.000000000 +0000
@@ -1,94 +1,94 @@
-# translation of kmail.po to Euskara/Basque (eu).
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010, 2011, Free Software Foundation, Inc.
+# Translation of kmail.po to Euskara/Basque (eu).
+# Copyright (C) 2003-2011, Free Software Foundation, Inc.
+# Copyright (C) 2012-2019, This file is copyright:
+# This file is distributed under the same license as the kmail package.
+# KDE euskaratzeko proiektuaren arduraduna <xalba@euskalnet.net>.
 #
-# Marcos  <marcos@euskalgnu.org>, 2003, 2004, 2005.
+# Translators:
+# Marcos  <marcos@euskalgnu.org>, 2003, 2004, 2005, 2006.
 # Ion Gaztañaga <igaztanaga@gmail.com>, 2005.
-# Marcos <marcos@euskalgnu.org>, 2005.
-# marcos <marcos@euskalgnu.org>, 2006.
 # Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2007.
-# Iñigo Salvador Azurmendi <xalba@euskalnet.net>, 2010, 2011.
+# Iñigo Salvador Azurmendi <xalba@euskalnet.net>, 2010, 2011, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2011-11-11 23:04+0100\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-12-14 10:25+0100\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
-"Language-Team: Basque <itzulpena@euskalgnu.org>\n"
+"Language-Team: Basque <kde-i18n-eu@kde.org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 19.12.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
-msgstr "Marcos,Ion Gaztañaga,Iñaki Larrañaga Murgoitio"
+msgstr ""
+"Marcos,Ion Gaztañaga,Iñaki Larrañaga Murgoitio,Iñigo Salvador Azurmendi"
 
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
-msgstr "marcos@euskalgnu.org,igaztanaga@gmail.com,dooteo@euskalgnu.org"
+msgstr ""
+"marcos@euskalgnu.org,igaztanaga@gmail.com,dooteo@euskalgnu.org,"
+"xalba@euskalnet.net"
 
 #: about/introduction_kmail.html:5
-#, fuzzy, kde-format
-#| msgid "Welcome to the KMail Anti-Spam Wizard"
+#, kde-format
 msgctxt "%1 is version"
 msgid "Welcome to KMail %1"
-msgstr "Ongi etorri KMail baztergarrien morroira"
+msgstr "Ongi etorri KMail %1 bertsiora"
 
 #: about/introduction_kmail.html:7
 msgid ""
 "KMail is the email client by KDE. It is designed to be fully compatible with "
 "Internet mailing standards including IMAP, POP3 and SMTP."
 msgstr ""
+"KMail KDE komunitateak sortutako e-posta bezeroa da. Interneteko posta "
+"estandarrekin erabat bateragarria izateko diseinatua dago tartean IMAP, POP3 "
+"eta SMTP."
 
 #: about/introduction_kmail.html:10
 msgid ""
 "KMail has many powerful features that are described in the <a href='help:/"
 "kmail2/index.html'>documentation</a>."
 msgstr ""
+"KMail-ek <a href='help:/kmail2/index.html'>dokumentazioan</a> deskribatzen "
+"diren eginbide ahaltsu ugari ditu."
 
 #: about/introduction_kmail.html:16
 msgid "Important changes since last version:"
-msgstr ""
+msgstr "Azken bertsiotik dauden aldaketa garrantzitsuak:"
 
 #: about/introduction_kmail.html:25
 msgid "Some of the new features in this release of KMail include:"
-msgstr ""
+msgstr "KMail-en bertsio honetako eginbide berrien arteko batzuk dira:"
 
 #: about/introduction_kmail.html:34
-#, fuzzy
-#| msgid ""
-#| "<p>Please take a moment to fill in the KMail configuration panel at "
-#| "Settings-&gt;Configure KMail.\n"
-#| "You need to create at least a default identity and an incoming as well as "
-#| "outgoing mail account.</p>\n"
 msgid ""
 "Please take a moment to fill in the KMail configuration panel at Settings-"
 ">Configure KMail. You need to create at least a default identity and "
 "incoming as well as outgoing mail account."
 msgstr ""
-"<p>Bete ezazu KMAil-en konfigurazio-panela Ezarpenak-&gt;Konfiguratu KMail "
-"aukeran.\n"
-"Gutxienez identitate lehenetsi bat behar da, sarrerako eta irteerako posta "
-"kontu batekin.</p>\n"
+"Har ezazu KMail konfiguratzeko panela betetzeko une bat, «Ezarpenak -> "
+"Konfiguratu KMail» menuan. Gutxienez lehenetsitako identitate bat eta "
+"sarrerako zein irteerako posta kontuak sortu behar dituzu."
 
 #: about/introduction_kmail.html:38
 msgid "We hope that you will enjoy KMail."
-msgstr ""
+msgstr "KMail atsegin izango duzula espero dugu."
 
 #: about/introduction_kmail.html:39
 msgid "Thank you,"
-msgstr ""
+msgstr "Eskerrik asko,"
 
 #: about/introduction_kmail.html:40
-#, fuzzy
-#| msgid "KDE Email Client"
 msgid "The KMail Team"
-msgstr "KDEren e-posta bezeroa"
+msgstr "KMail taldea"
 
 #: aboutdata.cpp:52
 #, kde-format
@@ -126,21 +126,19 @@
 msgstr "Dokumentazioa"
 
 #: aboutdata.cpp:110
-#, fuzzy, kde-format
-#| msgid "system tray notification"
+#, kde-format
 msgid "System tray notification"
-msgstr "Sistema-erretiluaren jakinarazpena"
+msgstr "Sistemaren erretiluko jakinarazpena"
 
 #: aboutdata.cpp:142
 #, kde-format
 msgid "PGP 6 support and further enhancements of the encryption support"
-msgstr "PGP 6 euskarria eta zifraketa euskarriaren hobekuntzak"
+msgstr "PGP 6 euskarria eta zifratze euskarriaren hobekuntzak"
 
 #: aboutdata.cpp:162
-#, fuzzy, kde-format
-#| msgid "Original encryption support<br/>PGP 2 and PGP 5 support"
+#, kde-format
 msgid "Original encryption support PGP 2 and PGP 5 support"
-msgstr "Jatorrizko zifraketa euskarria<br/>PGP 2 eta PGP 5-en euskarria"
+msgstr "Jatorrizko zifratze euskarria PGP 2 eta PGP 5en euskarria"
 
 #: aboutdata.cpp:166
 #, kde-format
@@ -150,7 +148,7 @@
 #: aboutdata.cpp:222
 #, kde-format
 msgid "New message list and new folder tree"
-msgstr "Mezu zerrenda berria eta direktorio zuhaitz berria"
+msgstr "Mezu-zerrenda berria eta direktorio-zuhaitz berria"
 
 #: aboutdata.cpp:283
 #, kde-format
@@ -175,29 +173,26 @@
 #: aboutdata.cpp:327
 #, kde-format
 msgid "Improved HTML support"
-msgstr "HTML-ren euskarri hobetua"
+msgstr "HTML euskarri hobetua"
 
 #: aboutdata.cpp:330
-#, fuzzy, kde-format
-#| msgid "beta testing of PGP 6 support"
+#, kde-format
 msgid "Beta testing of PGP 6 support"
-msgstr "PGP6 euskarriaren Beta probak"
+msgstr "PGP 6 euskarriaren Beta probak"
 
 #: aboutdata.cpp:339
-#, fuzzy, kde-format
-#| msgid "timestamp for 'Transmission completed' status messages"
+#, kde-format
 msgid "Timestamp for 'Transmission completed' status messages"
-msgstr "\"Transmisioa osatuta\" egoerako mezuen denbora-zigilua"
+msgstr "\"Transmisioa osatuta\" egoera mezuen denbora-zigilua"
 
 #: aboutdata.cpp:347
-#, fuzzy, kde-format
-#| msgid "multiple encryption keys per address"
+#, kde-format
 msgid "Multiple encryption keys per address"
-msgstr "Hainbat zifratzeko gako helbide bakoitzeko"
+msgstr "Helbideko zifratze gako aniztunak"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -205,31 +200,28 @@
 #: aboutdata.cpp:363
 #, kde-format
 msgid "KDE Email Client"
-msgstr "KDEren e-posta bezeroa"
+msgstr "KDEko e-posta bezeroa"
 
 #: aboutdata.cpp:365
-#, fuzzy, kde-format
-#| msgid "Copyright © 1997–2011, KMail authors"
+#, kde-format
 msgid "Copyright © 1997–2019, KMail authors"
-msgstr "Copyright © 1997–2011, KMail egileak"
+msgstr "Copyright © 1997–2019, KMail egileak"
 
 #: collectionpage/collectionmailinglistpage.cpp:51
-#, fuzzy, kde-format
-#| msgid "Reply to Mailing-&List..."
+#, kde-format
 msgctxt "@title:tab Mailing list settings for a folder."
 msgid "Mailing List"
-msgstr "Erantzun po&sta-zerrendari..."
+msgstr "Posta-zerrenda"
 
 #: collectionpage/collectionmailinglistpage.cpp:78
-#, fuzzy, kde-format
-#| msgid "&Folder holds a mailing list"
+#, kde-format
 msgid "Folder holds a mailing list"
-msgstr "&Karpetak posta-zerrenda bat du"
+msgstr "Karpetak posta-zerrenda bat du"
 
 #: collectionpage/collectionmailinglistpage.cpp:86
 #, kde-format
 msgid "Detect Automatically"
-msgstr "Detektatu automatikoki"
+msgstr "Hauteman automatikoki"
 
 #: collectionpage/collectionmailinglistpage.cpp:92
 #, kde-format
@@ -247,10 +239,9 @@
 msgstr "Arakatzailea"
 
 #: collectionpage/collectionmailinglistpage.cpp:108
-#, fuzzy, kde-format
-#| msgid "&Address type:"
+#, kde-format
 msgid "Address type:"
-msgstr "&Helbide-mota:"
+msgstr "Helbide-mota:"
 
 #: collectionpage/collectionmailinglistpage.cpp:117
 #, kde-format
@@ -260,95 +251,83 @@
 #: collectionpage/collectionmailinglistpage.cpp:134
 #, kde-format
 msgid "Post to List"
-msgstr "Bidali mezua zerrendara"
+msgstr "Postaz bidali zerrendara"
 
 #: collectionpage/collectionmailinglistpage.cpp:134 messageactions.cpp:464
 #, kde-format
 msgid "Subscribe to List"
-msgstr "Harpidetu posta-zerrenda honetan"
+msgstr "Harpidetu zerrendara"
 
 #: collectionpage/collectionmailinglistpage.cpp:134
-#, fuzzy, kde-format
-#| msgid "Unsubscribe from List"
+#, kde-format
 msgid "Unsubscribe From List"
-msgstr "Kendu harpidetza zerrendatik"
+msgstr "Eten zerrendako harpidetza"
 
 #: collectionpage/collectionmailinglistpage.cpp:134
 #, kde-format
 msgid "List Archives"
-msgstr "Zerrendaren artxiboak"
+msgstr "Zerrendako artxiboak"
 
 #: collectionpage/collectionmailinglistpage.cpp:134
 #, kde-format
 msgid "List Help"
-msgstr "Zerrendaren laguntza"
+msgstr "Zerrendako laguntza"
 
 #: collectionpage/collectionmailinglistpage.cpp:151
 #, kde-format
 msgid "Not available"
-msgstr "Ez dago eskuragarri"
+msgstr "Ez dago erabilgarri"
 
 #: collectionpage/collectionmailinglistpage.cpp:199
 #: collectionpage/collectionmailinglistpage.cpp:235
 #, kde-format
 msgid "Not available."
-msgstr "Ez dago eskuragarri."
+msgstr "Ez dago erabilgarri."
 
 #: collectionpage/collectionmailinglistpage.cpp:228
-#, fuzzy, kde-format
-#| msgid ""
-#| "KMail was unable to detect a mailing list in this folder. Please fill the "
-#| "addresses by hand."
+#, kde-format
 msgid "KMail was unable to detect any mailing list in this folder."
-msgstr ""
-"KMail-ek ezin izan du karpetarik detektatu posta-zerrendan. Bete helbideak "
-"eskuz."
+msgstr "KMail ez da izan karpeta honetan posta-zerrendarik hautemateko gai."
 
 #: collectionpage/collectionmailinglistpage.cpp:231
-#, fuzzy, kde-format
-#| msgid ""
-#| "KMail was unable to detect a mailing list in this folder. Please fill the "
-#| "addresses by hand."
+#, kde-format
 msgid ""
 "KMail was unable to fully detect a mailing list in this folder. Please fill "
 "in the addresses by hand."
 msgstr ""
-"KMail-ek ezin izan du karpetarik detektatu posta-zerrendan. Bete helbideak "
-"eskuz."
+"KMail ez da izan karpeta honetan posta-zerrenda bat osorik hautemateko gai. "
+"Bete helbideak eskuz."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kuota"
 
-#: collectionpage/collectionquotawidget.cpp:47
-#, fuzzy, kde-format
-#| msgid "&Message"
+#: collectionpage/collectionquotawidget.cpp:46
+#, kde-format
 msgid "Usage:"
-msgstr "&Mezua"
+msgstr "Erabilera:"
 
-#: collectionpage/collectionquotawidget.cpp:54
-#, fuzzy, kde-format
-#| msgid "Status: "
+#: collectionpage/collectionquotawidget.cpp:53
+#, kde-format
 msgid "Status:"
-msgstr "Egoera: "
+msgstr "Egoera:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
-msgstr ""
+msgstr "% %p beteta"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
-msgstr ""
+msgstr "%1 / %2 erabilia"
 
 #: collectionpage/collectionshortcutpage.cpp:39
-#, fuzzy, kde-format
-#| msgid "Shortcut:"
+#, kde-format
 msgctxt "@title:tab Shortcut settings for a folder."
 msgid "Shortcut"
-msgstr "Lasterbidea:"
+msgstr "Lasterbidea"
 
 #: collectionpage/collectionshortcutpage.cpp:53
 #, kde-format
@@ -357,12 +336,12 @@
 "folder, click the button below and then press the key(s) you wish to "
 "associate with this folder.</qt>"
 msgstr ""
-"<qt>Uneko karpeta hautatzen duten tekla edo tekla-konbinazio bat hautatzeko, "
-"egin klik beheko botoian eta sakatu karpetarekin lotu nahi d(it)uzun "
-"tekla(k).</qt>"
+"<qt>Uneko karpeta aukeratzen duen tekla bat edo tekla-konbinazio bat "
+"hautatzeko, egin klik beheko botoian eta sakatu karpetarekin elkartu nahi "
+"d(it)uzun tekla(k).</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Txantiloiak"
@@ -370,250 +349,249 @@
 #: collectionpage/collectiontemplatespage.cpp:60
 #, kde-format
 msgid "&Use custom message templates in this folder"
-msgstr "&Erabili mezu pertsonalizatuen txantiloiak karpeta honetan"
+msgstr "&Erabili norberak finkatutako mezu-txantiloiak karpeta honetan"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopiatu txantiloi orokorrak"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Ikusi"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
-msgstr "Erabili &ikono pertsonalizatuak"
+msgstr "Erabili norberak finkatutako &ikonoak"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "O&hikoa:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
-msgstr "Irakurri &gabea:"
+msgstr "Irakurt&zeke:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Erakutsi bidaltzailea/hartzailea zutabea mezuen zerrendan"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Erakut&si zutabea:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Hartzailea"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
-msgstr "Mezu zerrenda"
+msgstr "Mezu-zerrenda"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
-msgstr "Erabili lehenetsitako multzokatzea"
+msgstr "Erabili multzokatze lehenetsia"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Multzokatzea"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
-msgstr "Erabili lehenetsitako gaia"
+msgstr "Erabili gai lehenetsia"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Gaia"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
-#, fuzzy, kde-format
-#| msgid "Insecure Message Format"
+#, kde-format
 msgid "Message Default Format"
-msgstr "Mezu-formatu ez-segurua"
+msgstr "Mezuaren formatu lehenetsia"
 
-#: collectionpage/collectionviewpage.cpp:182
-#, fuzzy, kde-format
-#| msgid "Prefer H&TML to plain text"
+#: collectionpage/collectionviewpage.cpp:181
+#, kde-format
 msgid "Prefer HTML to text"
-msgstr "H&TML hobetsi testu soilaren ordez"
+msgstr "Hobetsi HTML testuarekiko"
 
-#: collectionpage/collectionviewpage.cpp:184
-#, fuzzy, kde-format
-#| msgid "Prefer &HTML to Plain Text"
+#: collectionpage/collectionviewpage.cpp:183
+#, kde-format
 msgid "Prefer text to HTML"
-msgstr "HTM&L hobesten da"
+msgstr "Hobetsi testua HTML-rekiko"
 
-#: collectionpage/collectionviewpage.cpp:186
-#, fuzzy, kde-format
-#| msgid "Reset Font Settings"
+#: collectionpage/collectionviewpage.cpp:185
+#, kde-format
 msgid "Use Global Settings"
-msgstr "Garbitu letra-tipo ezarpenak"
+msgstr "Erabili ezarpen orokorrak"
 
 #: configuredialog/configagentdelegate.cpp:228
 #, kde-format
 msgid "Retrieval Options"
-msgstr "Berreskuratzeko aukerak"
+msgstr "Berreskuratze aukerak"
 
-#: configuredialog/configureaccountpage.cpp:68
-#, fuzzy, kde-format
-#| msgid "&Identity"
+#: configuredialog/configureaccountpage.cpp:69
+#, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
-msgstr "&Identitatea"
+msgstr "Identitateak"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
-msgstr "Jasotzen"
+msgstr "Jasotzea"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
-msgstr "Bidaltzen"
+msgstr "Bidaltzea"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
-msgstr ""
+msgstr "LDAP zerbitzaria"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Irteerako kontuak (gehitu bat bederen):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
-msgstr "Ohiko aukerak"
+msgstr "Aukera arruntak"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
-msgstr "Baieztatu bidali &aurretik"
+msgstr "Berretsi bidali &aurretik"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
-msgstr ""
+msgstr "Egiaztatu ortografia bidali aurretik"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
-msgstr "Inoiz ez automatikoki"
+msgstr "Inoiz ere ez automatikoki"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
-msgstr "Eskuz egindako posta egiaztapenetan"
+msgstr "Eskuz eragindako posta egiaztapenetan"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Posta egiaztapen guztietan"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Bidali orain"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Bidali geroago"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Bidali irteerako ontziko &mezuak:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Bidaltzeko metodo &lehenetsia:"
 
-#: configuredialog/configureaccountpage.cpp:220
-#, fuzzy, kde-format
-#| msgid "Add Account"
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Gaitu «Desegin bidaltzea»"
+
+#: configuredialog/configureaccountpage.cpp:241
+#, kde-format
 msgid "Add Mail Account..."
-msgstr "Gehitu kontua"
+msgstr "Gehitu posta kontua..."
 
-#: configuredialog/configureaccountpage.cpp:221
-#, fuzzy, kde-format
-#| msgid "Add Account"
+#: configuredialog/configureaccountpage.cpp:242
+#, kde-format
 msgid "Custom Account..."
-msgstr "Gehitu kontua"
+msgstr "Norberak finkatutako kontua..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
-#, fuzzy, kde-format
-#| msgid "Could not start certificate manager. Please check your installation."
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
+#, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
-msgstr "Ezin izan da ziurtagiri-kudeatzailea abiatu. Egiaztatu instalazioa."
+msgstr ""
+"Ezin da abiatu kontuen morroia. Ziurta ezazu «AccountWizard» ondo "
+"instalatuta dagoela."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
-msgstr "Ezin da kontuaren morroia abiarazi"
+msgstr "Ezin da kontuen morroia abiarazi"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Sartu eskuz egindako posta egiaztapenetan"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Aldatu lerroz-kanpoko egoerara KMail itzaltzen denean"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Egiaztatu posta abiatzerakoan"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -671,7 +649,7 @@
 msgid "Fixed Width Font"
 msgstr "Zabalera finkodun letra-tipoa"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Konposatzailea"
@@ -1015,44 +993,44 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Orokorra"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, fuzzy, kde-format
 msgid "Standard Templates"
 msgstr "&Gorde zirriborro gisa"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, fuzzy, kde-format
 #| msgid "Reply Without &Quote..."
 msgid "Custom Templates"
 msgstr "Erantzun &aipamenik gabe..."
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, fuzzy, kde-format
 #| msgid "Subject"
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Gaia"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, fuzzy, kde-format
 #| msgid "Cha&rset"
 msgid "Charset"
 msgstr "&Karaktere-multzoa:"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, fuzzy, kde-format
 #| msgid "H&eaders"
 msgid "Headers"
 msgstr "&Goiburua"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "A&ttachments"
@@ -1060,56 +1038,56 @@
 msgid "Attachments"
 msgstr "Eran&skinak"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Sinadura"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 #| msgid "Use smaller font for quoted text"
 msgid "Insert the signature above any quoted text"
 msgstr "Erabili letra-tipo txikiagoa aipamenetan"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "F&ormatua:"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1117,7 +1095,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1125,17 +1103,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1143,7 +1121,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1151,7 +1129,7 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, fuzzy, kde-format
 #| msgctxt "View->attachments->"
 #| msgid "&Inline"
@@ -1159,31 +1137,31 @@
 msgid "Inline"
 msgstr "&Barnean"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "As Attachment"
 msgstr "Eranskina du"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Default forwarding type:"
 msgstr "Domeinu le&henetsia:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "Additional Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Hartzaile gehiago"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1191,18 +1169,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Hartzaileen editoreko lerro-kopuru maximoa."
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1213,52 +1191,52 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Ez autogorde"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "Azken helbideak"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order"
 msgid "Configure Completion..."
 msgstr "Konfiguratu osatze-ordena"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Ez autogorde"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Ez autogorde"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1267,19 +1245,19 @@
 msgstr[0] " min"
 msgstr[1] " min"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "Automatikoki eskatu &mezu-eskuratzeen jakinarazpenak"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Erant&zunen gaiaren aurrizkia"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1288,59 +1266,59 @@
 "Ezagutu ondorengo aurrizkien edozein sekuentzia\n"
 "(sarrerak  maius./minus. nabarmentzen ez duten adierazpen erregularrak dira):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Gehitu..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Kendu"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Aldatu..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Sartu erantzunaren aurrizki berria:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Birbida&litako mezuen gaiaren aurrizkia"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Erantsi..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Kendu"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Aldatu..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Sartu birbidalitako mezuen aurrizki berria:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1350,94 +1328,94 @@
 "beharrezko karaktere guztiak dituen karaktere-multzo baten bila."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Aldatu..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Sartu karaktere-multzoa:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Mantendu jatorrizko karaktere-multzoa erantzutean edo birbidaltzean "
 "(posiblea bada)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Karaktere-multzo hau ez da onartzen."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Erabili mezu-ID atzizki pertsonalizatua"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Mezu-&ID atzizki pertsonalizatua:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Zehaztu mime goiburuen eremu pertsonalizatuak:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, fuzzy, kde-format
 #| msgid "Name"
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Izena"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, fuzzy, kde-format
 #| msgid "Value"
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Balioa"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, fuzzy, kde-format
 #| msgid "Ne&w"
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "Berr&ia"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, fuzzy, kde-format
 #| msgid "&Name:"
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Izena:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Balioa:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid header"
 msgstr "&Gaitu sinadura"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-ekin bateragarria den eranskin izendapena"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1446,41 +1424,41 @@
 "Aktibatu aukera hau eranskinen izenek dituzten ingelesekoak ez diren "
 "karaktereak Outlook(tm)-ek uler ditzan"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Gaitu falta diren eranskinen detekzioa"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Hartu honako gako-hitzetariko bat fitxategi bat eransteko:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Sartu gako-hitz berria:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Eranskina du"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, fuzzy, kde-format
 #| msgid " MB"
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " MB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "Egunkari-tamainaren muga:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1574,7 +1552,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Konposatzailea"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1694,7 +1672,7 @@
 msgid "Archive Folder"
 msgstr "Artxibo karpeta"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgctxt "Start of the filename for a mail archive file"
 #| msgid "Archive"
@@ -1763,7 +1741,7 @@
 msgid "Notification"
 msgstr "Jakinarazpena"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "Attachment: %1"
 msgid "1 attachment (%2)"
@@ -1771,13 +1749,13 @@
 msgstr[0] "Eranskina: %1"
 msgstr[1] "Eranskina: %1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Hide attachment list"
 msgstr "Gorde eranskina honela"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Show attachment list"
@@ -1795,474 +1773,474 @@
 msgid "Encoding"
 msgstr "Kodeketa"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 #| msgid "Set subject of message"
 msgid "Set a subject for this message"
 msgstr " Ezarri mezuaren gaia"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitatea:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Hiztegia:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "&Bidalitako mezuen karpeta:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Posta garraioa:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Nork:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, fuzzy, kde-format
 #| msgid "S&ubject:"
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Gaia:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Bidali posta"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Bidali posta honela"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, fuzzy, kde-format
 msgid "Send"
 msgstr "&Bidali"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Bidali &geroago"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Bidali &geroago honela"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, fuzzy, kde-format
 #| msgid "Queued"
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Ilaran"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, fuzzy, kde-format
 msgid "Save as &Draft"
 msgstr "&Gorde zirriborro gisa"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "Bilatu karpeta lokal g&uztietan"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, fuzzy, kde-format
 msgid "Save as &Template"
 msgstr "&Gorde zirriborro gisa"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 msgid "Save email in Template folder"
 msgstr "&Gorde zirriborro gisa"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "Gorde fitxategian"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgid "&Insert Text File..."
 msgstr "&Txertatu fitxategia..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, fuzzy, kde-format
 #| msgid "&Insert File Recent"
 msgid "&Insert Recent Text File"
 msgstr "&Txertatu azken fitxategia"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Helbide-liburua"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "Open Address Book"
 msgstr "Ireki helbide-liburuan"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Mezu-prestatzaile berria"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Hautatu &hartzaileak..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Gorde &banaketa-zerrenda..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Itsatsi erans&kin bezala"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Garbitu zuriuneak"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Erabili zabalera &finkoko letra-tipoak"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, fuzzy, kde-format
 #| msgid "&Urgent"
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Larria"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Eskatu jakinarazpena eskuratzean"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Eskatu jakinarazpena eskuratzean"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Itzulbiratu"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Ortografia zuzentzaile a&utomatikoa"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Rich Text Editing"
 msgstr "Saio-hasieraren informazioa"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Eremu &guztiak"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitatea"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Hiztegia"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Bidalitako mezuen karpeta"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Posta garraioa"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Nondik"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, fuzzy, kde-format
 #| msgid "S&ubject"
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Gaia"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Erantsi &sinadura"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, fuzzy, kde-format
 #| msgid "Append S&ignature"
 msgid "Pr&epend Signature"
 msgstr "Erantsi &sinadura"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Ortografia egiaztatzailea..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Ortografia zuzentzailea"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Enkriptatu mezua"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Enkriptatu"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Sinatu mezua"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Sinatu"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "En&kriptatutako mezuaren formatua"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Aurkitu mezuak..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, fuzzy, kde-format
 msgid "Configure KMail..."
 msgstr "&Konfiguratu KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, fuzzy, kde-format
 #| msgid " Line: %1 "
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Lerroa: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Zutabea: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Zuzentzailea: aktibatuta"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Zuzentzailea: desaktibatua"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, fuzzy, kde-format
 msgid "Re&save as Template"
 msgstr "&Gorde zirriborro gisa"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Gorde zirriborro gisa"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, fuzzy, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "Gorde mezua zirriborroen karpetan. Geroago editatu eta bidal daiteke."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr "Gorde mezua zirriborroen karpetan. Geroago editatu eta bidal daiteke."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Mezua gerorako gorde edo baztertu nahi duzu?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Itxi mezu-prestatzailea"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Autosave Message Failed"
 msgstr "Huts egin du automatikoki gordetzean"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Sending Message Failed"
 msgstr "Huts egin du automatikoki gordetzean"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "&Txertatu azken fitxategia"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add as &Attachment"
 msgstr "Gehitu eranskin gisa"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Eranskinaren izena:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid Attachment Name"
 msgstr "&Gaitu sinadura"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Enkriptatutako mezua"
 msgstr[1] "Enkriptatutako mezua"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add File as &Attachment"
@@ -2270,18 +2248,18 @@
 msgstr[0] "Gehitu eranskin gisa"
 msgstr[1] "Gehitu eranskin gisa"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, fuzzy, kde-format
 #| msgid "Paste as Attac&hment"
 msgid "Insert clipboard text as attachment"
 msgstr "Itsatsi erans&kin bezala"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "Izengabea"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2293,12 +2271,12 @@
 "identitateak ez du (OpenPGP edo S/MIME) enkriptazio-gakorik definitzen.</"
 "p><p>Hautatu identitatearen konfigurazioaren erabiltzeko gakoak.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Definitu gabeko enkriptazio-gakoa"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2309,12 +2287,12 @@
 "definitu behar duzu.</p><p>Hautatu identitatearen konfigurazioan erabiltzeko "
 "gakoa.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Definitu gabeko sinatzeko gakoa"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2325,7 +2303,7 @@
 "guztietan zure helbide elektronikoa ere ezarri beharko zenuke, mezu "
 "bakoitzean sartu ez dezazun."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2335,37 +2313,37 @@
 "as BCC."
 msgstr "Gutxienez hartzaile bat eman behar duzu Nori, CC edo BCC eremuan."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, fuzzy, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Ez duzu gairik sartu. Bidali mezua hala ere?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, fuzzy, kde-format
 msgid "No To: specified"
 msgstr "Ez da izenik zehaztu"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Ez duzu gairik sartu. Bidali mezua hala ere?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Ez da gairik zehaztu"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&Bidali dagoen bezala"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Zehaztu gaia"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2375,91 +2353,91 @@
 "draft."
 msgstr "Gutxienez hartzaile bat eman behar duzu Nori, CC edo BCC eremuan."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Posta bidaltzeko zorian..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Bidali berrespena"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Bidali orain"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, fuzzy, kde-format
 #| msgid "No recipients"
 msgid "Too many recipients"
 msgstr "Hartzailerik ez"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Bidali dagoen bezala"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, fuzzy, kde-format
 #| msgid "Additional Recipients"
 msgid "&Edit Recipients"
 msgstr "Hartzaile gehiago"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Lose Formatting"
 msgstr "Saio-hasieraren informazioa"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "Mezuak testu soil gisa"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2467,7 +2445,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2554,25 +2532,25 @@
 msgid "External editor was started."
 msgstr "Kanpoko editorea"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2603,11 +2581,6 @@
 msgid "Message will not be encrypted"
 msgstr "Gorde bidalitako mezuak en&kriptatuta"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr ""
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2656,30 +2629,30 @@
 msgid "Cannot move messages."
 msgstr "Eraman mezuak karpetara"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Huts egin du karpeta sortzean"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "Ez da karpetarik hautatu"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Huts egin du karpeta sortzean"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 msgid "Unable to return list of folders."
 msgstr "Mezu zahar bat %2 karpetatik kenduta."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Message was signed by %1."
 msgid "Messages archived"
@@ -2724,51 +2697,51 @@
 msgid "&Existing identities:"
 msgstr "&Dauden identitateak:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Errorea %1 karpeta berrizendatzen saiatzean"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Sartu gako-hitz berria:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Editatu identitatea"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Orokorra"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Zure izena:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2780,12 +2753,12 @@
 "p><p>Eremu hau hutsik uzten baduzu ez da zure benetako izena agertuko, "
 "helbide elektronikoa baizik.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Erak&undea:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2800,12 +2773,12 @@
 "luke, mezuaren goiburukoan azaltzea nahi izanez gero bederen.</p><p>Normala "
 "da hau utsik uztea.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Helbide elektronikoa:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Email address</h3><p>This field should have your full email "
@@ -2822,13 +2795,13 @@
 "osoa izan beharko luke.</p><p>Hau hutsik uzten baduzu, jendeak ezin izango "
 "dizu erantzun.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 #| msgid "&Email address:"
 msgid "Email a&liases:"
 msgstr "&Helbide elektronikoa:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2839,13 +2812,13 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, fuzzy, kde-format
 #| msgid "Cryptograph&y"
 msgid "Cryptography"
 msgstr "K&riptografia"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2866,12 +2839,12 @@
 "funtzio arruntetan eraginik izango.</p><p>Gakoei buruzko informazio gehiago "
 "honako gunean: <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP sindadura gakoa:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2895,12 +2868,12 @@
 "eraginik izango.</p><p>Gakoei buruzko informazio gehiago: <a>http://www."
 "gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP enkriptazio gakoa:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2913,12 +2886,12 @@
 "izango ditu postak S/MIME erabiliz digitalki sinatu. Ez du posta-funtzio "
 "arruntetan eraginik izango.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME sinadura ziurtagiria:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2932,43 +2905,43 @@
 "hutsik utz dezakezu, baina KMail-ek ezin izango ditu postak S/MIME erabiliz "
 "digitalki sinatu. Ez du posta-funtzio arruntetan eraginik izango.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME enkriptazio ziurtagiria:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred crypto message format:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Crypto mezuaren formatu hobetsia:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "&Automatikoki sinatu mezuak"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Automatikoki enkriptatu mezuak &ahal denean"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, fuzzy, kde-format
 #| msgid "Advanced"
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "E&rantzun-honi helbidea:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2986,13 +2959,13 @@
 "erantzutean taldearen helbidera bidaltzea.</p><p>Zalatzak badituzu, utzi hau "
 "hutsik.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "B&CC helbideak:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3017,12 +2990,12 @@
 "p><p>Erabili komak hainbat helbide idazteko BCCko eremuan.</p><p>Zalantzarik "
 "baduzu, utzi eremua hutsik.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "B&CC helbideak:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3039,61 +3012,61 @@
 "p><p>Erabili komak hainbat helbide idazteko BCCko eremuan.</p><p>Zalantzarik "
 "baduzu, utzi eremua hutsik.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Hizte&gia:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Bidalitako mezuen kar&peta:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Z&irriborroen karpeta:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, fuzzy, kde-format
 msgid "&Templates folder:"
 msgstr "&Zakarrontzi-karpeta:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 #| msgid "Configure Account"
 msgid "Outgoing Account:"
 msgstr "Konfiguratu kontua"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "Gehigu goiburua mezuan"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "Berrizendatu..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr ""
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Domeinu le&henetsia:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Domeinu le&henetsia:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3102,35 +3075,35 @@
 "<qt><p>Domeinu lehenetsia erabiliko da erabiltzaile izena bakarrik duten "
 "posta helbide elektronikoak osatzeko.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, fuzzy, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Erabili mezu-ID atzizki pertsonalizatua"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Sinadura"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, fuzzy, kde-format
 #| msgid "&Picture"
 msgid "Picture"
 msgstr "&Irudia"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Email Alias \"%1\""
 msgstr "Helbide elektroniko baliogabea"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Posta elektroniko helbide baliogabea"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3143,7 +3116,7 @@
 "Honek abisu-mezuak sor ditzake hartzailearen aldean sinadurak konfigurazio "
 "honekin egiaztatzean."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3152,7 +3125,7 @@
 "Konfiguratutako OpenPGP sinadura-gako batek ez du erabiltzailearen IDrik "
 "identitate honentzako (%1) konfiguratutako helbide elektronikoarekin."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3165,7 +3138,7 @@
 "Honek abisu-mezuak sor ditzake hartzailearen aldean sinadurak konfigurazio "
 "honekin egiaztatzean."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3174,22 +3147,22 @@
 "Konfiguratutako S/MIME sinadura-ziurtagiri batek ez du erabiltzailearen "
 "IDrik identitate honentzako (%1) konfiguratutako helbide elektronikoarekin."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Ez da helbide elektronikorik aurkitu gako/ziurtagirietan"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Sinadura-fitxategia ez da baliozkoa"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Editatu \"%1\" identitatea"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3201,7 +3174,7 @@
 "\"%1\" identitatearen zirriborroen karpeta pertsonalizatua ez da existitzen. "
 "Beraz zirriborroen karpeta lehenetsia erabiliko da."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Editatu..."
@@ -3237,6 +3210,20 @@
 msgid "We cannot delete vCard file."
 msgstr "Ezin izan da maildir karpetarekin sinkronizatu."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "<qt>Benetan <b>%1</b> exekutatu nahi duzu?</qt>"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Bidali berrespena"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3407,7 +3394,7 @@
 "Adibideak hemen dituzu: <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
 "\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3442,7 +3429,7 @@
 msgstr[0] "\"%1\" banaketa zerrenda hutsik dago, ezin da erabili."
 msgstr[1] "\"%1\" banaketa zerrenda hutsik dago, ezin da erabili."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Gehitu helbide-liburuan"
@@ -3453,24 +3440,24 @@
 msgid "Contact created successfully"
 msgstr "Mezuak ongi ezabatu dira."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Name of the attachment:"
 msgid "Failed to store contact"
 msgstr "Eranskinaren izena:"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Ziur zaude zakarrontziko karpeta hustu nahi duzula?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Archive Folder"
 msgid "Attach Folder"
@@ -3710,7 +3697,7 @@
 msgstr "&Karpeta"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3718,7 +3705,7 @@
 msgstr "A&plikatu iragazki guztiak"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3744,7 +3731,7 @@
 msgstr "Birb&idali"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&plikatu iragazkia"
@@ -3769,7 +3756,7 @@
 msgstr "&Bip"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, fuzzy, kde-format
 msgid "Main Toolbar"
 msgstr "HTML tresna-barra"
@@ -3825,46 +3812,46 @@
 msgid "The file does not contain a message."
 msgstr "Fitxategiak ez du mezurik."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "Fitxategiak mezu bat baino gehiago ditu. Lehenengo mezua erakutsiko da "
 "bakarrik."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 msgid "Send As Digest"
 msgstr "Bidali sinatu gabe?"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, fuzzy, kde-format
 msgid "Filtering messages"
 msgstr "Mezuak ezabatzen"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, fuzzy, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "%3/%2 mezuak %1(e)tik iragatzen"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Mezuak lekuz aldatzen"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Mezuak ezabatzen"
@@ -3893,29 +3880,29 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail lineaz kanpoko egoeran dago. Sareko lan guztiak geldituko dira"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Posta bidaltzeko zorian..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail lineako egoeran dago. Sareko lan guztiak jarraituko dira"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3923,52 +3910,52 @@
 "connection is detected"
 msgstr "KMail lineako egoeran dago. Sareko lan guztiak jarraituko dira"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "Unean KMail lineaz kanpoko moduan dago. Nola jarraitu nahi duzu?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Linean/Lineaz kanpo"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Linean lan egin"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Lineaz kanpo lan egin"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
 msgstr "KMail lineako egoeran dago. Sareko lan guztiak jarraituko dira"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "KMail lineaz kanpoko egoeran dago. Sareko lan guztiak geldituko dira"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Opening Autosave File Failed"
 msgstr "Huts egin du automatikoki gordetzean"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, fuzzy, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3976,7 +3963,7 @@
 msgstr[0] "Identitate hau garraio lehenetsia erabiltzeko aldatu da:"
 msgstr[1] "%1 identitate hauek garraio lehenetsia erabiltzeko aldatu dira:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, fuzzy, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3984,44 +3971,46 @@
 msgstr[0] "Identitate hau garraio lehenetsia erabiltzeko aldatu da:"
 msgstr[1] "%1 identitate hauek garraio lehenetsia erabiltzeko aldatu dira:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Mezuak bidaltzen"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, fuzzy, kde-format
 #| msgid "Initiating sender process..."
 msgid "Initiating sending process..."
 msgstr "Abiarazten bidaltzeko prozesua..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -4029,12 +4018,12 @@
 "properly installed."
 msgstr "Ezin izan da ziurtagiri kudeatzailea abiarazi; egiaztatu instalazioa."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail errorea"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4042,27 +4031,27 @@
 "properly installed."
 msgstr "Ezin izan da ziurtagiri-kudeatzailea abiatu. Egiaztatu instalazioa."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start import wizard"
 msgstr "Ezin da kontuaren morroia abiarazi"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "Ezin izan da ziurtagiri-kudeatzailea abiatu. Egiaztatu instalazioa."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Ezin da kontuaren morroia abiarazi"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4070,69 +4059,69 @@
 "properly installed."
 msgstr "Ezin izan da ziurtagiri-kudeatzailea abiatu. Egiaztatu instalazioa."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Ezin da kontuaren morroia abiarazi"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Ezin izan da ziurtagiri-kudeatzailea abiatu. Egiaztatu instalazioa."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Gairik ez"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, fuzzy, kde-format
 msgid "(no templates)"
 msgstr "&Ordeztu"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Karpeta honen iraungitzeko aukera ezarri gabe dago"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Ziur zaude <b>%1</b> karpeta iraungitzea nahi duzula?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Iraungitu karpeta"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Iraungitu"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Hustu zakarrontzia"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Bota zakarrontzira"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Ziur zaude zakarrontziko karpeta hustu nahi duzula?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4141,27 +4130,27 @@
 "<qt>Ziur zaude <b>%1</b> karpetako mezu guztiak zakarrontzira botatzea nahi "
 "dituzula?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Mezu guztiak zakarrontzira bota dira"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Ziur zaude mezu zahar guztiak iraungitzea nahi dituzula?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Iraungitu mezu zaharrak?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Iraungitu"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4171,17 +4160,17 @@
 "Kanpoko html erreferentziak kargatzean sistema arriskuan jar dezakezu "
 "\"baztergarrien\" aurrean."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Kargatu kanpoko erreferentziak"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, fuzzy, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4196,431 +4185,431 @@
 "<qt>Benetan ezabatu nahi dituzu hautatutako %1 mezuak?<br>Behin ezabatuta, "
 "ezin dira berreskuratu</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Ezabatu mezuak"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Ezabatu mezua"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Moving messages..."
 msgstr "Mezuak lekuz aldatzen"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Deleting messages..."
 msgstr "Mezuak ezabatzen"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, fuzzy, kde-format
 #| msgid "Messages deleted successfully."
 msgid "Messages deleted successfully."
 msgstr "Mezuak ongi ezabatu dira."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved successfully."
 msgstr "Mezuak lekuz ongi aldatu dira"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Huts egin du mezuak ezabatzean."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Mezuen ezabaketa bertan behera utzi da."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Huts egin du mezuak lekuz aldatzean."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Mezuen leku aldaketa bertan behera utzi da."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Eraman mezuak karpetara"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Copying messages..."
 msgstr "Mezuak lekuz aldatzen"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages copied successfully."
 msgstr "Mezuak lekuz ongi aldatu dira"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Copying messages failed."
 msgstr "Huts egin du mezuak lekuz aldatzean."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Copying messages canceled."
 msgstr "Mezuen leku aldaketa bertan behera utzi da."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, fuzzy, kde-format
 #| msgid "Copy Message to Folder"
 msgid "Copy Messages to Folder"
 msgstr "Kopiatu mezua karpeta honetan"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Moving messages to trash..."
 msgstr "Bota mezua zakarrontzira"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Deleting and moving messages to trash..."
 msgstr "Bota mezua zakarrontzira"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash successfully."
 msgstr "Mezuak lekuz ongi aldatu dira"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Mezuak lekuz ongi aldatu dira"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Moving messages to trash failed."
 msgstr "Huts egin du mezuak lekuz aldatzean."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Huts egin du mezuak lekuz aldatzean."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Moving messages to trash canceled."
 msgstr "Mezuen leku aldaketa bertan behera utzi da."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Mezuen leku aldaketa bertan behera utzi da."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Jauzi karpeta honetara"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Gorde &honela..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Iraungitu karpeta guztiak"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Begiratu mezurik dagoen"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail In"
 msgstr "&Begiratu mezurik dagoen"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail"
 msgstr "&Begiratu mezurik dagoen"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Bidali ilaratutako &mezuak"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, fuzzy, kde-format
 msgid "Online status (unknown)"
 msgstr "Lineako egoera (ezezaguna)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Bidali ilarako mezuak honela"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, fuzzy, kde-format
 #| msgid "Certificate Manager..."
 msgid "Certificate Manager"
 msgstr "Ziurtagiri kudeatzailea..."
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages..."
 msgid "&Import Messages..."
 msgstr "&Inportatu mezuak..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Araztu Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Iragazi &egunkari-ikustailea..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Editatu \"Bulegotik kanpo\"ko erantzunak..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "Konfiguratu &jakianazpenak..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Delayed Messages..."
 msgstr "Mezuak ezabatzen"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Aurkitu mezuak..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, fuzzy, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Ezabatuta"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "B&ota haria zakarrontzira"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Bota haria zakarrontzira"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Ezabatu &haria"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Aurkitu mezuak..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Hautatu mezu &guztiak"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, fuzzy, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Posta-zerrenden kudeaketa"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Esleitu lasterbidea..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Iraungitze-ezarpenak"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "&Archive Folder..."
 msgstr "Karpeta &berria..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Kargatu &kanpoko erreferentziak"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Message To..."
 msgstr "Mezu berria honi..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Move Message To..."
 msgstr "Mezu berria honi..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Mezu &berria..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, fuzzy, kde-format
 #| msgid "New"
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Berria"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, fuzzy, kde-format
 msgid "Message From &Template"
 msgstr "Zerbitzarian mezu berririk ez"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Mezu berria p&osta-zerrendara..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Sortu iragazkia"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Iragazi &gaian..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Iragazi &Nork-en..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Iragazi &Nori-n.."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Iragazi &Nori-n.."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Markatu &haria"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Markatu haria &irakurrita gisa"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Markatu hautatutako hariko mezu guztiak irakurrita gisa"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Markatu haria &irakurri gabe gisa"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Markatu hautatutako hariko mezu guztiak irakurri gabe gisa"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Markatu haria &garratzitsu gisa"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Kendu &garrantzitsuaren marka hariari"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, fuzzy, kde-format
 #| msgid "Mark Thread as &New"
 msgid "Mark Thread as &Action Item"
 msgstr "Markatu haria &berri gisa"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 #| msgid "Remove &Important Message Mark"
 msgid "Remove &Action Item Thread Mark"
 msgstr "Kendu &garratzitsuaren marka mezuari"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Ikusi haria"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ez ikusi egin hariari"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Gorde &eranskinak..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Decrypted To..."
 msgstr "Mezu berria honi..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "A&plikatu iragazki guztiak"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4628,13 +4617,13 @@
 msgid "&Expand Thread / Group"
 msgstr "&Zabaldu haria"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "Zabaldu uneko haria"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4642,124 +4631,124 @@
 msgid "&Collapse Thread / Group"
 msgstr "&Tolestu haria"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "Tolestu uneko haria"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Z&abaldu hari guztiak"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Zabaldu uneko karpetako hari guztiak"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "T&olestu hari guztiak"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Tolestu uneko karpetako hari guztiak"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Erakutsi mezua"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Hurrengo mezua"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Joan hurrengo mezura"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Hurrengo &irakurri gabeko mezua"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr ""
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Joan irakurri gabeko hurrengo mezura"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Aurreko mezua"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Joan aurreko mezura"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Aurreko irakurri &gabeko mezua"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, fuzzy, kde-format
 #| msgid "&Previous Card"
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "&Aurreko txartela"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Joan aurreko irakurri gabeko mezura"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Hurrengo irakurri gabeko &karpeta"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Joan irakurri gabeko mezuak dituen hurrengo karpetara"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Aurreko irakurri gabeko ka&rpeta"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Joan irakurri gabeko mezuak dituen aurreko karpetara"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Hurrengo irakurri gabeko &testua"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Joan hurrengo irakurri gabeko testura"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4768,240 +4757,246 @@
 "Korritu behera uneko mezua. Uneko mezuaren bukaera bada, joan irakurri "
 "gabeko hurrengo mezura."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Konfiguratu &iragazkiak..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Kudeatu &Sieve script-ak..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Gehitu kontua"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail sa&rrera"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Bistaratu KMail-en 'Ongi etorri' orria"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Konfiguratu &jakianazpenak..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Konfiguratu KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Iraungi..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "Add Favorite Folder..."
 msgstr "Karpeta &berria..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Serverside Subscription..."
 msgstr "Harpidetza..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "A&plikatu iragazki guztiak"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "&Konfiguratu KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "New AddressBook Contact..."
 msgstr "Ireki helbide-liburuan"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopiatu mezua karpeta honetan"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to Folder..."
 msgstr "Jauzi karpeta honetara"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Abortatu uneko eragiketa"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Fokua hurrengo karpetan"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Fokua aurreko karpetan"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Hautatu fokua duen karpeta"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "Fokua hurrengo karpetan"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "Fokua hurrengo karpetan"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Fokua hurrengo mezuan"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Fokua aurreko mezuan"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "Hautatu mezu &guztiak"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "Hautatu mezu &guztiak"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Hautatu fokua duen mezua"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, fuzzy, kde-format
 #| msgid "Reset Quick Search"
 msgid "Set Focus to Quick Search"
 msgstr "Garbitu bilaketa bizkorra"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, fuzzy, kde-format
 #| msgid "Focus on Previous Message"
 msgid "Extend Selection to Previous Message"
 msgstr "Fokua aurreko mezuan"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, fuzzy, kde-format
 #| msgid "Focus on Next Message"
 msgid "Extend Selection to Next Message"
 msgstr "Fokua hurrengo mezuan"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Eraman mezua karpeta honetara"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message W&indow"
 msgid "Use Less Bandwidth"
 msgstr "Mezu-leh&ioa"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 msgid "Account &Settings"
 msgstr "&Bidali"
 
 #: kmmainwidget.cpp:3590
 #, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "Identitatearen izena"
+
+#: kmmainwidget.cpp:3601
+#, fuzzy, kde-format
 msgid "Add Favorite Folder"
 msgstr "Karpeta berria"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Hustu zakarrontzia"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Bota mezu guztiak zakarrontzira"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Ezabatu bilaketa"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Editatu script-a..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "%1 iragazkia"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Hasten..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -5011,12 +5006,12 @@
 "Mmezuak HTML formatuan erabiltzean \"baztergarrien\" aurrean arrisku gehiago "
 "izateko aukera gehiago dago, eta sistema arriskuan jar dezakezu."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Erabili HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -5026,195 +5021,195 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "&Utzi"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Hasten..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Bota zakarrontzira"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, fuzzy, kde-format
 #| msgid "trash"
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "zakarrontzia"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Bota mezua zakarrontzira"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Move Messages to Folder"
 msgid "Cannot copy item. %1"
 msgstr "Eraman mezuak karpetara"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Mezu berria honi..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Erantzun honi..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Birbidali honi..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Name of the attachment:"
 msgid "Add to Existing Contact"
 msgstr "Eranskinaren izena:"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Ireki helbide-liburuan"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Sortu estekaren laster-marka"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit contact..."
 msgstr "Editatu script-a..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Gorde esteka honela..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Aurkitu mezuan..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "Gorde esteka honela..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Show HTML stat&us bar"
 msgid "Show HTML Format"
 msgstr "Erakutsi HTMLren e&goera-barra"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 #| msgid "Load external references from the Internet for this message."
 msgid "Load external reference when mail comes for this contact"
 msgstr "Kargatu mezu honen kanpoko erreferentziak Internetetik."
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "Gorde esteka honela..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG-ren euskarria"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "Baieztatu bidali &aurretik"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDEren e-posta bezeroa"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folderlist"
 msgid "Retrieving Folder Contents"
 msgstr "Karpeta-zerrenda eskuratzen"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Itxaron"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "Lineaz kanpo lan egin"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5228,7 +5223,7 @@
 "kanpoko moduan dago. Egin klik <a href=\"kmail:goOnline\">hemen</a> lineako "
 "egoerara joateko . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5242,24 +5237,24 @@
 "kanpoko moduan dago. Egin klik <a href=\"kmail:goOnline\">hemen</a> lineako "
 "egoerara joateko . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Contact modified successfully"
 msgstr "Mezuak lekuz ongi aldatu dira"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Mezu berria hemen"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, fuzzy, kde-format
 #| msgid "There are no unread messages"
 msgid "There are no unread messages"
 msgstr "Ez dago irakurri gabeko mezurik"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, fuzzy, kde-format
 #| msgid "Unread Message"
 msgid "1 unread message"
@@ -5283,8 +5278,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5378,18 +5373,18 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Kontaktuak"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5438,28 +5433,28 @@
 msgid "All"
 msgstr "Guztiak"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2005, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2005, KMail-en garatzaileak"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5488,7 +5483,7 @@
 msgid "&Reply"
 msgstr "&Erantzun"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "Erantzu&n..."
@@ -5498,12 +5493,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Erantzun egi&leari..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Erantzun &guztiei..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Erantzun po&sta-zerrendara..."
@@ -5535,7 +5530,7 @@
 msgid "&Edit As New"
 msgstr "E&ditatu mezua"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5749,119 +5744,119 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Aurkitu mezuak"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Bilatu"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "B&arnean..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Eranskin gisa..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Gorde eranskinak..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Garbitu hautapena"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "Jauzi karpeta honetara"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "Parekide %1"
 msgstr[1] "%1 parekide"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Azken bilaketa"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 #| msgid "Could not sync maildir folder."
 msgid "You did not selected a valid folder."
 msgstr "Ezin izan da maildir karpetarekin sinkronizatu."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "Hasten..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Can not get search result. %1"
 msgid "Cannot get search result. %1"
 msgstr "Ezin da bilaketa emaitza lortu. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "Bilaketa bertan behera"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid " completed"
 msgid "Search complete."
 msgstr " osatuta"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 msgid "Search stopped."
 msgstr "&Bilatu"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, fuzzy, kde-format
 #| msgid ""
 #| "There was a problem renaming your search folder. A common reason for this "
@@ -5874,21 +5869,21 @@
 "Arazo bat gertatu da zure bilaketa karpeta berrizendatzerakoan. Honetarako "
 "arrazoi ohikoa dagoeneko izen bereko beste bilaketa karpeta bat egotea da."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Kopiatu mezua"
 msgstr[1] "Kopiatu %1 mezu"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Ebaki mezua"
 msgstr[1] "Ebaki %1 mezu"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -6017,7 +6012,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -6025,7 +6020,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -6033,20 +6028,20 @@
 msgstr "Balio honek KMail-en Sarrera bistaratuko den erabakiko du."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 #| msgid "Show quick search line edit"
 msgid "Show folder quick search line edit"
 msgstr "Erakutsi bilaketa bizkorraren edizio lerroa"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if root certificate expires in &less than:"
 msgid "Warn if the number of recipients is more than:"
@@ -6054,7 +6049,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -6063,20 +6058,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "Baieztatu bidali &aurretik"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automatikoki eskatu &mezu-eskuratzeen jakinarazpenak"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -6092,13 +6087,13 @@
 "menuko aukeran.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Autogorde t&artea:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -6110,156 +6105,156 @@
 "baliora."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Mezuen aurrebista-panela"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, fuzzy, kde-format
 #| msgid "&Do not show a message preview pane"
 msgid "Do not show a message preview pane"
 msgstr "E&z erakutsi mezuen aurrebista-panela"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane belo&w the message list"
 msgid "Show the message preview pane below the message list"
 msgstr "Erakutsi mezuen aurrebista-panela mezu-zerrendaren &azpian"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane ne&xt to the message list"
 msgid "Show the message preview pane next to the message list"
 msgstr "Erakutsi mezuen aurrebista-panela mezu-zerrendaren &ondoan"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Karpeten zerrenda"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, fuzzy, kde-format
 #| msgid "Lon&g folder list"
 msgid "Long folder list"
 msgstr "Karpeta-zerrenda l&uzea"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, fuzzy, kde-format
 #| msgid "Shor&t folder list"
 msgid "Short folder list"
 msgstr "Karpeta-zerrenda l&aburra"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, fuzzy, kde-format
 msgid "Message template for new message"
 msgstr "Mezu-zerrenda - Mezu berriak"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, fuzzy, kde-format
 msgid "Message template for reply"
 msgstr "Mezu-zerrenda - Mezu berriak"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, fuzzy, kde-format
 msgid "Message template for reply to all"
 msgstr "Mezu-zerrenda - Mezu berriak"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, fuzzy, kde-format
 msgid "Message template for forward"
 msgstr "Mezu-zerrenda - Mezu berriak"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, fuzzy, kde-format
 msgid "Quote characters"
 msgstr "Gehitu &aipamen karaktereak"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6267,7 +6262,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6275,7 +6270,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6283,7 +6278,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6291,7 +6286,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6299,7 +6294,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6587,7 +6582,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6955,10 +6950,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check &Mail"
-msgid "Check Mail Url Tracking"
-msgstr "&Begiratu mezurik dagoen"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7651,6 +7645,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Gaitu berriro \"Ez galdetu berriro\" abisu guztiak"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7712,6 +7716,11 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Check &Mail"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "&Begiratu mezurik dagoen"
+
 #~ msgid "&Reply to:"
 #~ msgstr "&Erantzun honi:"
 
@@ -11213,11 +11222,6 @@
 #~ msgstr "Kendu identitatea"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Identitatearen izena"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "&Zerbitzariak \"Sieve\" onartzen du"
@@ -13174,12 +13178,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "URLa irekitzen..."
 
-#, fuzzy
-#~| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "<qt>Benetan <b>%1</b> exekutatu nahi duzu?</qt>"
-
 #~ msgid "Execute"
 #~ msgstr "Exekutatu"
 
diff -Nru kmail-19.04.3/po/fa/kmail.po kmail-19.12.3/po/fa/kmail.po
--- kmail-19.04.3/po/fa/kmail.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/fa/kmail.po	2020-03-03 00:34:00.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2012-01-17 01:38+0330\n"
 "Last-Translator: Mohammad Reza Mirdamadi <mohi@ubuntu.ir>\n"
 "Language-Team: Farsi (Persian) <>\n"
@@ -208,8 +208,8 @@
 msgstr "کلیدهای چندگانه رمز‌بندی برای هر نشانی"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -327,28 +327,28 @@
 "KMail نتوانست فهرست نامه این پوشه را حذف کند. لطفاً، نشانیها را به طور دستی "
 "پر کنید."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "کاربرد:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, fuzzy, kde-format
 #| msgid "Status: "
 msgid "Status:"
 msgstr "وضعیت:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 %3 used"
 msgid "%1 of %2 used"
@@ -373,7 +373,7 @@
 "را فشار دهید.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "قالبها"
@@ -385,112 +385,112 @@
 msgstr "&استفاده از قالبهای پیام سفارشی‌"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&رونوشت قالبهای سراسری‌"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "نما"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "استفاده از &شمایلهای سفارشی‌"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&عادی:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, fuzzy, kde-format
 #| msgid "&Unread:"
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "خوانده‌نشده"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "نمایش ستون فرستنده/گیرنده در فهرست پیامها"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&نمایش ستون:‌"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "پیش‌فرض"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "فرستنده"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "گیرنده"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "فهرست پیام"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default aggregation"
 msgstr "حذف &رشته‌"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "انبوهش"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default theme"
 msgstr "حذف &رشته‌"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "چهره"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "قالب پیام ناامن"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "ترجیح &زنگام به متن ساده‌"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "ترجیح دادن &زنگام به متن ساده‌"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -502,103 +502,108 @@
 msgid "Retrieval Options"
 msgstr "گزینه‌های عمومی"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&هویت‌"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "دریافت‌"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "ارسال"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "حسابهای خارج‌شونده )افزودن حداقل یک مورد(:"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "گزینه‌های مشترک"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "تأیید &پیش از ارسال‌"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "هرگز به طور خودکار"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "در بررسیهای دستی نامه"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "در کل بررسیهای نامه"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "هم اکنون ارسال شود"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "بعداً ارسال شود"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "ارسال &پیامها در پوشه ارسالی:‌"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "روش ارسال &پیش‌فرض:‌"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "افزودن حساب"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Custom Account..."
 msgstr "افزودن حساب"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -606,31 +611,31 @@
 "properly installed."
 msgstr "مدیر گواهی‌نامه را نمی‌توان آغاز کرد. لطفاً، نصب خود را بررسی کنید."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start account wizard"
 msgstr "قادر به ایجاد حساب‌ نیست"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "شامل بررسی دستی نامه‌"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "تغییر به برون‌خط در زمان تعطیلی KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "بررسی نامه هنگام راه‌اندازی‌"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -689,7 +694,7 @@
 msgid "Fixed Width Font"
 msgstr "قلم با عرض ثابت"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "مؤلف"
@@ -1025,97 +1030,97 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "عمومی"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, fuzzy, kde-format
 #| msgid "Standard &Templates"
 msgid "Standard Templates"
 msgstr "&قالبهای استاندارد‌"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, fuzzy, kde-format
 #| msgid "&Custom Templates"
 msgid "Custom Templates"
 msgstr "قالبهای &سفارشی‌"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, fuzzy, kde-format
 #| msgid "Subject"
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "&موضوع:‌ "
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "نویسه‌گان"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "سرآیندها"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "پیوستها"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "امضا"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 #| msgid "Use smaller font for quoted text"
 msgid "Insert the signature above any quoted text"
 msgstr "استفاده از قلم کوچک‌تر برای متن نقل قول‌شده"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "&قالب‌"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1123,7 +1128,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1131,17 +1136,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1149,7 +1154,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1157,37 +1162,37 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "درون‌خط"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "As Attachment"
 msgstr "به عنوان &پیوست...‌"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Default forwarding type:"
 msgstr "دامنه &پیش‌فرض:‌"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "Additional Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "گیرنده‌های اضافی"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1195,18 +1200,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Set the maximum number of recipients for the warning"
 msgstr "تعداد بیشینه خطوط ویرایشگر گیرنده."
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1217,52 +1222,52 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "بدون ذخیره خودکار"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "نشانیهای جدید"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "پیکربندی ترتیب تکمیل..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "بدون ذخیره خودکار"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "بدون ذخیره خودکار"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1270,19 +1275,19 @@
 msgid_plural " minutes"
 msgstr[0] " دقیقه"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "درخواست خودکار اخطارهای وضع &پیام‌"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "پیشوندهای موضوع‌ &پاسخ‌"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1291,59 +1296,59 @@
 "شناخت هر دنباله پیشوندهای زیر\n"
 ")مدخلها، عبارتهای منظم حساس به حالت هستند(:"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&افزودن...‌"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&حذف‌"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&تغییر...‌"
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "وارد کردن پیشوند پاسخ جدید:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "پیشوندهای موضوع &پیش‌سو‌"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "افزودن..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&حذف‌"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "تغییر..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "وارد کردن پیشوند پیش‌سوی جدید:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1353,88 +1358,88 @@
 "حاوی تمام نویسه‌های مورد نیاز است، بررسی می‌شود."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&تغییر...‌"
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "وارد کردن نویسه‌گان:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "&حفظ مجموعه نویسه اصلی هنگام پاسخ دادن یا پیش‌سو کردن )در صورت امکان(‌"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "این نویسه‌گان پشتیبانی نمی‌شود."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&استفاده از پسوند شناسه پیام سفارشی‌"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "پسوند &شناسه پیام سفارشی‌:‌"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "تعریف حوزه‌های سرآیند مایم سفارشی:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "نام"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "مقدار"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&جدید‌"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&نام:‌"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&مقدار:‌"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid header"
 msgstr "&فعال‌سازی امضا‌"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "نام‌گذاری پیوست همساز Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1443,41 +1448,41 @@
 "برای این که Outlook(tm) را مجبور کنید که نامهای پیوستی را که حاوی نویسه‌های "
 "غیر انگلیسی می‌باشد، بفهمد، این گزینه را فعال کنید"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&فعال‌سازی آشکارسازی پیوستهای از دست‌ رفته‌"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "شناخت هر کدام از واژه‌های کلیدی زیر به عنوان هدف برای پیوست پرونده:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "وارد کردن واژه کلیدی جدید:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr " پیوست دارد"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, fuzzy, kde-format
 #| msgid " MB"
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " مگابایت"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "ثبت حد اندازه:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1573,7 +1578,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "مؤلف"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1691,7 +1696,7 @@
 msgid "Archive Folder"
 msgstr "پوشه جدید"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgctxt "Start of the filename for a mail archive file"
 #| msgid "Archive"
@@ -1764,20 +1769,20 @@
 msgid "Notification"
 msgstr "اخطار"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "Attachment: %1"
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "پیوست: %1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Hide attachment list"
 msgstr "ذخیره پیوست به عنوان"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Show attachment list"
@@ -1796,399 +1801,399 @@
 msgid "Encoding"
 msgstr "&کدبندی‌:"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 #| msgid "Set subject of message"
 msgid "Set a subject for this message"
 msgstr "تنظیم موضوع پیام"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&هویت:‌"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&واژه‌نامه:‌"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "پوشه نامه &ارسالی:‌"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "انتقال &نامه:‌"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&از:‌"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, fuzzy, kde-format
 #| msgid "S&ubject:"
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&موضوع:‌ "
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&ارسال نامه‌"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&ارسال نامه از طریق‌"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "ارسال"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "&بعداً ارسال شود‌"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "&بعداً از طریق ارسال شود‌"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "صف"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "ذخیره به عنوان &پیش‌نویس‌"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "جستجو در &همه پوشه‌های محلی‌"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "ذخیره به عنوان &قالب‌"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 #| msgid "Save as &Template"
 msgid "Save email in Template folder"
 msgstr "ذخیره به عنوان &قالب‌"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "ذخیره در پرونده"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgid "&Insert Text File..."
 msgstr "&درج پرونده...‌"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, fuzzy, kde-format
 #| msgid "&Insert File Recent"
 msgid "&Insert Recent Text File"
 msgstr "&درج پرونده اخیر‌"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "کتاب &نشانی‌"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "Open Address Book"
 msgstr "باز کردن در کتاب نشانی"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "مؤلف &جدید‌"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "برگزیدن &گیرنده‌ها...‌"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "ذخیره فهرست &توزیع...‌"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "چسباندن به عنوان &پیوست‌"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&پاک کردن فاصله‌ها‌"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "استفاده از قلم &ثابت‌"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, fuzzy, kde-format
 #| msgid "&Urgent"
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "ضروری"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&درخواست اخطار ترتیب‌"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&درخواست اخطار ترتیب‌"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&واژه‌شکنی‌"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "غلط‌گیری &خودکار‌"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Rich Text Editing"
 msgstr "اطلاعات ورود"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&تمام حوزه‌ها‌"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&هویت‌"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&واژه‌نامه‌"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "پوشه نامه &ارسالی‌"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "انتقال &نامه‌"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&از‌"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, fuzzy, kde-format
 #| msgid "S&ubject"
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&موضوع:‌ "
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "پیوستن &امضا‌"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, fuzzy, kde-format
 #| msgid "Append S&ignature"
 msgid "Pr&epend Signature"
 msgstr "پیوستن &امضا‌"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, fuzzy, kde-format
 #| msgid "Set Cursor Position"
 msgid "Insert Signature At C&ursor Position"
 msgstr "تنظیم موقعیت مکان‌نما"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&غلط‌گیر...‌"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "غلط‌گیر"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&رمزبندی پیام‌"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "رمز‌بندی"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&امضای پیام‌"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "امضا کردن"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "قالب پیام &نهفته‌"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&یافتن پیامها...‌"
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "پیکربندی KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, fuzzy, kde-format
 #| msgid " Line: %1 "
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr "خط"
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr "ستون: %1"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, fuzzy, kde-format
 msgid "INS"
 msgstr "درج"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "غلط‌یاب: روشن"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "غلط‌یاب: خاموش"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "&ذخیره مجدد به عنوان قالب‌"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&ذخیره به عنوان پیش‌نویس‌"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2197,7 +2202,7 @@
 "ذخیره این پیام در پوشه پیش‌نویسها. سپس، می‌توان آن را ویرایش کرد و یک زمان "
 "دیگر ارسال کرد."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2206,88 +2211,88 @@
 "ذخیره این پیام در پوشه پیش‌نویسها. سپس، می‌توان آن را ویرایش کرد و یک زمان "
 "دیگر ارسال کرد."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "می‌خواهید پیام را بعداً ذخیره کنید یا آن را دور بیندازید؟"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "بستن مؤلف"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Autosave Message Failed"
 msgstr "خرابی در ذخیره خودکار"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Sending Message Failed"
 msgstr "خرابی در ذخیره خودکار"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "درج محتوای پرونده"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add as &Attachment"
 msgstr "افزودن به عنوان پیوست"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "نام پیوست:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid Attachment Name"
 msgstr "&فعال‌سازی امضا‌"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Quoted Message"
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "پیام نقل قول شده"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "افزودن به عنوان پیوست"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, fuzzy, kde-format
 #| msgid "Paste as text or attachment?"
 msgid "Insert clipboard text as attachment"
 msgstr "به عنوان متن چسبانده شود یا پیوست؟"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "بدون نام"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2300,12 +2305,12 @@
 "تعریف نمی‌کند.</p><p>لطفاً، کلید)های( مورد استفاده در پیکربندی هویت را "
 "برگزینید.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "کلید تعریف‌‌‌نشده رمزبندی"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2316,12 +2321,12 @@
 "(OpenPGP یا S/مایم) مورد استفاده را تعریف کنید.</p><p>لطفاً، کلید مورد "
 "استفاده در پیکربندی هویت را برگزینید.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "کلید تعریف‌نشده امضا"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2332,7 +2337,7 @@
 "رایانامه‌تان را برای تمام هویتها تنظیم کنید، به طوری که مجبور نباشید آن را "
 "برای هر پیام وارد کنید."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2344,37 +2349,37 @@
 "حداقل باید یک گیرنده را یا در حوزه به: یا به عنوان ر.ن یا به عنوان ر.ن.م "
 "مشخص کنید."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "به: حوزه خالی است. به هر حال پیام را ارسال می‌کنید؟"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "نه به: مشخص‌شده"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "موضوعی را مشخص نکردید. به هر حال پیام را ارسال می‌کنید؟"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "موضوعی مشخص نشده است"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&ارسال همان‌طور که هست‌"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&مشخص کردن موضوع‌"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2386,91 +2391,91 @@
 "حداقل باید یک گیرنده را یا در حوزه به: یا به عنوان ر.ن یا به عنوان ر.ن.م "
 "مشخص کنید."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "در مورد ارسال رایانامه..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "ارسال تأیید"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "هم اکنون &ارسال شود‌"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, fuzzy, kde-format
 #| msgid "No recipients"
 msgid "Too many recipients"
 msgstr "گیرنده‌ای وجود ندارد"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&ارسال همان‌طور که هست‌"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, fuzzy, kde-format
 #| msgid "Additional Recipients"
 msgid "&Edit Recipients"
 msgstr "گیرنده‌های اضافی"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Lose Formatting"
 msgstr "اطلاعات ورود"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "پیام به عنوان متن ساده"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2478,7 +2483,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2565,25 +2570,25 @@
 msgid "External editor was started."
 msgstr "ویرایشگر خارجی"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2614,11 +2619,6 @@
 msgid "Message will not be encrypted"
 msgstr "ذخیره پیامهای &رمزبندی‌شده ارسالی‌"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr ""
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2667,32 +2667,32 @@
 msgid "Cannot move messages."
 msgstr "حرکت دادن پیامها به پوشه"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "خرابی در ایجاد پوشه"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No Folder Selected"
 msgid "No folder returned."
 msgstr "پوشه‌ای انتخاب نشد"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "خرابی در ایجاد پوشه"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Removed 1 old message from folder %2."
 #| msgid_plural "Removed %1 old messages from folder %2."
 msgid "Unable to return list of folders."
 msgstr "%1 پیام قدیمی حذف‌شده از پوشه %2."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Message was signed by %1."
 msgid "Messages archived"
@@ -2737,50 +2737,50 @@
 msgid "&Existing identities:"
 msgstr "هویتهای &موجود:‌"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "خطا هنگام تلاش برای تغییر نام پوشه %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "وارد کردن واژه کلیدی جدید:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "ویرایش هویت"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "عمومی"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "نام &شما:‌"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2792,12 +2792,12 @@
 "را سفید بگذارید، نام حقیقیتان ظاهر نمی‌شود؛ فقط نشانی رایانامه ظاهر می‌شود.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&سازمان:‌"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2808,12 +2808,12 @@
 "ارسال می‌شود، نمایش داده شود، این حوزه باید نام سازمانتان را داشته باشد.</"
 "p><p>سفید گذاشتن این، ایمن )و عادی( است.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "نشانی &رایانامه:‌"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Email address</h3><p>This field should have your full email "
@@ -2830,13 +2830,13 @@
 "باشد.</p><p>اگر این را سفید بگذارید، یا آن را اشتباه بنویسید، افراد در پاسخ "
 "دادن به شما دچار مشکل می‌شوند.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 #| msgid "&Email address:"
 msgid "Email a&liases:"
 msgstr "نشانی &رایانامه:‌"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2847,12 +2847,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "رمزنگاری"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2874,12 +2874,12 @@
 "بیشتر در مورد کلیدها را می‌توانید در <a>http://www.gnupg.org</a> بیابید</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "کلید امضای OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2903,12 +2903,12 @@
 "می‌کنید، نمی‌باشد؛ کارهای عادی نامه تحت تأثیر واقع نمی‌شوند.</p><p>مطالب بیشتر "
 "در مورد کلیدها را می‌توانید در <a>http://www.gnupg.org</a> بیابید</p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "کلید رمزبندی OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2921,12 +2921,12 @@
 "KMail قادر به رقمی نوشتن رایانامه‌ها با استفاده از S/مایم نمی‌باشد؛ کارهای "
 "عادی نامه تحت تأثیر واقع نمی‌شود.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "گواهی‌نامه امضای S/مایم‌:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2941,42 +2941,42 @@
 "خروجی برای این که از S/مایم استفاده می‌کنید، نمی‌باشد؛کارهای عادی نامه تحت "
 "تأثیر واقع نمی‌شود.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "گواهی‌نامه رمزبندی S/مایم:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred crypto message format:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "قالب پیام رمز ارجح:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "امضای &خودکار پیامها‌"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "رمزبندی &پیامها به طور خودکار، در صورت امکان‌"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "پیشرفته"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&پاسخ به نشانی:‌"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2994,13 +2994,13 @@
 "اما هر کدام برای رفتن به نشانی یک گروه پاسخ می‌دهد.</p><p>اگر شک دارید، این "
 "حوزه را خالی بگذارید.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "نشانیهای &ر.ن.م:‌"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3025,12 +3025,12 @@
 "یک نشانی، از کاما برای جدا کردن فهرست گیرنده‌های ر.ن.م استفاده کنید.</"
 "p><p>اگر شک دارید، این حوزه را خالی بگذارید.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "نشانیهای &ر.ن.م:‌"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3047,62 +3047,62 @@
 "یک نشانی، از کاما برای جدا کردن فهرست گیرنده‌های ر.ن.م استفاده کنید.</"
 "p><p>اگر شک دارید، این حوزه را خالی بگذارید.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&واژه‌نامه:‌"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&پوشه نامه ارسالی:‌"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "پوشه &پیش‌نویسها:‌"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "پوشه &قالبها:‌"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 #| msgid "Configure Account"
 msgid "Outgoing Account:"
 msgstr "پیکربندی حساب"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "افزودن »سرآیند« به پیام"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "تغییر نام..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 #| msgid "Choose &language:"
 msgid "Autocorrection language:"
 msgstr "انتخاب &زبان:‌"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "دامنه &پیش‌فرض:‌"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "دامنه &پیش‌فرض:‌"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3111,35 +3111,35 @@
 "<qt><p>دامنه پیش‌فرض، برای کامل کردن نشانیهای رایانامه‌ای که فقط متشکل از نام "
 "کاربر هستند، استفاده می‌شود.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, fuzzy, kde-format
 #| msgid "&Use custom message templates"
 msgid "&Use custom message templates for this identity"
 msgstr "&استفاده از قالبهای پیام سفارشی‌"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "امضا"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "عکس"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Email Alias \"%1\""
 msgstr "نشانی رایانامه‌ای نامعتبر"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "نشانی رایانامه‌ای نامعتبر"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3152,7 +3152,7 @@
 "هنگامی که سعی می‌کنید امضاهایی که با این پیکربندی ساخته‌شده‌اند را تغییر دهید، "
 "ممکن است منجر به پیامهای خطا در سمت دریافت بشود."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3161,7 +3161,7 @@
 "یکی از کلیدهای پیکربندی‌شده رمز‌بندی OpenPGP، حاوی شناسه کاربر دارای نشانی "
 "رایانامه پیکربندی‌شده برای این هویت )%1( نیست."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3174,7 +3174,7 @@
 "هنگامی که سعی می‌کنید امضاها را با این پیکربندی تغییر دهید، ممکن است منجر به "
 "پیامهای اخطار در سمت دریافت شود."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3183,22 +3183,22 @@
 "یکی از گواهی‌نامه‌های پیکربندی‌شده رمز‌بندی S/مایم، حاوی نشانی رایانامه "
 "پیکربندی‌شده برای این هویت )%1( نمی‌باشد."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "نشانی رایانامه‌ای در کلید/گواهی‌نامه‌ها یافت نشد"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "پرونده امضا معتبر نیست"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "ویرایش هویت »%1«"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3210,7 +3210,7 @@
 "پوشه سفارشی پیش‌نویسها برای هویت »%1« )دیگر( موجود نیست؛ بنابراین، از پوشه "
 "پیش‌فرض پیش‌نویسها استفاده می‌شود."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "ویرایش..."
@@ -3246,6 +3246,20 @@
 msgid "We cannot delete vCard file."
 msgstr "پوشه maildir را نمی‌توان همگام‌سازی کرد."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "<qt>واقعاً می‌خواهید <b>%1</b> را اجرا کنید؟</qt>"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "ارسال تأیید"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3412,7 +3426,7 @@
 "نمونه‌ها در  <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all."
 "nl/~ace/X-Faces/</a> وجود دارند."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3446,7 +3460,7 @@
 msgid_plural "Distribution lists %2 are empty, they cannot be used."
 msgstr[0] "لیست توزیع \"%1\" خالی است و نمی‌تواند استفاده شود."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "افزودن به کتاب نشانی"
@@ -3457,24 +3471,24 @@
 msgid "Contact created successfully"
 msgstr "پیامها با موفقیت حذف شدند."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Failed to store contact"
 msgstr "قادر به ویرایش پیوست نیست"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "مطمئن هستید که می‌خواهید پوشه زباله را خالی کنید؟"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "New Folder"
 msgid "Attach Folder"
@@ -3707,7 +3721,7 @@
 msgstr "&پوشه‌"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3715,7 +3729,7 @@
 msgstr "&اعمال همه پالایه‌ها‌"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current folder and all subfolders"
@@ -3742,7 +3756,7 @@
 msgstr "&پیش‌سو‌"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&اعمال پالایه‌"
@@ -3767,7 +3781,7 @@
 msgstr "&کمک‌"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "میله ابزار اصلی"
@@ -3822,45 +3836,45 @@
 msgid "The file does not contain a message."
 msgstr "پرونده حاوی پیام نمی‌باشد."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "پرونده حاوی پیامهای چندگانه است. فقط اولین پیام نمایش داده می‌شود."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 #| msgid "Send Digest"
 msgid "Send As Digest"
 msgstr "ارسال چکیده"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "حذف پیامها"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "پالایش پیام %1 از %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "حرکت دادن پیامها"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "حذف پیامها"
@@ -3889,29 +3903,29 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail، برای برون‌خط شدن تنظیم می‌شود؛ تمام کارهای شبکه معلق می‌شوند"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "&ارسال نامه‌"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "در مورد ارسال رایانامه..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail، برای برخط شدن تنظیم می‌شود؛ تمام کارهای شبکه از سر گرفته می‌شوند"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3919,103 +3933,105 @@
 "connection is detected"
 msgstr "KMail، برای برخط شدن تنظیم می‌شود؛ تمام کارهای شبکه از سر گرفته می‌شوند"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "در حال حاضر KMail در حالت برون‌خط است. چقدر می‌خواهید پیش بروید؟"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "بر‌خط/برون‌خط"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "کار کردن برخط"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "کار کردن برون‌‌خط"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
 msgstr "KMail، برای برخط شدن تنظیم می‌شود؛ تمام کارهای شبکه از سر گرفته می‌شوند"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "KMail، برای برون‌خط شدن تنظیم می‌شود؛ تمام کارهای شبکه معلق می‌شوند"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Opening Autosave File Failed"
 msgstr "خرابی در ذخیره خودکار"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the default transport:"
 msgstr[0] "این %1 هویت برای استفاده از انتقال پیش‌فرض تغییر داده شده است:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the modified transport:"
 msgstr[0] "این %1 هویت برای استفاده از انتقال پیش‌فرض تغییر داده شده است:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "ارسال پیامها"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, fuzzy, kde-format
 #| msgid "Initiating sender process..."
 msgid "Initiating sending process..."
 msgstr "آغاز فرایند فرستنده..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -4023,12 +4039,12 @@
 "properly installed."
 msgstr "مدیر گواهی‌نامه را نتوانست آغاز کند، لطفاً، نصب خود را بررسی کنید."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "خطای KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4036,27 +4052,27 @@
 "properly installed."
 msgstr "مدیر گواهی‌نامه را نمی‌توان آغاز کرد. لطفاً، نصب خود را بررسی کنید."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start import wizard"
 msgstr "قادر به ایجاد حساب‌ نیست"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "مدیر گواهی‌نامه را نمی‌توان آغاز کرد. لطفاً، نصب خود را بررسی کنید."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to start external editor."
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "قادر به آغاز کردن ویرایشگر خارجی نیست."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4064,70 +4080,70 @@
 "properly installed."
 msgstr "مدیر گواهی‌نامه را نمی‌توان آغاز کرد. لطفاً، نصب خود را بررسی کنید."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start ImportWizard"
 msgstr "قادر به ایجاد حساب‌ نیست"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "مدیر گواهی‌نامه را نمی‌توان آغاز کرد. لطفاً، نصب خود را بررسی کنید."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "بدون موضوع"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, fuzzy, kde-format
 #| msgid "(no custom templates)"
 msgid "(no templates)"
 msgstr ")بدون قالب سفارشی("
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "این پوشه، تنظیم گزینه‌های انقضا ندارد"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>مطمئن هستید که می‌خواهید پوشه <b>%1</b> انقضا یابد؟ </qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "انقضای پوشه"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&انقضا‌"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "خالی کردن زباله"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "حرکت به زباله"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "مطمئن هستید که می‌خواهید پوشه زباله را خالی کنید؟"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4136,27 +4152,27 @@
 "<qt>مطمئن هستید که می‌خواهید تمام پیامها را از پوشه <b>%1</b> به زباله حرکت "
 "دهید؟</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "تمام پیامها به زباله حرکت داده شد"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "مطمئن هستید که می‌خواهید تمام پیامهای قدیمی انقضا یابد؟"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "پیامهای قدیمی انقضا یابد؟"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "انقضا"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4167,17 +4183,17 @@
 "می‌کند و  ممکن است احتمال این که سیستمتان با اعمال امنیتی کنونی و پیش‌بینی شده "
 "سازش یابد را افزایش دهد."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "بارگذاری مرجعهای خارجی"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4189,431 +4205,431 @@
 "<qt>واقعاً می‌خواهید %1 پیام برگزیده را حذف کنید؟<br />به محض این که حذف "
 "می‌‌شوند، آنها را نمی‌توان بازگرداند.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "حذف پیامها"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "حذف پیام"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Moving messages..."
 msgstr "حرکت دادن پیامها"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Deleting messages..."
 msgstr "حذف پیامها"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, fuzzy, kde-format
 #| msgid "Messages deleted successfully."
 msgid "Messages deleted successfully."
 msgstr "پیامها با موفقیت حذف شدند."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved successfully."
 msgstr "پیامها با موفقیت منتقل شدند"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "خرابی در حذف پیامها."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "حذف پیامها لغو شد."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "خرابی در حرکت پیامها."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "حرکت پیامها لغو شد."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "حرکت دادن پیامها به پوشه"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Copying messages..."
 msgstr "حرکت دادن پیامها"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages copied successfully."
 msgstr "پیامها با موفقیت منتقل شدند"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Copying messages failed."
 msgstr "خرابی در حرکت پیامها."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Copying messages canceled."
 msgstr "حرکت پیامها لغو شد."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, fuzzy, kde-format
 #| msgid "Copy Message to Folder"
 msgid "Copy Messages to Folder"
 msgstr "رونوشت پیام در پوشه"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Moving messages to trash..."
 msgstr "حرکت پیام به زباله‌دان"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Deleting and moving messages to trash..."
 msgstr "حرکت پیام به زباله‌دان"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash successfully."
 msgstr "پیامها با موفقیت منتقل شدند"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash or deleted successfully"
 msgstr "پیامها با موفقیت منتقل شدند"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Moving messages to trash failed."
 msgstr "خرابی در حرکت پیامها."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "خرابی در حرکت پیامها."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Moving messages to trash canceled."
 msgstr "حرکت پیامها لغو شد."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "حرکت پیامها لغو شد."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "پرش به پوشه"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "ذخیره &به عنوان...‌"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&انقضای تمام پوشه‌ها‌"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "بررسی &نامه‌"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail In"
 msgstr "بررسی &نامه‌"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail"
 msgstr "بررسی &نامه‌"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&ارسال پیامهای صف‌شده‌"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, fuzzy, kde-format
 #| msgid "Onlinestatus (unknown)"
 msgid "Online status (unknown)"
 msgstr "وضعیت برخط )ناشناخته("
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "ارسال پیامهای صف‌شده از طریق"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "مدیر گواهی"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages..."
 msgid "&Import Messages..."
 msgstr "&واردات پیامها...‌"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&اشکال‌زدایی غربال...‌"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "پالایش مشاهده‌گر &ثبت...‌"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "ویرایش پاسخهای »خارج از دفتر«..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "پیکربندی &اخطارها...‌"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Delayed Messages..."
 msgstr "حذف پیامها"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&یافتن پیامها...‌"
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&حذف‌"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "&حرکت رشته به زباله‌"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "حرکت رشته به زباله‌دان"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "حذف &رشته‌"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&یافتن پیامها...‌"
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "برگزیدن &تمام پیامها‌"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "مدیریت فهرست &نامه...‌"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&انتساب میان‌بر...‌"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "تنظیمات &انقضا‌"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "&Archive Folder..."
 msgstr "پوشه &جدید...‌"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "بارگذاری مرجعهای &خارجی‌"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Message To..."
 msgstr "پیام جدید به..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Move Message To..."
 msgstr "پیام جدید به..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "پیام &جدید...‌"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "جدید"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "پیام از &قالب‌"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "پیام جدید &در فهرست نامه...‌"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&ایجاد پالایه‌"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "پالایش بر اساس &موضوع...‌"
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "پالایش بر اساس &از...‌"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "پالایش بر اساس &به...‌"
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "پالایش بر اساس &به...‌"
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "نشان‌دار کردن &رشته‌"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "نشان‌دار کردن رشته به عنوان &خوانده‌شده‌"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "نشان‌دار کردن همه پیامهای رشته برگزیده به عنوان خوانده‌شده"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "نشان‌دار کردن رشته به عنوان &خوانده‌نشده‌"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "نشان‌دار کردن همه پیامهای رشته برگزیده به عنوان خوانده‌نشده"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, fuzzy, kde-format
 #| msgid "Mark Thread as &Unread"
 msgid "Mark Thread as &Important"
 msgstr "نشان‌دار کردن رشته به عنوان &خوانده‌نشده‌"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, fuzzy, kde-format
 #| msgid "Mark Thread as &New"
 msgid "Mark Thread as &Action Item"
 msgstr "نشان‌دار کردن رشته به عنوان &جدید‌"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 #| msgid "Important Message"
 msgid "Remove &Action Item Thread Mark"
 msgstr "پیام مهم"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&پایش رشته‌"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&چشم‌پوشی از رشته‌"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "ذخیره &پیوستها...‌"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Decrypted To..."
 msgstr "پیام جدید به..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "&اعمال همه پالایه‌ها‌"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4621,13 +4637,13 @@
 msgid "&Expand Thread / Group"
 msgstr "&گسترش رشته‌"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "گسترش رشته جاری"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4635,123 +4651,123 @@
 msgid "&Collapse Thread / Group"
 msgstr "&فشردن رشته‌"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "فشردن رشته جاری"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "&گسترش همه رشته‌ها‌"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "گسترش همه رشته‌های پوشه جاری"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "&فشردن همه رشته‌ها‌"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "فشردن همه رشته‌های پوشه جاری"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&نمایش پیام‌"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "پیام &بعدی‌"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "رفتن به پیام بعدی"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "پیام &خوانده‌نشده بعدی‌"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "بعدی"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "رفتن به پیام خوانده‌نشده بعدی"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "پیام &قبلی‌"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "رفتن به پیام قبلی"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&پیام خوانده‌نشده قبلی‌"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "قبلی"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "رفتن به پیام خوانده‌نشده قبلی"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "&پوشه خوانده‌نشده بعدی‌"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "رفتن به پوشه بعدی دارای پیامهای خوانده‌نشده"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "&پوشه خوانده‌نشده قبلی‌"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "رفتن به پوشه قبلی دارای پیامهای خوانده‌نشده"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "&متن خوانده‌نشدهبعدی‌"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "رفتن به متن خوانده‌نشده بعدی"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4760,187 +4776,187 @@
 "لغزاندن به پایین پیام جاری. اگر به پایان پیام جاری رسیدید، به پیام "
 "خوانده‌نشده بعدی بروید."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "پیکربندی &پالایه‌ها...‌"
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "مدیریت دست‌نوشته‌های &غربالی...‌"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "افزودن حساب"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&مقدمه KMail‌"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "نمایش صفحه خوش‌آمد گویی KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "پیکربندی &اخطارها...‌"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&پیکربندی KMail...‌"
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "انقضا..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "Add Favorite Folder..."
 msgstr "پوشه &جدید...‌"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Serverside Subscription..."
 msgstr "اشتراک..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "&اعمال همه پالایه‌ها‌"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "&پیکربندی KMail...‌"
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "&Address Book..."
 msgid "New AddressBook Contact..."
 msgstr "کتاب &نشانی...‌"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "رونوشت پیام در پوشه"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to Folder..."
 msgstr "پرش به پوشه"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "ساقط کردن عمل جاری"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "تمرکز بر پوشه بعدی"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "تمرکز بر پوشه قبلی"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "گزینش پوشه با تمرکز"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "تمرکز بر پوشه بعدی"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "تمرکز بر پوشه بعدی"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "تمرکز بر پیام بعدی"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "تمرکز بر پیام قبلی"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "برگزیدن &تمام پیامها‌"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "برگزیدن &تمام پیامها‌"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "گزینش پیام با تمرکز"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, fuzzy, kde-format
 #| msgid "Show Quick Search"
 msgid "Set Focus to Quick Search"
 msgstr "نمایش جستجوی سریع"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, fuzzy, kde-format
 #| msgid "Focus on Previous Message"
 msgid "Extend Selection to Previous Message"
 msgstr "تمرکز بر پیام قبلی"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, fuzzy, kde-format
 #| msgid "Focus on Next Message"
 msgid "Extend Selection to Next Message"
 msgstr "تمرکز بر پیام بعدی"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "حرکت پیام به پوشه"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message W&indow"
 msgid "Use Less Bandwidth"
 msgstr "&پنجره پیام‌"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
@@ -4948,54 +4964,60 @@
 
 #: kmmainwidget.cpp:3590
 #, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "نام هویت"
+
+#: kmmainwidget.cpp:3601
+#, fuzzy, kde-format
 #| msgid "Paste Folder"
 msgid "Add Favorite Folder"
 msgstr "چسباندن پوشه"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&خالی کردن زباله‌"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&حرکت همه پیامها به زباله‌"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&حذف جستجو‌"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "ویرایش دست‌نوشته..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "پالایه %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "آغاز..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -5006,12 +5028,12 @@
 "احتمال این که سیستمتان با اعمال امنیتی کنونی و پیش‌بینی شده سازش یابد، افزایش "
 "یابد."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "استفاده از زنگام"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -5021,194 +5043,194 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "&لغو‌"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "آغاز..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&حرکت به زباله‌"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "زباله"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "حرکت پیام به زباله‌دان"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Move Messages to Folder"
 msgid "Cannot copy item. %1"
 msgstr "حرکت دادن پیامها به پوشه"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "پیام جدید به..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "پاسخ به..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "پیش‌سو به..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Add to Existing Contact"
 msgstr "قادر به ویرایش پیوست نیست"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "باز کردن در کتاب نشانی"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "چوب الف کردن این پیوند"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit With..."
 msgid "Edit contact..."
 msgstr "ویرایش با..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "ذخیره پیوند به عنوان..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&یافتن در پیام...‌"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "ذخیره پیوند به عنوان..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Use HTML"
 msgid "Show HTML Format"
 msgstr "استفاده از زنگام"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 #| msgid "Load external references from the Internet for this message."
 msgid "Load external reference when mail comes for this contact"
 msgstr "بار کردن مرجعهای خارجی از اینترنت برای این پیام."
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "ذخیره پیوند به عنوان..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "پشتیبانی GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "تأیید &پیش از ارسال‌"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "کارخواه رایانامه KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folderlist"
 msgid "Retrieving Folder Contents"
 msgstr "بازیابی فهرست پوشه"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "لطفاً، صبر کنید"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "برون‌خط"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5221,7 +5243,7 @@
 "<h2 style='margin-top: 0px;'>برون‌خط</h2><p>در حال حاضر، KMail در حالت برون‌خط "
 "است. <a href=\"kmail:goOnline\">اینجا</a> را فشار دهید تا برخط شود . . .</p> "
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5234,24 +5256,24 @@
 "<h2 style='margin-top: 0px;'>برون‌خط</h2><p>در حال حاضر، KMail در حالت برون‌خط "
 "است. <a href=\"kmail:goOnline\">اینجا</a> را فشار دهید تا برخط شود . . .</p> "
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Contact modified successfully"
 msgstr "پیامها با موفقیت منتقل شدند"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "پیامهای جدید در"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, fuzzy, kde-format
 #| msgid "There are no unread messages"
 msgid "There are no unread messages"
 msgstr "پیام خوانده‌نشده‌ای وجود ندارد"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, fuzzy, kde-format
 #| msgid "Unread Message"
 msgid "1 unread message"
@@ -5274,8 +5296,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5369,18 +5391,18 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "تماسها"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5429,27 +5451,27 @@
 msgid "All"
 msgstr "همه"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5478,7 +5500,7 @@
 msgid "&Reply"
 msgstr "&پاسخ‌"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&پاسخ...‌"
@@ -5488,12 +5510,12 @@
 msgid "Reply to A&uthor..."
 msgstr "پاسخ به &نویسنده...‌"
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "پاسخ به &همه...‌"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "پاسخ به &فهرست نامه...‌"
@@ -5525,7 +5547,7 @@
 msgid "&Edit As New"
 msgstr "&ویرایش پیام‌"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5735,120 +5757,120 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "یافتن پیامها"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&جستجو‌"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, fuzzy, kde-format
 #| msgid "&Inline..."
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&درون‌برنامه‌ای‌"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "به عنوان &پیوست...‌"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "ذخیره پیوستها..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "پاک کردن گزینش"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "پرش به پوشه"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 تطبیق"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "آخرین جستجو"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 #| msgid "Could not sync maildir folder."
 msgid "You did not selected a valid folder."
 msgstr "پوشه maildir را نمی‌توان همگام‌سازی کرد."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "آغاز..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Can not get search result. %1"
 msgid "Cannot get search result. %1"
 msgstr "عدم توانایی در دریافت نتیجه‌ی جستجو. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "جستجو لغو شد"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid " Spell check complete."
 msgid "Search complete."
 msgstr "غلط‌گیری کامل می‌شود."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid " Spell check stopped."
 msgid "Search stopped."
 msgstr "غلط‌گیری متوقف می‌شود."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, fuzzy, kde-format
 #| msgid ""
 #| "There was a problem renaming your search folder. A common reason for this "
@@ -5861,21 +5883,21 @@
 "مشکلی در تغییر نام پوشه‌ی جستجوی شما وجود دارد. یک دلیل برای این مشکل می‌تواند "
 "وجود پوشه‌ی جستجوی دیگری با نام مشابه باشد."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, fuzzy, kde-format
 #| msgid "Copy Messages"
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "رونوشت پیامها"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, fuzzy, kde-format
 #| msgid "Cut Messages"
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "برش پیامها"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -6004,7 +6026,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -6012,7 +6034,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -6022,20 +6044,20 @@
 "نمایش داده شود."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 #| msgid "Show quick search line edit"
 msgid "Show folder quick search line edit"
 msgstr "نمایش ویرایش خط جستجوی سریع"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Warn if the number of recipients is more than:"
@@ -6043,7 +6065,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -6052,20 +6074,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "تأیید &پیش از ارسال‌"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "درخواست خودکار اخطارهای وضع &پیام‌"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -6081,13 +6103,13 @@
 "کنید.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "فاصله ذخیره خودکار:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -6099,157 +6121,157 @@
 "مقدار ۰ برای این، می‌توانید ذخیره خودکار را غیرفعال کنید."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 #| msgid "Show crypto &icons"
 msgid "Show crypto label indicator"
 msgstr "نمایش &شمایلهای رمز‌"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "پنجرک پیش‌نمایش پیام"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, fuzzy, kde-format
 #| msgid "&Do not show a message preview pane"
 msgid "Do not show a message preview pane"
 msgstr "&عدم نمایش پنجرک پیش‌نمایش پیام‌"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane belo&w the message list"
 msgid "Show the message preview pane below the message list"
 msgstr "نمایش پنجرک پیش‌نمایش پیام &در زیر فهرست پیام‌"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane ne&xt to the message list"
 msgid "Show the message preview pane next to the message list"
 msgstr "نمایش پنجرک پیش‌نمایش پیام &مجاور فهرست پیام‌"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "فهرست پوشه"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, fuzzy, kde-format
 #| msgid "Lon&g folder list"
 msgid "Long folder list"
 msgstr "فهرست پوشه &طولانی‌"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, fuzzy, kde-format
 #| msgid "Shor&t folder list"
 msgid "Short folder list"
 msgstr "فهرست پوشه &کوتاه‌"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "قالب پیام برای پیام جدید"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "قالب پیام برای پاسخ"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "قالب پیام برای پاسخ به همه"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "قالب پیام برای پیش‌سو کردن"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "نویسه‌های نقل قول"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6257,7 +6279,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6265,7 +6287,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6273,7 +6295,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6281,7 +6303,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6289,7 +6311,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6577,7 +6599,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6947,10 +6969,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check &Mail"
-msgid "Check Mail Url Tracking"
-msgstr "بررسی &نامه‌"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7636,6 +7657,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "فعال‌سازی مجدد همه اخطارهای »دوباره نپرس«"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7696,6 +7727,11 @@
 msgid "Zoom: %1%"
 msgstr "بزرگ‌نمایی"
 
+#, fuzzy
+#~| msgid "Check &Mail"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "بررسی &نامه‌"
+
 #~ msgid "&Reply to:"
 #~ msgstr "&پاسخ به:‌"
 
@@ -11223,11 +11259,6 @@
 #~ msgstr "استفاده از هویت &پیش‌فرض‌"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "نام هویت"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "&کارساز، از غربال پشتیبانی می‌کند‌"
@@ -13296,12 +13327,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "در حال باز کردن نشانی وب..."
 
-#, fuzzy
-#~| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "<qt>واقعاً می‌خواهید <b>%1</b> را اجرا کنید؟</qt>"
-
 #~ msgid "Execute"
 #~ msgstr "اجرا کردن"
 
diff -Nru kmail-19.04.3/po/fi/akonadi_archivemail_agent.po kmail-19.12.3/po/fi/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/fi/akonadi_archivemail_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fi/akonadi_archivemail_agent.po	2020-03-03 00:34:01.000000000 +0000
@@ -2,12 +2,12 @@
 # Author: Smar
 # Jiri Grönroos <jiri.gronroos+kde@iki.fi>, 2012.
 # Lasse Liehu <lasse.liehu@gmail.com>, 2012, 2013, 2014, 2015, 2016.
-# Tommi Nieminen <translator@legisign.org>, 2012, 2017, 2018, 2019.
+# Tommi Nieminen <translator@legisign.org>, 2012, 2017, 2018, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-02-19 11:24+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-POT-Import-Date: 2012-12-01 22:24:50+0000\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: addarchivemaildialog.cpp:44
@@ -182,12 +182,12 @@
 "Tähän kansioon ei voi lisätä toista arkistoa. Muuta sen sijaan "
 "olemassaolevaa."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Kansiota ei ole olemassa. Tarkista asetukset. Arkistointia lykättiin."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Käynnistä arkistointi: %1"
diff -Nru kmail-19.04.3/po/fi/akonadi_followupreminder_agent.po kmail-19.12.3/po/fi/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/fi/akonadi_followupreminder_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fi/akonadi_followupreminder_agent.po	2020-03-03 00:34:01.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 # Lasse Liehu <lasse.liehu@gmail.com>, 2014, 2015, 2016.
-# Tommi Nieminen <translator@legisign.org>, 2014, 2017, 2018, 2019.
+# Tommi Nieminen <translator@legisign.org>, 2014, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2019-02-19 11:05+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -16,99 +16,99 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Vastaamisen seurannasta muistuttaja"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Vastaamisen seurannasta muistuttaminen"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Tekijänoikeudet © 2014–2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Ylläpitäjä"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Lasse Liehu"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "lasse.liehu@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Aihe"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Määräaika"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Vastaus"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Vastaanotettu"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Pidossa"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Näytä viesti"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Poista"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Haluatko poistaa valitun kohteen?"
 msgstr[1] "Haluatko poistaa valitut %1 kohdetta?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Vastaanotettu vastaus lähettäjältä %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Odotat vielä vastausta tähän postiin:"
diff -Nru kmail-19.04.3/po/fi/akonadi_mailfilter_agent.po kmail-19.12.3/po/fi/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/fi/akonadi_mailfilter_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fi/akonadi_mailfilter_agent.po	2020-03-03 00:34:01.000000000 +0000
@@ -1,6 +1,6 @@
 # Copyright © 2012 This_file_is_part_of_KDE
 # This file is distributed under the same license as the kdepim package.
-# Tommi Nieminen <translator@legisign.org>, 2012, 2013, 2018.
+# Tommi Nieminen <translator@legisign.org>, 2012, 2013, 2018, 2020.
 # Lasse Liehu <lasse.liehu@gmail.com>, 2012, 2013, 2014.
 #
 # KDE Finnish translation sprint participants:
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-11-21 17:08+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -20,24 +20,24 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-POT-Import-Date: 2012-12-01 22:24:50+0000\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #: filterlogdialog.cpp:67
 #, kde-format
 msgid "Filter Log Viewer"
 msgstr "Suodatinlokikatselin"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Jaa…"
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Kirjaa suodatustapahtumat &lokiin"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -46,23 +46,23 @@
 "Tässä voit ottaa suodatustapahtumien kirjauksen lokiin käyttöön tai poistaa "
 "sen käytöstä."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Kirjaamisen yksityiskohdat"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Lokihahmon kuvaus"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Kirjaa lokiin &suodinsääntöjen suoritus"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -76,34 +76,34 @@
 "kustakin yksittäisestä suodinsäännöstä, muuten kerrotaan vain yksittäisen "
 "suotimen kaikkien sääntöjen tulos."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Kirjaa lokiin suodinhahmojen suoritus"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Kirjaa lokii suotimen toiminnot"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Lokikoon rajoitus:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " kt"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "ei rajoitusta"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -116,7 +116,7 @@
 "kerätyn lokitiedon koko ylittää tämän rajan, vanhimpia tietoja hylätään, "
 "kunnes raja ei enää ylity. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -125,64 +125,64 @@
 "Ei voitu kirjoittaa tiedostoon %1:\n"
 "”%2” on virheen yksityiskohtainen kuvaus."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-virhe"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Suodatetaan viestiä %1/%2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Virhe toteutettaessa postisuodattimen siirtoa"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Virhe toteutettaessa postisuodattimen poistoa"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Virhe toteutettaessa postisuodattimen muutoksia"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Suoritetaan suodatussääntöjä:</b>"
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Suodatussäännöissä on osumia.</b>"
 
 # %1 on viestin aihe, %2 on sen lähettäjä, %3 on viestin päiväys (date)
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Ala suodattaa viestiä ”%1” lähettäjältä ”%2” ajalta ”%3”:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Suodatetaan viestejä"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Sähköpostisuodinloki käytössä"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Valmis"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Suodatetaan: %1"
diff -Nru kmail-19.04.3/po/fi/akonadi_sendlater_agent.po kmail-19.12.3/po/fi/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/fi/akonadi_sendlater_agent.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/fi/akonadi_sendlater_agent.po	2020-03-03 00:34:01.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 # Lasse Liehu <lasse.liehu@gmail.com>, 2013, 2014, 2015, 2016.
-# Tommi Nieminen <translator@legisign.org>, 2017, 2018, 2019.
+# Tommi Nieminen <translator@legisign.org>, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2019-02-19 11:05+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 # Ikkunan otsikko
 #: sendlaterconfiguredialog.cpp:37
@@ -61,124 +61,124 @@
 msgid "Your emails"
 msgstr "lasse.liehu@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Aihe"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Lähetä suunnilleen"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Toistuu"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Viestin tunniste"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Ei viestejä odottamassa…"
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Lähetä heti"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Poista"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Kyllä"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Ei"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Haluatko poistaa valitun tietueen?"
 msgstr[1] "Haluatko poistaa valitut tietueet?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Poista tietueet"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Haluatko poistaa myös viestit?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Poista viestit"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Viestiä ei löytynyt."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Viestiä ei löytynyt."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Virhe noudettaessa viestiä."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Viestiä ei saatu noudettua. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Postinvälitystä ei saatu luotua."
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Viesti ei ole oikea viesti"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Viestin lähettäminen epäonnistui."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Löytyi virhe. Haluatko lähettää kohteen uudelleen?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Löytyi virhe"
diff -Nru kmail-19.04.3/po/fi/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/fi/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/fi/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fi/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:01.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the kmail package.
-# Tommi Nieminen <translator@legisign.org>, 2018.
+# Tommi Nieminen <translator@legisign.org>, 2018, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-21 18:27+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #: settingsdialog.cpp:63
 #, kde-format
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Synkronoidaan yhdistettyä postilaatikkoa %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Lisää yhdistetty postilaatikko"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nimi:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Valitse kuvake…"
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Kuvake:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Saapuva"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Lähetetty"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Luonnokset"
diff -Nru kmail-19.04.3/po/fi/kmail.po kmail-19.12.3/po/fi/kmail.po
--- kmail-19.04.3/po/fi/kmail.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/fi/kmail.po	2020-03-03 00:34:01.000000000 +0000
@@ -14,7 +14,7 @@
 # Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2007.
 # Mikko Piippo <piippo@cc.helsinki.fi>, 2007.
 # Tommi Nieminen <translator@legisign.org>, 2009, 2010, 2011.
-# Tommi Nieminen <translator@legisign.org>, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2019.
+# Tommi Nieminen <translator@legisign.org>, 2010, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020.
 # Lasse Liehu <lasse.liehu@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
 # Jiri Grönroos <jiri.gronroos+kde@iki.fi>, 2012.
 # Niklas Laxström <niklas.laxstrom+kdetrans@gmail.com>, 2012.
@@ -22,8 +22,8 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-05-10 17:41+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2020-01-01 13:10+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
 "Language: fi\n"
@@ -32,7 +32,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-POT-Import-Date: 2013-01-13 20:43:22+0000\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -53,7 +53,7 @@
 #, kde-format
 msgctxt "%1 is version"
 msgid "Welcome to KMail %1"
-msgstr "Tervetuloa KMail %1:een"
+msgstr "Tervetuloa KMailin versioon %1"
 
 #: about/introduction_kmail.html:7
 msgid ""
@@ -61,16 +61,16 @@
 "Internet mailing standards including IMAP, POP3 and SMTP."
 msgstr ""
 "KMail on KDE:n kehittämä sähköpostiohjelma. Se on suunniteltu täysin "
-"yhteensopivaksi internetin sähköpostistandardien, kuten IMAP, POP3 ja SMTP, "
-"kanssa."
+"yhteensopivaksi internetin sähköpostistandardien kuten IMAPin, POP3:n ja "
+"SMTP:n kanssa."
 
 #: about/introduction_kmail.html:10
 msgid ""
 "KMail has many powerful features that are described in the <a href='help:/"
 "kmail2/index.html'>documentation</a>."
 msgstr ""
-"KMailissa on monia tehokkaita ominaisuuksia, joista voit lukea <a "
-"href='help:/kmail/index.html'>käyttöohjeesta</a>."
+"KMailissa on monia teho-ominaisuuksia, joista voit lukea <a href='help:/"
+"kmail/index.html'>käyttöohjeesta</a>."
 
 #: about/introduction_kmail.html:16
 msgid "Important changes since last version:"
@@ -205,8 +205,8 @@
 # pmap: =/gen=KMailin/
 # pmap: =/elat=KMailista/
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -312,27 +312,27 @@
 "KMail ei täysin tunnistanut tästä kansiosta postituslistoja. Kirjoita "
 "osoitteet käsin."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Tilarajoitus"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Tila:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p % täynnä"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1/%2 käytössä"
@@ -354,7 +354,7 @@
 "paina alla olevaa painiketta ja syötä haluamasi näppäinyhdistelmä.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Viestipohjat"
@@ -365,106 +365,106 @@
 msgstr "&Käytä mukautettuja viestipohjia tässä kansiossa"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopioi järjestelmänlaajuiset viestipohjat"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Näkymä"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Käytä omia &kuvakkeita"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normaali:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "L&ukematta:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Näytä Lähettäjä/Vastaanottaja -sarake viestiluettelossa"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Näytä sarake:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Oletus"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Vastaanottaja"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Viestiluettelo"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Käytä oletuskoontaa"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Koonta"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Käytä oletusteemaa"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Teema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Viestien oletusmuoto"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Suosi HTML-muotoa tekstin sijaan"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Suosi tekstiä HTML:n asemesta"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Käytä järjestelmän asetuksia"
@@ -474,100 +474,105 @@
 msgid "Retrieval Options"
 msgstr "Noutoasetukset"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Henkilöydet"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Saapuva"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Lähtevä"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "LDAP-palvelin"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Lähtevien viestien tilit (lisää ainakin yksi):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Yleisasetukset"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Pyydä vahvistus ennen lähettämistä"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Tarkista oikeinkirjoitus ennen lähettämistä"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Älä koskaan lähetä automaattisesti"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Käsin tehtävän postintarkistuksen yhteydessä"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Aina postia tarkistettaessa"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Lähetä heti"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Lähetä myöhemmin"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "&Lähetä lähtevät-kansiossa olevat viestit:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Oletus&lähetystapa:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Käytä lähetyksen perumista"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Lisää sähköpostitili.."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Mukautettu tili…"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -576,30 +581,30 @@
 "Opastettua tilin luontia ei voitu käynnistää. Varmista, että se on asennettu "
 "oikein."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Opastettua tilin luontia ei voida käynnistää"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Sisällytä käsin tehtyyn tarkastukseen"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Siirry verkottomaan tilaan KMailia lopetettaessa"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Tarkista posti käynnistettäessä"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -657,10 +662,10 @@
 msgid "Fixed Width Font"
 msgstr "Tasavälinen fontti"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
-msgstr "Viestin kirjoittaminen"
+msgstr "Kirjoitusikkuna"
 
 #: configuredialog/configureappearancepage.cpp:146
 #, kde-format
@@ -960,61 +965,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Tunnistetta ei voi luoda. Samanniminen tunniste on jo olemassa."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
-msgstr "Yleistä"
+msgstr "Perusasetukset"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Vakioviestipohjat"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Mukautetut viestipohjat"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Aihe"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "&Merkistö"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Otsakkeet"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "&Liitteet"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Automaattikorjaus"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Kuvien koon muuttaminen"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Allekirjoitus"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1023,12 +1028,12 @@
 "Lisää allekirjoitus automaattisesti\n"
 "aloitettaessa kirjoittaa viestiä"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Lisää allekirjoitus kaiken lainatun tekstin yläpuolelle"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1037,18 +1042,18 @@
 "Lisää RFC-yhteensopiva allekirjoituksen erotin\n"
 "(kahden viivan ja yhden välilyönnin rivi) ennen allekirjoitusta"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Vastattaessa viestiin älä lainaa olemassa olevia allekirjoituksia"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Muotoilu"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1059,7 +1064,7 @@
 "koko viestin sijaan, jos viesti-ikkunassa\n"
 "on tekstiä valittuna."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1070,17 +1075,17 @@
 "alkuun silloinkin, kun rivi on luotu lisäämällä ylimääräinen rivinvaihto\n"
 "tekstiä rivitettäessä."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Rivitä teksti sanaväleistä automaattisesti määrättyyn leveyteen"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Aseta automaattisen rivityksen käyttämä tekstin leveys"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1092,7 +1097,7 @@
 "jollei valittu, vastaus on oletusarvoisesti\n"
 "muotoilematonta tekstiä."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1103,34 +1108,34 @@
 "Lihavointia, kursivointia, alleviivattua tekstiä, luetteloita ja\n"
 "ulkoisia viittauksia tuetaan."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Sisällytettynä"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Liitteenä"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Aseta välitetyn viestin oletusmuoto"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Oletusarvoinen välitystapa:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1141,17 +1146,17 @@
 "Voit valita tämän viestikohtaisesti valitsemalla valikosta Valinnat – Pyydä "
 "vastaanottokuittaus"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Varoita, jos vastaanottajia on liikaa"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Aseta vastaanottajien enimmäismäärä varoitusta varten"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1169,7 +1174,7 @@
 "liian monille henkilöille. Huomaa kuitenkin,\n"
 "että tämä ei ota huomioon jakelu- tai postituslistoja."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1178,18 +1183,18 @@
 "Muista viimeksi kirjoitetut osoitteet\n"
 "ja ehdota niitä vastaanottajiksi"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Ei tallennusta"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Viimeaikaisten tallennettujen osoitteiden enimmäismäärä:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1198,23 +1203,23 @@
 "Täydennystä varten muistettavien\n"
 "viimeaikaisten osoitteiden enimmäismäärä"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Muokkaa täydennyksen asetuksia…"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Automaattitallennus"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Ei automaattitallennusta"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1222,18 +1227,18 @@
 msgstr[0] " minuutti"
 msgstr[1] " minuuttia"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Tallenna viesti automaattisesti annetun ajan välein"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "&Vastausviestin otsikon etuliitteet"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1242,59 +1247,59 @@
 "Tunnista seuraavat etuliitteet (mallit ovat\n"
 "kirjainkokoriippumattomia säännöllisiä lausekkeita)"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Lisää…"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Poista"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Muuta…"
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Anna uusi vastausetuliite:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "&Välitetyn viestin otsikon etuliitteet"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Lisää…"
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Poista"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Muuta…"
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Anna uusi välitysetuliite"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1305,88 +1310,88 @@
 "tarvittavat merkit löytyvät."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Muuta…"
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Merkistön määrittely:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Käytä alkuperäistä merkistöä kun vastataan tai välitetään (jos mahdollista)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Tätä merkistöä ei tueta."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Käytä omaa Message-Id-päätettä:"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Oma Message-&Id-pääte:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Määrittele omat MIME-otsikot:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nimi"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Arvo"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Uusi"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nimi:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "Ar&vo:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr "”Content-Type” ei ole valtuutettu merkkijono. Otsaketta ei tallenneta."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Virheellinen otsake"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-yhteensopiva liitteiden nimeäminen"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1395,40 +1400,40 @@
 "Käytä tätä asetusta jos haluat Outlookin(tm) ymmärtävän liitteet joiden "
 "nimissä on muita kuin englannin kielen merkkejä."
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Tunnista puuttuvat liitteet"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Tunnista mikä tahansa seuraavista avainsanoista tarkoituksena lähettää "
 "tiedostoliite:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Anna uusi avainsana:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Liitteen enimmäiskoko:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kt"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Ei rajoitusta"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1517,8 +1522,8 @@
 # *** TARKISTA: convertor text on käsittämätön, ja tämä on kaikissa .po-tiedostoissa sen ainoa esiintymä
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "Muunnostekstiliitännäiset"
+msgid "Text Conversion Plugins"
+msgstr "Tekstimuunnosliitännäiset"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1629,7 +1634,7 @@
 msgid "Archive Folder"
 msgstr "Arkistoi kansio"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1695,19 +1700,19 @@
 msgid "Notification"
 msgstr "Ilmoitus"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 liite (%2)"
 msgstr[1] "%1 liitettä (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Piilota liitteiden luettelo"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Näytä liitteiden luettelo"
@@ -1724,329 +1729,329 @@
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Valitse viestiä oikoluettaessa käytettävä sanasto"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Valitse lähteneiden kansio, johon viestin kopio tallennetaan"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Valitse viestiä lähetettäessä käytettävä lähetystili"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Aseta tämän viestin lähettäjäosoite"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Aseta tämän viestin aihe"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Henkilöys:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "Sana&kirja:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Lähetettyjen &kansio:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Postinvälitys:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Lähettäjä:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Aihe:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Lähetä sähköposti"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Lähetä sähköposti käyttäen"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Lähetä"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Lähetä &myöhemmin"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Lähetä &myöhemmin käyttäen"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Pane jonoon"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Tallenna &luonnokseksi"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Tallenna viesti luonnoskansioon"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Tallenna &viestipohjaksi"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Tallenna viesti viestipohjakansioon"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Tallenna tiedostoksi"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Tallenna viesti teksti- tai HTML-tiedostoksi"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Lisää &tekstitiedosto…"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "L&isää viimeaikainen tekstitiedosto"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Osoitekirja"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Avaa osoitekirja"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Uusi viesti"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Valitse &vastaanottajat…"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Talleta &jakelulista…"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Liitä liit&teeksi"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "P&uhdista välilyönnit"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "K&äytä tasavälistä fonttia"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "K&iireinen"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Pyydä vastaanottokuittaus"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "&Pyydä vastaanottokuittausta"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Rivitys"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "L&eikkeet"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automaattinen oikoluku"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Muotoillun tekstin muokkaus"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Muotoiltu teksti"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Ota muotoillun tekstin muokkaustila käyttöön tai poista se käytöstä"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Kaikki kentät"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Henkilöys"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Sanakirja"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Lähetettyjen &kansio"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Postinvälitys"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Lähettäjä"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Aihe"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Liitä &allekirjoitus"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Lisää allekirjoitus e&delle"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Lisää &allekirjoitus kohdistimen kohdalle"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Oikoluku…"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Oikoluku"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Salaa viesti"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Salaus"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Allekirjoita viesti"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Allekirjoita"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Viestien salausmuoto"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Aseta tämän viestin salaustapa"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Lisää vastaamisen seurannasta muistuttaja…"
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMailin asetukset…"
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2055,53 +2060,53 @@
 "<qt>Tämä piilottaa valikkorivin kokonaan. Saat sen uudelleen näkyviin "
 "painamalla %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Piilota valikkorivi"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Rivi: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Sarake: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "KOR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "LIS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Oikoluku: käytössä"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Oikoluku: ei käytössä"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "&Tallenna uudestaan viestipohjana"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Tallenna luonnoksena"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2110,7 +2115,7 @@
 "Tallenna tämä viesti taas viestipohjakansioon, mistä sen saa "
 "käyttöönmyöhemmin."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2119,82 +2124,82 @@
 "Tallenna viesti luonnoskansioon, missä sitä voi muokata ja sen voi lähettää "
 "myöhemmin."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Haluatko tallentaa viestin, vai hylätä muutokset?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
-msgstr "Sulje viestin kirjoitus"
+msgstr "Sulje kirjoitusikkuna"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Viestin automaattitallennus epäonnistui"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Viestin lähetys epäonnistui"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Lisää tiedosto"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Lisää &sisällytettynä kuvana"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Lisää liitteenä"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Liitteen nimi:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Liitteen nimi ei voi olla tyhjä"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Virheellinen liitteen nimi"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Lisää osoite viestiin"
 msgstr[1] "Lisää osoitteet viestiin"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Lisää tiedosto &liitteeksi"
 msgstr[1] "Lisää tiedostot &liitteeksi"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Liitä teksti leikepöydältä liitteeksi"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "nimetön"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2206,12 +2211,12 @@
 "henkilöydellesi ei ole määritelty salausavainta (OpenPG tai S/MIME).</"
 "p><p>Valitse käytettävä avain tai avaimet henkilöyden asetuksissa.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Määrittelemätön salausavain"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2222,12 +2227,12 @@
 "tähän tarkoitukseen käytettävä salausavain (OpenPGP tai S/MIME).</"
 "p><p>Valitse käytettävä avain henkilöysasetuksissa.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Määrittelemätön allekirjoitusavain"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2238,7 +2243,7 @@
 "henkilöyden sähköpostiosoite olisi hyvä määrittää, jottei sitä tarvitse "
 "kirjoittaa erikseen kuhunkin viestiin."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2247,37 +2252,37 @@
 "Sinun on määritettävä ainakin yksi vastaanottaja vastaanottaja-, kopio- tai "
 "piilokopiokenttään."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Et määrittänyt vastaanottaja-kenttää. Lähetäänkö viesti silti?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Ei vastaanottajaa"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Et antanut viestin otsikkoa. Lähetetäänkö viesti silti?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Aihetta ei annettu"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&Lähetä sellaisenaan"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Määrittele otsikko"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2286,22 +2291,22 @@
 "Sinun on määritettävä vähintään yksi vastaanottaja voidaksesi salata "
 "luonnoksen."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Lähetetään sähköpostia…"
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Lähettämisen vahvistus"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Lähetä heti"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2309,22 +2314,22 @@
 msgstr ""
 "Yrität lähettää viestin yli %1 vastaanottajalle. Lähetetäänkö viesti silti?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Liikaa vastaanottajia"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Lähetä sellaisenaan"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Muokkaa vastaanottajia"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2332,22 +2337,22 @@
 msgstr ""
 "HTML-tilan poistaminen käytöstä hylkää tekstin muotoilun. Oletko varma?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Hylätäänkö muotoilu?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Hylkää muotoilu"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Lisää tunniste raakatekstiin"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2356,7 +2361,7 @@
 "Tälle vastaanottajalle käytetään vahvaa salausta (salausavaimeen luotetaan "
 "täysin). Saat lisätietoa napsauttamalla kuvaketta."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2365,7 +2370,7 @@
 "Tälle vastaanottajalle käytetään keskivahvaa salausta (salausavaimeen "
 "luotetaan ehdollisesti). Saat lisätietoa napsauttamalla kuvaketta."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2374,7 +2379,7 @@
 "Tälle vastaanottajalle käytetään heikkoa salausta (salausavain on "
 "epäluotettava). Saat lisätietoa napsauttamalla kuvaketta."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2386,7 +2391,7 @@
 "napsauttamalla kuvaketta."
 
 # *** TARKISTA: ID merkitykseltään epäselvä
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Liitännäismuokkaimen tiedot"
@@ -2463,25 +2468,25 @@
 msgid "External editor was started."
 msgstr "Käynnistettiin ulkoinen muokkain."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr "Postinvälitystä ei löytynyt. Tarkista, että se on asetettu oikein."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Lähettyjen viestin kansiota ei ole asetettu. Aseta se ennen lähetystä."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Henkilöyttä ei löytynyt. Tarkista, että se on asetettu oikein."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2508,11 +2513,6 @@
 msgid "Message will not be encrypted"
 msgstr "Viestiä ei salata"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Leikkeet"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2558,27 +2558,27 @@
 msgid "Cannot move messages."
 msgstr "Viestejä ei voi siirtää."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Kansion noutaminen epäonnistui. Virheilmoitus: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Mitään kansiota ei palautettu."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Yläkansion noutaminen epäonnistui. Virheilmoitus: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Kansioluettelon palauttaminen epäonnistui."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Viestit arkistoitiin"
@@ -2619,48 +2619,48 @@
 msgid "&Existing identities:"
 msgstr "&Olemassa olevat henkilöydet:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Virhe luotaessa uutta avainparia: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Avaimen luontivirhe"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Ei avainta"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Luo uusi avainpari"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Luodaan uutta avainparia…"
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Muokkaa henkilöyttä"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Yleistä"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Nimi:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2671,12 +2671,12 @@
 "lähetetyisä viesteissä.</p><p>Jos jätät tämän tyhjäksi, vain "
 "sähköpostiosoite näytetään vastaanottajalle.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&saatio:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2687,12 +2687,12 @@
 "haluat sen näkyvän lähtevien viestien otsikkotiedoissa.</p><p>Kohdan voi "
 "jättää tyhjäksi.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Sähköpostiosoite:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2707,12 +2707,12 @@
 "aliaksia alla olevaan kenttään.</p><p>Jos jätät kentän tyhjäksi tai sen "
 "sisältö on virheellinen, sinulle on vaikea sähköpostitse vastata.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Sähköposti&aliakset:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2729,12 +2729,12 @@
 "th><td>etunimi@esimerkki.org<br>sukunimi@esimerkki.org</td></tr></"
 "table><p>Kirjoita vain yksi alias kullekin riville.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "&Salaus"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2750,12 +2750,12 @@
 "asetuksella ei ole vaikutusta.</p><p>Lisätietoa salausavaimista löytyy "
 "osoitteesta <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-allekirjoitusavain:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2772,12 +2772,12 @@
 "sähköpostitoimintoihin tällä ei ole vaikutusta.</p><p>Lisätietoa "
 "salausavaimista löytyy osoitteesta <a>https://www.gnupg.org/</a>. </p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-salausavain:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2790,12 +2790,12 @@
 "sähköpostiviestejä ei tällöin pystytä allekirjoittamaan S/MIMEllä. "
 "Tavallisiin sähköpostitoimintoihin tällä ei ole vaikutusta.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-allekirjoitusvarmenne:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2810,39 +2810,39 @@
 "salaamaan kopiota itsellesi. Tavallisiin sähköpostitoimintoihin tällä ei ole "
 "vaikutusta.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-salausvarmenne:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Ensisijainen muoto:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Allekirjoita viestit automaattisesti"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Salaa viestit automaattisesti aina kun mahdollista"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "&Lisäasetukset"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Vastausosoite:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2860,12 +2860,12 @@
 "menevät ryhmäosoitteeseen.</p> <p>Jos et ole varma, mitä tähän tulisi "
 "lisätä, jätä kohta tyhjäksi.</p></qt> "
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&Kopio-osoitteet:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2880,12 +2880,12 @@
 "p><p>Tätä käytetään tavallisesti välittämään kopio lähetetyistä viesteistä "
 "toiselle tilillesi.</p><p>Ellet ole varma, jätä kohta tyhjäksi.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Piilokopio-osoitteet:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2903,57 +2903,57 @@
 "vastaanottajat toisistaan pilkuin.</p><p>Ellet ole varma, jätä kohta "
 "tyhjäksi.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Sana&kirja:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Lähetettyjen &kansio:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Luonnosten kansio:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Viestipohjien kansio:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Lähtevä tili:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Liitä vCardini viestiin"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Luo…"
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Automaattikorjauksen kieli:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Palauta oletustoimialue"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Olet&ustoimialue:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2962,33 +2962,33 @@
 "<qt><p>Oletustoimialueen avulla voidaan täydentää sähköpostiosoitteita, "
 "joissa on pelkästään käyttäjän nimi.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "M&ukauta tämän henkilöyden viestipohjia"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Allekirjoitus"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Kuva"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Virheellinen sähköpostialias ”%1”"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Virheellinen sähköpostiosoite"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3001,7 +3001,7 @@
 "Tästä johtuen näillä asetuksilla allekirjoitettujen viestien vastaanottaja "
 "saattaa saada varoituksia."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3010,7 +3010,7 @@
 "Jokin valituista OpenPGP-salausavaimista ei sisällä yhtään "
 "käyttäjätunnistetta asetetulla sähköpostiosoitteella (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3023,7 +3023,7 @@
 "Tästä johtuen näillä asetuksilla allekirjoitettujen viestien vastaanottaja "
 "saattaa saada varoituksia."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3032,22 +3032,22 @@
 "Jokin valituista S/MIME-salausvarmenteista ei sisällä yhtään "
 "käyttäjätunnistetta asetetulla sähköpostiosoitteella (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Sähköpostiosoitetta ei löydy avaimesta/varmenteesta"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Allekirjoitustiedosto ei kelpaa."
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Muokkaa henkilöyttä ”%1”"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3056,7 +3056,7 @@
 "Joitain henkilöyden omia kansioita ei ole (enää) olemassa. KMail käyttää "
 "siis oletuskansioita."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Muokkaa…"
@@ -3087,6 +3087,18 @@
 msgid "We cannot delete vCard file."
 msgstr "vCard-tiedostoa ei voi poistaa."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Haluatko varmasti perua?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Vahvistus"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3248,7 +3260,7 @@
 "Esimerkkejä löytyy osoitteesta <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Kuva"
@@ -3281,7 +3293,7 @@
 msgstr[0] "Jakelulista ”%2” on tyhjä eikä sitä voi käyttää."
 msgstr[1] "Jakelulistat ”%2” ovat tyhjiä eikä niitä voi käyttää."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Lisää osoitekirjaan"
@@ -3291,22 +3303,22 @@
 msgid "Contact created successfully"
 msgstr "Yhteystieto luotu onnistuneesti"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Yhteystietoa ei voi tallentaa: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Yhteystiedon tallennus epäonnistui"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Haluatko varmasti liittää tämän kansion (”%1”)?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Liitä kansio"
@@ -3518,14 +3530,14 @@
 msgstr "&Kansio"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Käytä kansiossa suodattimia"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3551,7 +3563,7 @@
 msgstr "&Välitä"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Käy&tä suodatinta"
@@ -3576,7 +3588,7 @@
 msgstr "&Ohje"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Päätyökalurivi"
@@ -3630,13 +3642,13 @@
 msgid "The file does not contain a message."
 msgstr "Tiedosto ei sisällä viestiä."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "Tiedosto sisältää useita viestejä, mutta vain ensimmäinen viesti näytetään."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3645,32 +3657,32 @@
 "Haluatko välittää valitut viestit liitteinä yhdessä viestissä (MIME-"
 "koosteena) vai yksittäisinä viesteinä?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Lähetä koosteena"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Lähetä yksittäin"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Suodatetaan viestejä"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Suodatetaan %2:n viestiä %1"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Siirretään viestejä"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Poistetaan viestejä"
@@ -3699,31 +3711,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Tekstin suunta -työkalurivi"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail on asetettu verkottomaan tilaan ja kaikki verkkotoimenpiteet "
 "keskeytetty"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Lähetä sähköposti"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Sähköpostin lähettäminen on mahdotonta"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail on asetettu verkolliseen tilaan ja kaikkia verkkotoimenpiteitä "
 "jatketaan"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3732,37 +3744,37 @@
 "KMail on asetettu verkolliseen tilaan: kaikkia verkkotoimenpiteitä jatketaan "
 "heti, kun verkko on havaittu"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail ei ole nyt verkossa. Kuinka haluat edetä?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Verkossa/Ei verkossa"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Työskentele verkollisessa tilassa"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Työskentele verkottomassa tilassa"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Verkkoyhteys havaittiin: kaikkia verkkotoimenpiteitä jatketaan"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Verkkoyhteyttä ei havaittu: kaikki verkkotoimenpiteet on keskeytetty"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3771,12 +3783,12 @@
 "Automaattitallennustiedoston avaus kohteesta %1 epäonnistui.\n"
 "Syy: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Automaattitallennustiedoston avaus epäonnistui"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3784,7 +3796,7 @@
 msgstr[0] "Tämä henkilöys muutettiin käyttämään oletuslähetystapaa."
 msgstr[1] "Nämä %1 henkilöyttä muutettiin käyttämään oletuslähetystapaa."
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3792,43 +3804,47 @@
 msgstr[0] "Tämä henkilöys muutettiin käyttämään muutettua lähetystapaa:"
 msgstr[1] "Nämä %1 henkilöyttä muutettiin käyttämään muutettua lähetystapaa:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Lähettää viestejä"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Käynnistetään lähetysprosessia…"
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Resurssi %1 on rikki."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Resurssi %1 on rikki.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Postin arkistointiagenttia ei ole rekisteröity."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Lähetä myöhemmin -agenttia ei ole rekisteröity."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Vastaamisen seurannasta muistuttaja -agenttia ei ole rekisteröity."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3837,12 +3853,12 @@
 "Varmenteiden hallintaa ei voitu käynnistää. Varmista, että Kleopatra on "
 "asennettu oikein."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-virhe"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3851,25 +3867,24 @@
 "Opastettua tuontia ei voitu käynnistää. Varmista, että se on asennettu "
 "oikein."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Opastettua tuontia ei voitu käynnistää."
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
-msgstr ""
-"Opastettua asetusten tuontia ei voitu käynnistää. Tarkista asennuksesi."
+msgstr "Opastettua PIM-tietojen tuontia ei voitu käynnistää. Tarkista asennus."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Opastettua asetusten tuontia ei voitu käynnistää."
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Opastettua PIM-tietojen tuontia ei voitu käynnistää"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3878,68 +3893,68 @@
 "Opastettua tuontia ei voitu käynnistää. Varmista, että se on asennettu "
 "oikein."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "ImportWizardia ei voitu käynnistää"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Järjestelmästä löytyi toinen postiohjelma. Haluatko tuoda tiedot siitä?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Opastettua tuontia ei voitu käynnistää. Tarkista asennuksesi."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Ei aihetta"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(ei viestipohjia)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Tälle kansiolle ei ole asetettu siivousasetuksia"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Haluatko varmasti siivota kansion <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Siivoa kansio"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Siivoa"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Tyhjennä roskakori"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Siirrä roskakoriin"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Haluatko varmasti tyhjentää roskakorikansion?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3948,27 +3963,27 @@
 "<qt>Haluatko varmasti siirtää kaikki viestit kansiosta <b>%1</b> roskakoriin?"
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Siirrettiin kaikki viestit roskakoriin"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Haluatko varmasti siivota kaikki vanhat viestit?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Siivotaanko vanhat viestit?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Siivoa"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3980,17 +3995,17 @@
 "järjestelmäsi vaarantuu olemassa oleville ja ei-toivotuille tietoturva-"
 "aukoille."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Lataa ulkoiset viittaukset"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4005,531 +4020,531 @@
 "<qt>Haluatko varmasti poistaa valitut %1 viestiä?<br />Jos poistat viestit, "
 "niitä ei voida palauttaa enää.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Poista viestit"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Poista viesti"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Siirretään viestejä…"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Poistetaan viestejä…"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Viestit poistettu onnistuneesti."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Viestit siirrettiin onnistuneesti"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Viestien poisto epäonnistui."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Viestien poisto peruttiin."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Viestien siirto epäonnistui."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Viestien siirto peruttiin."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Siirrä viestit kansioon"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopioidaan viestejä…"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Viestit kopioitiin onnistuneesti"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Viestien kopiointi epäonnistui."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Viestien kopiointi peruttiin."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopioi viestit kansioon"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Siirretään viesti poistettuihin…"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Poistetaan ja siirretään viesti roskakoriin…"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Viestit siirrettiin roskakoriin onnistuneesti"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Viestien siirto roskakoriin tai poistaminen onnistui"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Viestien siirto roskakoriin epäonnistui."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Viestien poistaminen tai siirto roskakoriin epäonnistui."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Viestien siirto roskakoriin peruttiin."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Viestien poistaminen tai siirto roskakoriin peruttiin."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Siirry kansioon"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Tallenna &nimellä…"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Siivoa kaikki kansiot"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Tarkista &posti"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Tarkista posti kansiosta"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Tarkista posti"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Lähetä jono&ttavat viestit"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Yhteyden tila (tuntematon)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Lähetä jonossa olevat viestit reittiä"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Varmennehallinta…"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Tuo viestejä…"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Sieve-virheenpaikannus…"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Suodati&nloki…"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Tuo toisesta sähköpostiohjelmasta…"
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Muokkaa poissaoloviestejä…"
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Auto&maattisen arkistoinnin asetukset…"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Viivästetyt viestit…"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Vastaamisen seurannasta muistuttajan viestit…"
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Poista"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Siirrä ketju roskakoriin"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Siirrä viestiketju roskakoriin"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Poista viestiketju"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Etsi viestejä…"
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "V&alitse kaikki viestit"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Sähköpostilistojen hallinta…"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Liitä pik&anäppäin…"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Erääntymisasetukset"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arkistoi kansio…"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Lataa &ulkoiset viittaukset"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopioi viesti kohteeseen…"
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Siirrä viesti kohteeseen…"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Uusi viesti…"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Uusi"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Uusi viesti &mallista"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Uusi viesti postitus&listalle…"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Luo suodatin"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Suodata o&tsikolla…"
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Suodata lähe&ttäjällä…"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Suodata vasta&anottajalla…"
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Suodata &kopio-osoitteella…"
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Merki&tse säie"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Me&rkitse säie luetuksi"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Merkitse kaikki viestit valitussa säikeessä luetuiksi"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Merkitse säie luke&mattomaksi"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Merkitse kaikki viestit valitussa säikeessä lukemattomiksi"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Merk&itse säie tärkeäksi"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Poista &tärkeä säie -merkintä"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Merkitse säie te&htäväksi"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Poista &tehtävän merkki"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Seuraa säiettä"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ohita säie"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Tallenna &liitteet…"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Kopioi salaamattomana kohteeseen…"
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Kä&ytä kaikkia suodattimia"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Laajenna säie tai ryhmä"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Laajentaa nykyisen säikeen tai ryhmän"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Supista säie tai ryhmä"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Supistaa nykyisen säikeen tai ryhmän"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "L&aajenna kaikki säikeet"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Laajentaa kaikki nykyisen kansion säikeet"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "S&ulje kaikki säikeet"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Supistaa kaikki nykyisen kansion säikeet"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Näytä viesti"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Seuraava viesti"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Siirtyy seuraavaan viestiin"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Seuraava luke&maton viesti"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Seuraava"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Siirtyy seuraavaan lukemattomaan viestiin"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Edellinen viesti"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Siirtyy edelliseen viestiin"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Edellinen lukem&aton viesti"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Edellinen "
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Siirry edelliseen lukemattomaan viestiin"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Seuraava lukematon &kansio"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Siirtyy seuraavaan kansioon, jossa on lukematon viesti"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Edellinen lukemat&on kansio"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Siirtyy edelliseen kansioon, jossa on lukematon viesti"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Seuraava lukematon &teksti"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Siirry seuraavaan lukemattomaan tekstiin"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4538,223 +4553,228 @@
 "Vierittää nykyistä viestiä alaspäin. Viestin lopussa siirtyy seuraavaan "
 "lukemattomaan viestiin."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Muokkaa &suodattimia…"
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "&Sieve-komentosarjojen hallinta…"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "Lisää &tili…"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "Johdatus &KMailiin"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Näytä KMailin aloitussivu"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Muokkaa &ilmoituksia…"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&KMailin asetukset…"
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Vanhenna…"
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Lisää suosikkikansio…"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Palvelinpuolen tilaus…"
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Käytä kaikkia suodattimia"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Tuo/vie KMail-tiedot…"
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Uusi osoitekirjan yhteystieto…"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopioi viesti kansioon"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Siirry kansioon…"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Keskeytä nykyinen tapahtuma"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Kohdistus seuraavaan kansioon"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Kohdistus edelliseen kansioon"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Valitse kohdistettu kansio"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Kohdistus ensimmäiseen kansioon"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Kohdistus viimeiseen kansioon"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Kohdistus seuraavaan viestiin"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Kohdistus edelliseen viestiin"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Valitse ensimmäinen viesti"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Valitse viimeinen viesti"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Valitse kohdistettu viesti"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Kohdista pikahakuun"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Laajenna valintaa edelliseen viestiin"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Laajenna valintaa seuraavaan viestiin"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Siirrä viesti kansioon"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Käytä alhaisempaa kaistanleveyttä"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Merkitse kaikki viestit tässä kansiossa ja sen alikansioissa luetuiksi"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Poista kaksoiskappaleet tästä kansiossa ja sen alikansioista"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Ti&lin asetukset"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Käynnistä tili uudelleen"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Lisää suosikkikansio"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Tyhjennä &roskakori"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "S&iirrä kaikki viestit roskakoriin"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Poista haku"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Muokkaa hakua…"
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Kumoa"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Kumoa: ”%1”"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Suodatin %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Etsi… <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4765,12 +4785,12 @@
 "saattaa kasvattaa todennäköisyyttä, että järjestelmäsi vaarantuu olemassa "
 "oleville ja ei-toivotuille tietoturva-aukoille."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Käytä HTML:ää"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4785,118 +4805,118 @@
 "Voit luoda asettaa yhdistetyt postilaatikot, luoda mukautettuja\n"
 "tai poistaa piirteen käytöstä KMailin liitännäisasetuksissa."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Käytetäänkö yhdistettyjä postilaatikoita?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Käytä yhdistettyjä postilaatikoita"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Peru"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Aloitetaan…"
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Siirrä roskakoriin"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Roskakori"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Siirrä viesti roskakoriin"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Viestiä ei voi kopioida. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Uusi viesti osoitteeseen…"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Vastaus osoitteeseen…"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Välitä osoitteeseen…"
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Lisää olemassa olevaan yhteystietoon"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Avaa osoitekirja"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Lisää linkki kirjanmerkkeihin"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Muokkaa yhteystietoa…"
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Tallenna linkki nimellä…"
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Etsi viestistä…"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Tallenna kuva levylle…"
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Näytä HTML-muoto"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Näytä HTML-muoto, kun viesti on tältä yhteystiedolta"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Lataa ulkoiset viittaukset, kun viesti on tältä yhteystiedolta"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Jaa kuva…"
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4905,63 +4925,63 @@
 "KMail perustuu nyt Akonadi Personal Information Management -kehykseen, mistä "
 "seuraa monia muutoksia."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push-sähköposti (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Parannetut haut"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Tuki sähköpostiviestien lisämerkinnöille"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Käyttöliittymän vähentyneet jumittumiset: postit tarkistetaan taustalla"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Liitännäistuki"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Uusi HTML-hahmonnin (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Lisätty verkko-osoitteen väärennöksen tarkistus"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "KDE:n sähköpostiohjelma"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Noudetaan kansion sisältöä"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Odota hetki…"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Yhteydetön tlla"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4970,7 +4990,7 @@
 "KMail on tällä hetkellä yhteydettömässä tilassa. Yhdistä verkkoon "
 "napsauttamalla <a href=\"kmail:goOnline\">tästä</a>…</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4979,22 +4999,22 @@
 "Tili on tällä hetkellä yhteydettömässä tilassa. Yhdistä verkkoon "
 "napsauttamalla <a href=\"kmail:goOnline\">tästä</a>…</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Yhteystietoa muutettiin onnistuneesti"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Uusia viestejä kansiossa"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Ei viestejä lukematta"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5017,8 +5037,8 @@
 msgstr "Tekijänoikeudet © 2004–2010 Tobias König"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias König"
@@ -5111,17 +5131,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Valitse yhteenvetosivulla näytettävät liitännäisyhteenvedot."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontactin yhteenveto"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "© 2004 Tobias Koenig"
@@ -5167,27 +5187,27 @@
 msgid "All"
 msgstr "Kaikki"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontactin yhteenveto"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontactin yhteenvetonäkymä"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© 2003–2019 Kontactin kehittäjät"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5214,7 +5234,7 @@
 msgid "&Reply"
 msgstr "&Vastaa"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Vastaa…"
@@ -5224,12 +5244,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Vastaa &lähettäjälle…"
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Vastaa &kaikille…"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Vastaa postitusl&istalle…"
@@ -5259,7 +5279,7 @@
 msgid "&Edit As New"
 msgstr "Muokkaa &uutena"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5450,113 +5470,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Haku epäonnistui joidenkin virheiden takia:<ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Etsi viestejä"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Etsi"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "S&isällytä…"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Liitteenä…"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Tallenna liitteet…"
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Tyhjennä valinta"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Siirry alkuperäiseen kansioon"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 osuma"
 msgstr[1] "%1 osumaa"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Edellinen haku"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Et valinnut kelvollista kansiota."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Unohdit valita kokoelmat."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Unohdit määrittää ehdon."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Kaikki valitut kansiot ovat tyhjiä tai niitä ei indeksoitu."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Unohdit lisätä ehdot."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Sisältää-ehtoa ei voi käyttää, jos merkkien määrä on pienempi kuin 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Etsitään…"
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Hakutuloksia ei saada. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Haku epäonnistui."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Haku valmis."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Haku pysäytetty."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5566,21 +5586,21 @@
 "Hakukansiosi nimen muuttamisessa ilmeni ongelmia. Yleinen syy tähän on, että "
 "toinen saman niminen hakukansio on jo olemassa. Virhe oli: %1."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Kopioi viesti"
 msgstr[1] "Kopioi %1 viestiä"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Leikkaa viesti"
 msgstr[1] "Leikkaa %1 viestiä"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Tarkistetaan indeksoinnin tilaa…"
@@ -5712,7 +5732,7 @@
 "käyttöön)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5722,7 +5742,7 @@
 "yhdistettyä postilaatikkoa. Kysymys esitetään vain kerran."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5730,26 +5750,26 @@
 msgstr "Tämä arvo määrittää, näytetäänkö KMailin esittely."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Näytä pikahakukenttä"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Välitä viestit oletusarvoisesti sisällytettyinä."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Varoita, jos vastaanottajia on enemmän kuin:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5761,19 +5781,19 @@
 "ottaa pois käytöstä."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Tarkista oikeinkirjoitus ennen lähettämistä"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "&Pyydä viestin vastaanottokuittaukset automaattisesti"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5789,25 +5809,25 @@
 "<em>Asetukset</em>-><em>Pyydä viestin toimituskuittaus</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "&Automaattitallennusväli:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
 "The interval used to create the backups is set here. You can disable "
 "autosaving by setting it to the value 0."
 msgstr ""
-"Viestin kirjoittaminen voidaan varmuuskopioida säännöllisesti. Varmuuskopion "
-"tallennusväli voidaan määritellä tässä. Voit ottaa varmuuskopioinnin pois "
-"käytöstä määrittelemällä tallennusväliksi 0."
+"Kirjoitettavan viestin voi tallentaa määräajoin. Tässä voi määrittää "
+"tallennusvälin. Varmuuskopioinnin voi poistaa käytöstä asettamalla "
+"tallennusväliksi 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5815,145 +5835,145 @@
 "kirjoitusikkunassa."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Kun käytössä, lähetetyt viestit tallennetaan salattuina"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Vastikään käytettyjen osoitteiden luettelo"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Vastikään käytettyjen koodausten luettelo"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Näytä salauksen teksti-ilmaisin"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Tarkista lähettämisen oletuspikanäppäin"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Henkilöysikkunan koko (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Hakuikkunan leveys (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Hakuikkunan korkeus (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "KMailin asetusdialogin leveys (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "KMailin asetusdialogin korkeus (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Esikatseluruutu"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Älä näytä viestin esikatseluruutua"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Näytä esikatseluruutu viestiluettelon alla"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Näytä esikatseluruutu v&iestiluettelon vieressä"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Kansioluettelo"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Pitkä kansioluettelo"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Lyhyt kansioluettelo"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Uuden viestin viestipohja"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Vastausviestin viestipohja"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Vastaa kaikille -viestin viestipohja"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Välitysviestin viestipohja"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Lainausmerkit"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Määrittää käytännettä esitettäessä käytettävän käytänteen"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5962,7 +5982,7 @@
 "Määrittää kokoelma-kentän leveyden hakudialogissa (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5971,7 +5991,7 @@
 "Määrittää otsikko-kentän leveyden hakudialogissa (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5980,7 +6000,7 @@
 "Määrittää lähettäjä-kentän leveyden hakudialogissa (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5990,7 +6010,7 @@
 "käyttöön)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5999,7 +6019,7 @@
 "Määrittää päiväys-kentän leveyden hakudialogissa (vain sisäiseen käyttöön)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6266,7 +6286,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6302,7 +6322,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6318,24 +6338,24 @@
 "weight:600;\">Älä kierrä:</span> Haku päättyy viimeiseen nykyisen kansion "
 "lukemattomaan viestiin.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=.</\" font-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
 "weight:600;\">Kierrä nykyisessä kansiosta:</span> Haku jatkuu "
 "viestiluettelon alusta, muttei siirry muihin kansioihin.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
 "weight:600;\">Kierrä kaikissa kansioissa:</span> Haku jatkuu viestiluettelon "
-"alusta. Jollei lukemattomia viestejä löydy, siirrytään seuraavaan kansioon. "
-"</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">.</p>\n"
+"alusta. Jollei lukemattomia viestejä löydy, siirrytään seuraavaan kansioon.</"
+"p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\">Samoin etsittäessä "
 "edellistä lukematonta viestiä haku alkaa viestiluettelon lopusta ja jatkuu "
-"edelliseen kansioon, jos on valittu näin.<span style=\" font-weight:600;"
-"\">Kierrä kaikissa merkityissä kansioissa: </span>Tämä on sama kuin ”Kierrä "
-"kaikissa kansioissa”, paitsi että vain niistä kansioista etsitään, joiden "
-"ominaisuus ”Reagoi uusiin tai lukemattomiin viesteihin” on käytössä.</p></"
-"body></html>"
+"edelliseen kansioon valinnan mukaisesti.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Kierrä kaikissa merkityissä kansioissa: </span> Tämä on sama "
+"kuin ”Kierrä kaikissa kansioissa” paitsi että vain ne kansiot otetaan "
+"huomioon, joille on merkitty ominaisuus ”Reagoi uusiin tai lukemattomiin "
+"viesteihin”.</p></body></html>"
 
 #. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:64
@@ -6630,8 +6650,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Tarkista postin verkko-osoitejäljitys"
+msgid "Scan emails for tracking URLs"
+msgstr "Etsi viesteistä jäljittäviä verkko-osoitteita"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7249,6 +7269,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Ota uudelleen käyttöön kaikki ”Älä kysy uudelleen” -varoitukset"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 sekuntia"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Peru lähetys"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7304,6 +7334,12 @@
 msgid "Zoom: %1%"
 msgstr "Lähennys: %1 %"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Leikkeet"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Tarkista postin verkko-osoitejäljitys"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Kansion nimi ja maksimikoko"
 
@@ -9932,12 +9968,6 @@
 #~ msgid "Add Group"
 #~ msgstr "Lisää ryhmä"
 
-#, fuzzy
-#~| msgid "Do you really want to remove this group and all its snippets?"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Haluatko varmasti poistaa ryhmän kaikkine leikkeineen?"
-
 #~ msgid "&Apply"
 #~ msgstr "&Käytä"
 
@@ -10939,9 +10969,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Määrittää, käyttääkö tili oletushenkilöyttä"
 
-#~ msgid "Identity account"
-#~ msgstr "Tilin henkilöys"
-
 #~ msgid "Define if server supports sieve"
 #~ msgstr "Määritä, tukeeko palvelin Sieveä"
 
diff -Nru kmail-19.04.3/po/fi/kmail-refresh-settings.po kmail-19.12.3/po/fi/kmail-refresh-settings.po
--- kmail-19.04.3/po/fi/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/fi/kmail-refresh-settings.po	2020-03-03 00:34:00.000000000 +0000
@@ -0,0 +1,103 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+# Tommi Nieminen <translator@legisign.org>, 2019, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2020-01-01 13:05+0200\n"
+"Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
+"Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 18.12.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Tommi Nieminen"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "translator@legisign.org"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "KMail-avustaja asetusten virkistämiseksi"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "© 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Tekijä"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "KMailin asetusten virkistys"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Varoitus"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Puhdista asetukset"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Valmis"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Puhdista"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Vanhentuneiden asetusvinkkien poisto: tehty"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Tiedoston ”%1” kyselyikkuna-asetusten poisto: tehty"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Suodatinasetusten poisto asetustiedostosta ”%1”: tehty"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Kansioasetusten puhdistus asetustiedostosta ”%1”: tehty"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Valintaikkunan koon puhdistus asetustiedostossa ”%1”: tehty"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Käynnistä KMail tai Kontact uudelleen ennen käyttöä."
diff -Nru kmail-19.04.3/po/fi/ktnef.po kmail-19.12.3/po/fi/ktnef.po
--- kmail-19.04.3/po/fi/ktnef.po	2019-07-09 00:20:20.000000000 +0000
+++ kmail-19.12.3/po/fi/ktnef.po	2020-03-03 00:34:00.000000000 +0000
@@ -1,6 +1,6 @@
 # Copyright © 2012 This_file_is_part_of_KDE
 # This file is distributed under the same license as the kdepim package.
-# Tommi Nieminen <translator@legisign.org>, 2012, 2016.
+# Tommi Nieminen <translator@legisign.org>, 2012, 2016, 2020.
 # Lasse Liehu <lasse.liehu@gmail.com>, 2013, 2015.
 #
 # KDE Finnish translation sprint participants:
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-21 22:45+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -18,7 +18,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 18.12.3\n"
 "X-POT-Import-Date: 2012-12-01 22:25:08+0000\n"
 
 #, kde-format
diff -Nru kmail-19.04.3/po/fr/akonadi_archivemail_agent.po kmail-19.12.3/po/fr/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/fr/akonadi_archivemail_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fr/akonadi_archivemail_agent.po	2020-03-03 00:34:02.000000000 +0000
@@ -4,13 +4,13 @@
 # Joëlle Cornavin <jcorn@free.fr>, 2013, 2014.
 # Maxime Corteel <mcorteel@gmail.com>, 2015, 2016.
 # Vincent Pinon <vpinon@kde.org>, 2017, 2018.
-# Simon Depiets <sdepiets@gmail.com>, 2019.
+# Simon Depiets <sdepiets@gmail.com>, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-01-30 00:57+0800\n"
 "Last-Translator: Simon Depiets <sdepiets@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -19,7 +19,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 19.03.70\n"
+"X-Generator: Lokalize 20.03.70\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
@@ -183,14 +183,14 @@
 "Impossible d'ajouter une seconde archive pour ce fichier. Modifiez celle qui "
 "existe à la place."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "Le dossier n'existe pas. Veuillez vérifier la configuration. L'archivage est "
 "remis à plus tard."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Commencer à archiver %1"
diff -Nru kmail-19.04.3/po/fr/akonadi_followupreminder_agent.po kmail-19.12.3/po/fr/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/fr/akonadi_followupreminder_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fr/akonadi_followupreminder_agent.po	2020-03-03 00:34:01.000000000 +0000
@@ -3,13 +3,13 @@
 # Geoffray Levasseur <geoffray.levasseur-brandin@ac-toulouse.fr>, 2014.
 # Sebastien Renard <renard@kde.org>, 2015.
 # Vincent Pinon <vpinon@kde.org>, 2017, 2018.
-# Simon Depiets <sdepiets@gmail.com>, 2019.
+# Simon Depiets <sdepiets@gmail.com>, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2019-01-27 23:30+0800\n"
 "Last-Translator: Simon Depiets <sdepiets@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -18,102 +18,102 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 19.03.70\n"
+"X-Generator: Lokalize 20.03.70\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agent de rappel de suivi"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Rappel de suivi"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Mainteneur"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Geoffray Levasseur"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "geoffray.levasseurbrandin@numericable.fr"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "À"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Sujet"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Échéance"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Réponse"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Reçue"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "En attente"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Afficher le message "
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Supprimer"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Voulez-vous supprimer cet élément sélectionné ?"
 msgstr[1] "Voulez-vous supprimer ces %1 éléments sélectionnés ?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Réponse de %1 reçue"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Vous attendez toujours une réponse à ces courriels :"
diff -Nru kmail-19.04.3/po/fr/akonadi_mailfilter_agent.po kmail-19.12.3/po/fr/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/fr/akonadi_mailfilter_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fr/akonadi_mailfilter_agent.po	2020-03-03 00:34:02.000000000 +0000
@@ -4,12 +4,13 @@
 # Geoffray Levasseur <geoffray.levasseurbrandin@numericable.fr>, 2012.
 # Joëlle Cornavin <jcorn@free.fr>, 2012, 2013.
 # Maxime Corteel <mcorteel@gmail.com>, 2014.
+# Simon Depiets <sdepiets@gmail.com>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2014-12-07 13:47+0100\n"
 "Last-Translator: Maxime Corteel <mcorteel@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -18,7 +19,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 19.07.70\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
@@ -28,17 +29,17 @@
 msgid "Filter Log Viewer"
 msgstr "Afficheur de journaux de filtres"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Partager…"
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Journaliser les activités des filtres"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -48,23 +49,23 @@
 "filtres. Naturellement, les données du journal ne sont collectées et "
 "affichées que lorsque la journalisation est activée."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Détails de la journalisation"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Journaliser la description des modèles"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Journaliser l'évaluation des &règles de filtre"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -79,34 +80,34 @@
 "Autrement, le retour ne sera fourni que pour le résultat de l'évaluation de "
 "toutes les règles concernant un filtre unique."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Journaliser l'évaluation des modèles de filtres"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Journaliser les actions des filtres"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Limite de taille du journal :"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " Ko"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "illimitée"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -120,7 +121,7 @@
 "limite, alors les données les plus anciennes seront effacées jusqu'à ce que "
 "la limite ne soit plus dépassée."
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -129,70 +130,70 @@
 "Impossible d'écrire le fichier %1 :\n"
 "La description détaillée de l'erreur est donnée par « %2 »."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Erreur de KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrage du message %1 sur %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr ""
 "Erreur lors de l'application du déplacement du filtre de courrier "
 "électronique"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr ""
 "Erreur lors de l'application de la suppression du filtre de courrier "
 "électronique"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr ""
 "Erreur lors de l'application des modifications de filtre de courrier "
 "électronique"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Évaluation des règles de filtre :</b>"
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Les règles de filtre se correspondent.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr ""
 "<b>Commencer le filtrage sur le message « %1 » depuis « %2 » à « %3 » :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrage des messages"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Journal de filtre de courrier électronique activé"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Prêt"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrage dans %1"
diff -Nru kmail-19.04.3/po/fr/akonadi_sendlater_agent.po kmail-19.12.3/po/fr/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/fr/akonadi_sendlater_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fr/akonadi_sendlater_agent.po	2020-03-03 00:34:02.000000000 +0000
@@ -5,13 +5,13 @@
 # Ludovic Grossard <ludovic.grossard@unilim.fr>, 2014.
 # Maxime Corteel <mcorteel@gmail.com>, 2014, 2015, 2016.
 # Vincent Pinon <vpinon@kde.org>, 2017, 2018.
-# Simon Depiets <sdepiets@gmail.com>, 2019.
+# Simon Depiets <sdepiets@gmail.com>, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2019-01-27 23:26+0800\n"
 "Last-Translator: Simon Depiets <sdepiets@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -20,7 +20,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 19.03.70\n"
+"X-Generator: Lokalize 20.03.70\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
@@ -67,124 +67,124 @@
 msgid "Your emails"
 msgstr "jcorn@free.fr, mcorteel@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "À"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Objet"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Faire parvenir"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Récurrent"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Identifiant de message"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Aucun message en attente..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Envoyer maintenant"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Supprimer"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Oui"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Non"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Voulez-vous supprimer l'élément sélectionné ?"
 msgstr[1] "Voulez-vous supprimer les éléments sélectionnés ?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Supprimer des éléments"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Voulez-vous supprimer également les messages ?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Supprimer des messages"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Aucun message n'a été trouvé."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Aucun message n'a été trouvé."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Erreur pendant l'extraction du message."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Il est impossible d'extraire le message. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Impossible de créer un transport"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Le message n'est pas un message réel"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Il est impossible d'envoyer un message."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Une erreur a été rencontrée. Voulez-vous effectuer un nouvel envoi ?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Erreur rencontrée"
diff -Nru kmail-19.04.3/po/fr/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/fr/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/fr/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fr/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:02.000000000 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-01-27 23:29+0800\n"
 "Last-Translator: Simon Depiets <sdepiets@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -12,7 +12,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 19.03.70\n"
+"X-Generator: Lokalize 19.07.70\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Synchronisation de la boîte aux lettres unifiée %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Ajouter une boîte aux lettres unifiée"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nom :"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Choisissez une icône..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Icône :"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Boîte de réception"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Envoyé"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Brouillons"
diff -Nru kmail-19.04.3/po/fr/kmail.po kmail-19.12.3/po/fr/kmail.po
--- kmail-19.04.3/po/fr/kmail.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fr/kmail.po	2020-03-03 00:34:01.000000000 +0000
@@ -22,13 +22,13 @@
 # xavier <xavier.besnard@neuf.fr>, 2012.
 # Sebastien Renard <renard@kde.org>, 2012, 2013, 2014, 2015.
 # Vincent Pinon <vpinon@kde.org>, 2017, 2018.
-# Simon Depiets <sdepiets@gmail.com>, 2018, 2019.
+# Simon Depiets <sdepiets@gmail.com>, 2018, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-03-18 17:55+0800\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2020-02-03 02:40+0800\n"
 "Last-Translator: Simon Depiets <sdepiets@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
 "Language: fr\n"
@@ -36,7 +36,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 19.07.70\n"
+"X-Generator: Lokalize 20.03.70\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
@@ -216,8 +216,8 @@
 msgstr "Clés de chiffrement multiples par adresse"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -323,27 +323,27 @@
 "KMail n'a pas pu complètement détecter une liste de diffusion dans ce "
 "dossier. Veuillez remplir l'adresse manuellement."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "État :"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p % rempli"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 sur %2 utilisés"
@@ -366,7 +366,7 @@
 "les touches que vous souhaitez associer au dossier.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Modèles"
@@ -377,107 +377,107 @@
 msgstr "&Utiliser les modèles de messages personnalisés dans ce dossier"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copier les modèles globaux"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Afficher"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Utiliser des icônes personnal&isées"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal :"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "Non l&u :"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 "Afficher la colonne de l'expéditeur / destinataire dans la liste des messages"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Affic&her la colonne :"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Par défaut"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinataire"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Liste des messages"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Utiliser l'agrégation par défaut"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agrégat"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Utiliser le thème par défaut"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Thème"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Format de courriel par défaut"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Préférer le HTML au texte"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Préférer le texte au HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Utiliser la configuration globale"
@@ -487,100 +487,105 @@
 msgid "Retrieval Options"
 msgstr "Options de réception"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identités"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Réception"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Envoi"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Serveur LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Comptes d'envoi (ajoutez au moins un compte !) :"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Options communes"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Confirmer avant l'envoi"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Vérification de l'orthographe avant envoi"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Jamais automatiquement"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Lors des vérifications manuelles du courriel"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Lors de toutes les vérifications du courriel"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Envoyer maintenant"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Envoyer ultérieurement"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Envo&yer les messages de la boîte d'envoi :"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Type d'envoi par &défaut :"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Activer l'annulation d'envoi"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Ajouter un compte courriel…"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Compte personnalisé..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -589,30 +594,30 @@
 "Impossible de lancer l'assistant de comptes. Veuillez vérifier que "
 "AccountWizard est correctement installé."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Impossible de démarrer l'assistant de comptes"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Inclure dans la vérification manuelle du courriel"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Passer en mode hors-ligne à l'arrêt de KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Relever le courriel au démarrage"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -670,7 +675,7 @@
 msgid "Fixed Width Font"
 msgstr "Police à espacement fixe"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Éditeur"
@@ -977,61 +982,61 @@
 msgstr ""
 "Impossible de créer l'étiquette. Une étiquette portant ce nom existe déjà."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Général"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Modèles standards"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Modèles personnalisés"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Sujet"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Encodage"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "En-têtes"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Pièces jointes"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autocorrection"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Redimensionner automatiquement les images"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signature"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1040,12 +1045,12 @@
 "Insérer automatiquement la signature\n"
 "lors du début de la rédaction d'un message"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Insérer la signature au dessus du texte cité"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1054,18 +1059,18 @@
 "Insérer un séparateur de signature conforme aux RFC\n"
 "(deux tirets et une espace) avant la signature"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Lors d'une réponse, ne pas citer les signatures existantes"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1076,7 +1081,7 @@
 "(au lieu du message complet), lorsqu'un texte est\n"
 "sélectionné dans la fenêtre du message."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1088,18 +1093,18 @@
 "même si la ligne était créée par des retours à la ligne dûs à la césure du "
 "texte."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 "Activer le retour à la ligne automatique au delà de la largeur spécifiée"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Définir la largeur du texte pour le retour à la ligne automatique"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1110,7 +1115,7 @@
 "dans le format original où il a été reçu, ou, si cette option est décochée,\n"
 "ne répondre qu'en texte simple par défaut."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1121,34 +1126,34 @@
 "L'italique, le gras, le souligné, les listes et les liens externes sont\n"
 "pris en charge."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Incorporé"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Comme une pièce jointe"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Définir le format par défaut des messages transmis"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Modèle de message transmis par défaut :"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1160,17 +1165,17 @@
 "Vous pouvez sélectionner ceci pour chaque message avec l'option « Demander "
 "un accusé de réception »"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Avertir si trop de destinataires ont été spécifiés"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Définir le nombre de destinataires maximum avant d'avertir"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1188,7 +1193,7 @@
 "listes de distribution\n"
 "ou de discussion."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1197,18 +1202,18 @@
 "Conserve les adresses récentes saisies afin\n"
 "de les proposer pour le complètement d'adresses."
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Pas d'enregistrement"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Nombre maximal d'adresses récentes conservées : "
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1217,23 +1222,23 @@
 "Le nombre maximal d'adresses récentes qui\n"
 "seront conservées pour le complètement"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configurer le complètement.."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Enregistrement automatique"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Pas d'enregistrement automatique"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1241,18 +1246,18 @@
 msgstr[0] " minute"
 msgstr[1] " minutes"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Automatiquement enregistrer le message à l'intervalle spécifié"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Préfixes pour le su&jet d'une réponse"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1261,59 +1266,59 @@
 "Reconnaître plusieurs séquences des préfixes suivants\n"
 "(la saisie est insensible à la casse et aux expressions rationnelles) :"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Ajo&uter..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Su&pprimer"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mod&ifier..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Saisissez un nouveau préfixe de réponse :"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Pré&fixes pour le sujet d'un message transmis"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Ajouter..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Su&pprimer"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modifier..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Saisissez un nouveau préfixe de transmission :"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1323,73 +1328,73 @@
 "pour y trouver un jeu de caractères contenant tous les caractères du message."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modifier..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Saisissez un jeu de caractères :"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Utiliser le jeu de caractères du message d'origine pour répondre ou "
 "transmettre (si possible)."
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Ce jeu de caractères n'est pas géré."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Utiliser un suffixe personnalisé pour le champ « Message-Id »"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Suffi&xe personnalisé pour le champ « Message-Id » :"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Définir des champs d'en-tête MIME personnalisés :"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nom"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valeur"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Nouveau"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "No&m :"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "Valeu&r :"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
@@ -1397,17 +1402,17 @@
 "« Content-Type » n'est pas une chaîne permise. Cette en-tête ne sera pas "
 "enregistrée."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "En-tête non valable"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nommage de la pièce jointe compatible avec Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1416,40 +1421,40 @@
 "Activez cette option pour rendre compréhensibles au programme Outlook(tm) "
 "les noms des pièces jointes contenant des caractères non anglais"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Acti&ver la détection des pièces jointes manquantes"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Reconnaître n'importe lequel des mots clés suivants comme intention "
 "d'attacher un fichier :"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Saisissez un nouveau mot clé :"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Taille de pièce jointe maximale :"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " ko"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Pas de limite"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1536,8 +1541,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "Modules de convertisseur de texte"
+msgid "Text Conversion Plugins"
+msgstr "Modules de conversion de texte"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1651,7 +1656,7 @@
 msgid "Archive Folder"
 msgstr "Archiver le dossier"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1717,19 +1722,19 @@
 msgid "Notification"
 msgstr "Notification"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "Une pièce jointe (%2)"
 msgstr[1] "%1 pièces jointes (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Masquer la liste des pièces jointes"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Afficher la liste des pièces jointes"
@@ -1746,333 +1751,333 @@
 msgid "Encoding"
 msgstr "Encodage"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Sélectionnez le dictionnaire à utiliser lors de la vérification "
 "orthographique de ce message"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Sélectionnez le dossier des courriels envoyés où une copie de ce message "
 "sera enregistrée"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Sélectionnez le compte sortant à utiliser pour envoyer ce message"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Définissez l'adresse électronique du « De : » de ce message"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Définissez le sujet du message"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identité :"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Dictionnaire :"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Dossier des messages &envoyés :"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Transport du courriel :"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&De :"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Sujet :"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Envoyer le courriel"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Env&oyer le courriel via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Envoyer"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Envoyer plus &tard"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Envoyer plus ta&rd via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Envoyer plus tard"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Enregistrer comme &brouillon"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Enregistrer le courriel dans le dossier des brouillons"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Enregistrer comme m&odèle"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Enregistrer le courriel dans le dossier des modèles"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Enregistrer dans un &fichier"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Enregistrer le courriel dans un fichier texte ou html"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Insérer un fichier texte..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Insérer un fichier texte récent"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Carnet d'&adresses"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Ouvrir le carnet d'adresses"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nouvel éditeur"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Sélectionner les &destinataires..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Enregistrer la liste de &distribution..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Coller comme &pièce jointe"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Supprim&er les espaces"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Utiliser une police à largeur fi&xe"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgent"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Accusé de &réception"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Confirmation de la transmission de la &requête"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "R&etour à la ligne"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Fragments"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Correction orthographique &automatique"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Édition de texte enrichi"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Texte enrichi"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "(Dés)Activer l'éditeur de texte enrichi"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Tous les c&hamps"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identité"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Dictionnaire"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Dossier des messages envo&yés"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Transport du courriel"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "D&e"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Sujet"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Insérer la signature à la &fin"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Insérer la signature au &début"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Insérer la signature à la position du &curseur"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Vérificateur orthograp&hique..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Vérification orthographique"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Chiffrer le message"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Signer le message"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signer"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Format de message chiffré"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Sélectionnez le format de chiffrement de ce message"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Créer un rappel de messages suivis"
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configurer KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2081,53 +2086,53 @@
 "<qt>Ceci masquera complètement la barre de menu. Vous pouvez l'afficher à "
 "nouveau en pressant %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Masquer la barre de menu"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Ligne : %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Colonne : %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ÉCR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Vérification de l'orthographe activée"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Vérification de l'orthographe désactivée"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Enregi&strer de nouveau comme modèle"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Enregi&strer comme brouillon"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2136,7 +2141,7 @@
 "Enregistrer de nouveau ce message dans le dossier des modèles. Il pourra "
 "alors être utilisé plus tard."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2145,82 +2150,82 @@
 "Enregistrer ce message dans le dossier des brouillons. Il pourra alors être "
 "modifié et envoyé plus tard."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Voulez-vous enregistrer le message pour plus tard ou le détruire ?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Fermer l'éditeur"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Échec de l'enregistrement automatique"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Échec de l'envoi du message"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Insérer un fichier"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Ajouter une image &incorporée"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Ajouter comme &pièce jointe"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nom de la pièce jointe :"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Le nom de la pièce jointe ne peut être vide."
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Nom de la pièce jointe non valable"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Ajouter l'URL dans le message"
 msgstr[1] "Ajouter les URLs dans le message"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Ajouter le fichier comme &pièce jointe"
 msgstr[1] "Ajouter les fichiers comme &pièces jointes"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Insérer le texte du presse-papiers comme pièce jointe"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "sans nom"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2233,12 +2238,12 @@
 "(OpenPGP ou S/MIME).</p> <p>Veuillez sélectionner la ou les clés à utiliser "
 "dans la configuration de l'identité.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Clé de chiffrement non définie"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2249,12 +2254,12 @@
 "(OpenPGP ou S/MIME) à utiliser. </p><p>Vous pouvez la définir pour "
 "l'identité actuelle dans la configuration des identités.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Clé de signature non définie"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2265,7 +2270,7 @@
 "Définissez également votre adresse de courrier électronique pour pour les "
 "identités, de façon à ne plus avoir à le faire pour chaque message."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2274,39 +2279,39 @@
 "Vous devez spécifier au moins un destinataire, soit dans le champ « À : », "
 "soit en CC, soit en BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr ""
 "Aucun destinataire saisi. Voulez-vous tout de même envoyer le message ?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Aucun destinataire spécifié"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 "Vous n'avez pas saisi de sujet. Voulez-vous envoyer le message quand même ?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Aucun sujet spécifié"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&Envoyer tel quel"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Spécifier le sujet"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2315,22 +2320,22 @@
 "Vous devez spécifier au moins un destinataire, afin de pouvoir chiffrer ce "
 "brouillon."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Envoi du message..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Envoyer la confirmation"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Envoyer &maintenant"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2339,22 +2344,22 @@
 "Vous tentez d'envoyer ce message à plus de %1 destinataires. Voulez-vous "
 "tout de même envoyer ce courrier électronique ?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Trop de destinataires"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Envo&yer tel quel"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Modifier les destinataires"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2363,22 +2368,22 @@
 "Désactiver le mode HTML occasionnera la perte de la mise en page. Voulez-"
 "vous vraiment continuer ? "
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Perdre la mise en page ?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perdre la mise en page"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Ajouter les balises en texte simple"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2388,7 +2393,7 @@
 "(confiance totale dans la clé de chiffrement). Cliquez sur l'icône pour plus "
 "de détails."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2398,7 +2403,7 @@
 "(confiance marginale dans la clé de chiffrement). Cliquez sur l'icône pour "
 "plus de détails."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2408,7 +2413,7 @@
 "confiance dans la clé de chiffrement). Cliquez sur l'icône pour plus de "
 "détails."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2419,7 +2424,7 @@
 "chiffrement est inconnue (impossible de vérifier la clé de chiffrement). "
 "Cliquez sur l'icône pour plus de détails."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Informations sur l'éditeur de module externe"
@@ -2496,7 +2501,7 @@
 msgid "External editor was started."
 msgstr "L'éditeur externe est démarré."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2505,14 +2510,14 @@
 "Impossible de trouver le transport. Veuillez vérifier que vous utilisez un "
 "transport de courriel valable."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Le dossier des messages envoyés n'est pas défini. Veuillez le définir avant "
 "d'envoyer le message."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
@@ -2520,7 +2525,7 @@
 "Impossible de trouver l'identité. Veuillez vérifier que vous utilisez une "
 "identité valable."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2549,11 +2554,6 @@
 msgid "Message will not be encrypted"
 msgstr "Le message ne sera pas chiffré"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Fragments de texte"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2600,27 +2600,27 @@
 msgid "Cannot move messages."
 msgstr "Impossible de déplacer les messages."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Il est impossible d'extraire le dossier. Erreur signalée : %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Aucun dossier renvoyé."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Il est impossible d'extraire le dossier parent. Erreur signalée : %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Il est impossible de renvoyer la liste des dossiers."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Messages archivés"
@@ -2661,48 +2661,48 @@
 msgid "&Existing identities:"
 msgstr "Id&entités existantes :"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Erreur lors de la génération d'une nouvelle paire de clés : %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Erreur à la génération de clés"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Aucune clé"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Générer une nouvelle paire de clés"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Génération d'une nouvelle paire de clés…"
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Modifier l'identité"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Général"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Votre nom :"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2714,12 +2714,12 @@
 "envoyé.</p> <p>Si vous le laissez vide, votre vrai nom n'apparaîtra pas, "
 "seulement l'adresse électronique.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "O&rganisation :"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2731,12 +2731,12 @@
 "électronique envoyé.</p> <p>C'est sécurisant (et normal) de le laisser vide."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Adress&e électronique :"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2752,12 +2752,12 @@
 "ci-dessous.</p><p>Si vous laissez ce champ vide ou si vous vous trompez, les "
 "personnes auront des difficultés à vous répondre.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "A&lias de l'adresse électronique :"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2774,12 +2774,12 @@
 "th><td>prénom@exemple.org<br>nom@exemple.org</td></tr></table><p>Saisissez "
 "un alias par ligne.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Chiffrement"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2796,12 +2796,12 @@
 "davantage d'informations sur les clés ici : <a>https://www.gnupg.org</a></"
 "p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Clé de signature OpenPGP :"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2819,12 +2819,12 @@
 "fonctions de base n'en seront pas affectées.</p><p>Vous trouverez davantage "
 "d'informations sur les clés ici : <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Clé de chiffrement OpenPGP :"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2837,12 +2837,12 @@
 "vide, mais KMail ne sera pas en mesure de chiffrer les courriers "
 "électroniques. Les fonctions de base n'en seront pas affectées.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificat de signature S/MIME :"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2858,39 +2858,39 @@
 "électroniques sortants en utilisant S/MIME. Les fonctions de base ne seront "
 "pas affectées.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificat de chiffrement S/MIME :"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Format préféré :"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Signer automatiquement les messages"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Chiffrer automatiquement les messages si possible"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avancées"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Adresse de &réponse :"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2909,12 +2909,12 @@
 "tt>, mais toutes les réponses soient dirigées vers une adresse électronique "
 "du groupe.</p> <p>Dans le doute, laissez ce champ vide.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adresses d'envoi en &copie :"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2931,12 +2931,12 @@
 "d'une adresse, utilisez des virgules pour séparer la liste des destinataires "
 "en CC.</p><p>En cas de doute, laissez ce champ vide.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Adresses d'en&voi en copie cachée :"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2954,57 +2954,57 @@
 "d'une adresse, utilisez des virgules pour séparer la liste des destinataires "
 "en BCC.</p><p>En cas de doute, laissez ce champ vide.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&ictionnaire :"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Dossier des messages envo&yés :"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Dossier des &brouillons :"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Dossier des &modèles :"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Compte sortant :"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Ajouter ma vCard au message"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Créer..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Langue d'autocorrection : "
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Restaurer le nom de domaine par défaut"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Domaine par défau&t :"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3014,33 +3014,33 @@
 "courrier électronique qui consiste seulement en le nom de l'utilisateur.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Utiliser les modèles de messages personnalisés pour cette identité"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signature"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Image"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Alias d'adresse électronique « %1 » non valable"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Adresse électronique non valable"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3054,7 +3054,7 @@
 "Ceci peut occasionner des messages d'avertissement du côté destinataire en "
 "essayant de vérifier les signatures effectuées avec cette configuration."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3064,7 +3064,7 @@
 "d'utilisateur avec l'adresse électronique configurée pour cette identité "
 "(%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3077,7 +3077,7 @@
 "Ceci peut occasionner des messages d'avertissement du côté destinataire en "
 "essayant de vérifier les signatures effectuées avec cette configuration."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3086,23 +3086,23 @@
 "Un des certificats de signature S/MIME configurés ne contient pas l'adresse "
 "électronique configurée pour cette identité (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr ""
 "Impossible de trouver l'adresse électronique dans les clés / certificats"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Le fichier de signature n'est pas valable"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Modifier l'identité « %1 »"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3111,7 +3111,7 @@
 "Un dossier personnalisé pour cette identité n'existe pas (ou plus) ; de ce "
 "fait, le dossier par défaut sera utilisé."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Modifier..."
@@ -3142,6 +3142,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Impossible de supprimer le fichier vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Voulez-vous vraiment annuler ?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmation"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3307,7 +3319,7 @@
 "Des exemples sont disponibles sur <a href=\"http://ace.home.xs4all.nl/X-"
 "Faces/\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Image"
@@ -3343,7 +3355,7 @@
 "Les listes de distribution « %2 » sont vides et ne peuvent pas être "
 "utilisées."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Ajouter au carnet d'adresses"
@@ -3353,22 +3365,22 @@
 msgid "Contact created successfully"
 msgstr "Contact créé avec succès "
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Impossible d'enregistrer le contact : %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Impossible d'enregistrer le contact"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Voulez-vous vraiment joindre le dossier « %1 » ?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Joindre le dossier"
@@ -3586,14 +3598,14 @@
 msgstr "D&ossier"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Appliquer les filtres sur le dossier"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3619,7 +3631,7 @@
 msgstr "&Transmettre"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&ppliquer les filtres"
@@ -3644,7 +3656,7 @@
 msgstr "&Aide"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barre principale"
@@ -3699,12 +3711,12 @@
 msgid "The file does not contain a message."
 msgstr "Le fichier ne contient pas de message."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Le fichier contient plusieurs messages. Seul le premier est affiché."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3714,32 +3726,32 @@
 "jointe dans un seul message (sous la même forme qu'une réduction MIME), ou "
 "en tant que messages individuels ?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Envoyer le condensé"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Envoyer individuellement"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrage des messages"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrage du message %1 sur %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Déplacement des messages"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Suppression des messages"
@@ -3768,28 +3780,28 @@
 msgid "Text Direction Toolbar"
 msgstr "Barre d'outils d'orientation du texte"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail est maintenant en mode déconnecté, les tâches réseau sont suspendues"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Envoyer le courrier électronique"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Impossible d'envoyer le courrier électronique"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail est maintenant en mode en ligne, les tâches réseau reprennent"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3798,37 +3810,37 @@
 "KMail est maintenant en ligne ; les tâches réseau reprendront lorsqu'une "
 "connexion réseau sera détectée."
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail est pour le moment en mode hors ligne. Que voulez-vous faire ?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "En ligne / Hors ligne"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Travailler en ligne"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Travailler hors ligne"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Connexion réseau détectée, les tâches réseau reprennent"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Aucune connexion réseau détectée, les tâches réseau sont suspendues"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3837,12 +3849,12 @@
 "Impossible d'ouvrir le fichier enregistré automatiquement à %1.\n"
 "Raison : %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Échec de l'ouverture du fichier enregistré automatiquement"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3853,7 +3865,7 @@
 "Ces %1 identités ont été modifiées afin qu'elles utilisent le transport par "
 "défaut :"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3864,43 +3876,47 @@
 "Ces %1 identités ont été modifiées afin qu'elles utilisent le transport "
 "édité :"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Envoi des messages"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Initialisation du processus d'envoi..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "La ressource %1 ne fonctionne pas."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"La ressource %1 ne fonctionne pas.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1 : %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "L'agent d'archivage de courriel n'a pas été enregistré."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "L'agent d'envoi différé n'a pas été enregistré."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "L'agent de rappel des messages suivis n'a pas été enregistré"
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3909,12 +3925,12 @@
 "Impossible de lancer le gestionnaire de certificats ; veuillez vérifier que "
 "Kleopatra est correctement installé."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Erreur de KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3923,26 +3939,26 @@
 "Impossible de lancer l'assistant d'importation. Veuillez vérifier que "
 "ImportWizard est correctement installé."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Impossible de démarrer l'assistant d'importation"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Impossible de lancer le programme d'exportation des paramètres PIM. Veuillez "
+"Impossible de lancer le programme d'exportation des données PIM. Veuillez "
 "vérifier votre installation."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Impossible de lancer le programme d'exportation des paramètres PIM"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Impossible de lancer le programme d'exportation des données PIM"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3951,73 +3967,73 @@
 "Impossible de lancer l'assistant d'importation. Veuillez vérifier que "
 "ImportWizard est correctement installé."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Impossible de démarrer l'assistant d'importation"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Un autre outil de messagerie a été trouvé sur votre système. Voulez-vous "
 "importer les données de celui-ci ?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Impossible de lancer l'assistant d'importation. Veuillez vérifier votre "
 "installation."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Pas de sujet"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(aucun modèle)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Ce dossier n'a aucune option d'expiration activée"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Voulez-vous vraiment purger les messages expirés du dossier <b>%1</b> ?</"
 "qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Purger le dossier"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Faire e&xpirer les anciens messages"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Vider la corbeille"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Déplacer dans la corbeille"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Voulez-vous vraiment vider la corbeille ?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4026,27 +4042,27 @@
 "<qt>Voulez-vous vraiment déplacer tous les messages du dossier <b>%1</b> "
 "dans la corbeille ?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Tous les messages ont été déplacés vers la corbeille"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Voulez-vous vraiment purger tous les messages expirés ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Purger les anciens messages ayant expirés ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Purger"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4057,17 +4073,17 @@
 "vulnérable au courrier indésirable et peut augmenter les risques de "
 "vulnérabilité et d'intrusion dans votre système."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Avertissement concernant la sécurité"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Charger les références externes"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4082,535 +4098,535 @@
 "<qt>Voulez-vous vraiment supprimer les %1 messages sélectionnés ?<br />Une "
 "fois supprimés, ils ne pourront pas être restaurés.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Supprimer les messages"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Supprimer le message"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Déplacement des messages..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Suppression des messages..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Les messages ont été supprimés avec succès."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Les messages ont été correctement déplacés."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Échec de la suppression des messages."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Annulation de la suppression des messages."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Les messages n'ont pas pu être déplacés."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Le déplacement des messages a été annulé."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Déplacer les messages vers le dossier"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Copie des messages..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Les messages ont été correctement copiés."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Échec de la copie des messages."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Annulation de la copie des messages."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copier les messages dans le dossier"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Déplacement des messages dans la corbeille..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Suppression et déplacement des messages dans la corbeille..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Les messages ont été correctement déplacés à la corbeille."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr ""
 "Les messages ont été correctement déplacés à la corbeille ou supprimés."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Échec du déplacement des messages dans la corbeille."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr ""
 "Échec du déplacement des messages dans la corbeille ou de leur suppression."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Annulation du déplacement des messages dans la corbeille."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr ""
 "Annulation du déplacement des messages dans la corbeille ou de leur "
 "suppression."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Aller dans le dossier"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Enregistrer &sous..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Faire e&xpirer les anciens messages de tous les dossiers"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Re&lever le courriel"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Relever le courriel dans"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Relever le courriel"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Envoyer les messages en attente"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "État de connexion (inconnu)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Envoyer les messages en attente via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gestionnaire des certificats"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importer des messages..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Déboguer Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Affichage des journaux de fi&ltrage..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "Importer depuis un autre client de messagerie…"
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Modifier les réponses pour les absences..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configurer l'archivage automatique..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Messages différés..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Rappel des messages suivis..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Supprimer"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "&Déplacer le fil de discussion dans la corbeille"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Déplacer le fil de discussion dans la corbeille"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Supprimer le &fil de discussion"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "C&hercher les messages..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Séle&ctionner tous les messages"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Gestion de listes de diffusio&n..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Affecter un raccourci clavier..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Paramètres d'&expiration"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Archiver le dossier..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Charger les références e&xternes"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copier le message vers..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Déplacer le message vers..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nouveau message..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nouveau"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Message depuis un &modèle"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nouveau message dans la lis&te de diffusion..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Créer un filtre"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtrer sur le su&jet..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtrer sur l'e&xpéditeur..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtrer sur le destina&taire..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtrer sur les &Cc..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marquer le &fil de discussion"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marquer comme &lu"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marquer tous les messages du fil de discussion comme lus"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marquer comme non l&u"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marquer tous les messages du fil de discussion comme non lus"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marquer comme &important"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Retirer la marque « &important »"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marquer comme &action à effectuer"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Retirer la marque « &action à effectuer »"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Suivre le fil de discussion"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorer le fil de discussion"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Enregistrer les pièces jointes..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copier déchiffré vers..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Appli&quer tous les filtres"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Déplier le fil de discussion / groupe"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Déplier le fil de discussion ou le groupe courant"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Réduire le fil de discussion / groupe"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Réduire le fil de discussion ou groupe courant"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Déplier tous les f&ils de discussion"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Déployer tous les fils du dossier courant"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Réduire t&ous les fils de discussion"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Refermer tous les fils du dossier courant"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Afficher le message"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Message suiva&nt"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Aller au message suivant"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Message suivant non l&u"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Suivant"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Aller au prochain message non lu"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Message &précédent"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Aller au message précédent"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Message précédent non lu"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Précédent"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Aller au message précédent non lu"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Dossier suivan&t non lu"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Aller au dossier suivant contenant des messages non lus"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "D&ossier précédent non lu"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Aller au dossier précédent contenant des messages non lus"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "T&exte suivant non lu"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Aller au prochain texte non lu"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4619,223 +4635,228 @@
 "Faire défiler le message courant vers le bas. À la fin du document, passer "
 "au message non lu suivant."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configurer les &filtres..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Gérer les scripts &Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Ajouter un compte…"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introduction à KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Afficher la page de bienvenue de KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configurer les &notifications..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configurer KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Expiration..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Ajouter un dossier favori..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Inscription côté serveur..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Appliquer tous les filtres"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importer / exporter les données de KMail…"
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nouveau contact du carnet d'adresses..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copier le message dans le dossier"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Aller dans le dossier..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Abandonner l'opération en cours"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Focus sur le dossier suivant"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Focus sur le dossier précédent"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Sélectionner le dossier ayant le focus"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Focus sur le premier suivant"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Focus sur le dernier dossier"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Focus sur le message suivant"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Focus sur le message précédent"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Sélectionner le premier message"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Sélectionner le dernier message"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Sélectionner le message ayant le focus"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Placer le focus sur la recherche rapide"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Étendre la sélection au message précédent"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Étendre la sélection au message suivant"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Déplacer le message dans le dossier"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Utilise moins de bande passante"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Marquer tous messages comme lus dans ce dossier et ses sous dossiers"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Supprimer les doublons dans ce dossier et ses sous dossiers"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "&Configuration du compte"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Relancer le compte"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Ajouter un dossier favori"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Vider la corbeille"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Tout déplacer dans la &corbeille"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Su&pprimer la recherche"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Modifier la recherche..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Annuler"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Annuler : « %1 »"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtre %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Chercher... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4846,12 +4867,12 @@
 "« spam » et peut augmenter les risques de vulnérabilité et d'intrusion dans "
 "votre système."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Utiliser le HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4869,121 +4890,121 @@
 "ou désactiver entièrement la fonctionnalité dans les paramètres des modules "
 "externes de KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Activer les boîtes aux lettres unifiées ?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Activer les boîtes aux lettres unifiées"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Démarrage..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Déplacer dans la corbeille"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Corbeille"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Déplacer le message dans la corbeille"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Impossible de copier l'élément. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nouveau message à..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Répondre à..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Transmettre à..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Ajouter au contact existant"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Ouvrir dans le carnet d'adresses"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Marquer ce lien"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Modifier le contact..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Enregistrer le lien sous..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "C&hercher dans le message..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Enregistrer l'image sur le disque..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Afficher le format HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 "Afficher le format HTML lorsque le message est en provenance de ce contact"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Charger les références externes lorsque le message est en provenance de ce "
 "contact"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Partager l'image..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4992,64 +5013,64 @@
 "KMail utilise maintenant le gestionnaire d'informations personnelles "
 "Akonadi, qui apporte des changements globaux."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Pousser les courriels (« IMAP IDLE »)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Recherches améliorées"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Gestion des notes additionnelles (annotations) sur les courriels"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "L'interface est plus réactive, la vérification des courriels s'effectue en "
 "arrière-plan"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Prise en charge des modules complémentaires"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Nouveau moteur de rendu (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Ajout de la vérification d'URL d'hameçonnage"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Le client de messagerie de KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Réception du contenu du dossier"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Veuillez patienter..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5058,7 +5079,7 @@
 "KMail est actuellement en mode hors ligne. Cliquez <a href=\"kmail:goOnline"
 "\">ici</a> pour être à nouveau en ligne...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5067,22 +5088,22 @@
 "Le compte est actuellement en mode hors ligne. Cliquez <a href=\"kmail:"
 "goResourceOnline\">ici</a> pour être à nouveau en ligne...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Contact modifié avec succès "
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nouveaux messages dans"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Il n'y a aucun message non lu"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5105,8 +5126,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5203,17 +5224,17 @@
 "Sélectionner les sommaires de modules complémentaires à afficher sur la page "
 "de sommaire."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Sommaire KDE Kontact"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c) 2004 Tobias Koenig"
@@ -5260,27 +5281,27 @@
 msgid "All"
 msgstr "Tous"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Sommaire Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Vue sommaire de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2019 les développeurs de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5309,7 +5330,7 @@
 msgid "&Reply"
 msgstr "&Répondre"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Répondre..."
@@ -5319,12 +5340,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Répondre &à l'auteur..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "R&épondre à tous..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Répondre dans la &liste de diffusion..."
@@ -5354,7 +5375,7 @@
 msgid "&Edit As New"
 msgstr "&Modifier comme nouveau"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5546,114 +5567,114 @@
 msgstr ""
 "Échec de la recherche, des erreurs sont survenues :<ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Chercher des messages"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Chercher"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "Dans le corps d&u message..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "En p&ièce jointe..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Enregistrer les pièces jointes sous..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Effacer la sélection"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Aller dans le dossier d'origine"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 correspondance"
 msgstr[1] "%1 correspondances"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Dernière recherche"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Vous n'avez pas sélectionné un dossier valable."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Vous avez oublié de sélectionner des collections."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Vous avez oublié de définir une condition."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Tous les dossiers sélectionnés sont vides ou n'ont pas été indexés."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Vous avez oublié de définir une condition."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 "Impossible d'utiliser la condition « contient » avec moins de 4 caractères."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Recherche en cours..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Impossible d'obtenir les résultats de la recherche. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "La recherche a échoué."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Recherche terminée."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Recherche arrêtée."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5663,21 +5684,21 @@
 "Échec du renommage de votre dossier de recherche. Une raison classique à "
 "cela est qu'un autre dossier du même nom existe déjà. Erreur : « %1 »."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copier le message"
 msgstr[1] "Copier les %1 messages"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Couper le message"
 msgstr[1] "Couper les %1 messages"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Vérification de l'état de l'index…"
@@ -5815,7 +5836,7 @@
 "(pour une utilisation interne uniquement)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5826,7 +5847,7 @@
 "demanderons qu'une seule fois."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5834,26 +5855,26 @@
 msgstr "Ceci permet d'afficher ou non l'introduction de KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Afficher le champ de recherche rapide"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Transmettre par défaut dans le corps du message."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Avertir si le nombre de destinataires dépasse : "
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5865,19 +5886,19 @@
 "peut être désactivé."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Vérification de l'orthographe avant envoi"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automatiquement demander un accusé de réception du &message"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5894,13 +5915,13 @@
 "qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Intervalle d'enregistrement automatique :"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5913,7 +5934,7 @@
 "en lui affectant la valeur 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5921,7 +5942,7 @@
 "dans l'éditeur."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
@@ -5929,38 +5950,38 @@
 "format chiffré"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Une liste de toutes les adresses dernièrement utilisées"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Une liste de tous les encodages dernièrement utilisés"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Afficher l'indicateur de chiffrement"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Raccourci par défaut de confirmation d'envoi"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 "La taille de la fenêtre d'identité (pour une utilisation interne uniquement)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
@@ -5968,7 +5989,7 @@
 "uniquement)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
@@ -5976,7 +5997,7 @@
 "uniquement)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
@@ -5984,7 +6005,7 @@
 "interne uniquement)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
@@ -5992,85 +6013,85 @@
 "interne uniquement)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Affichage du panneau d'aperçu des messages"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Ne pas afficher"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Afficher en dessous de la liste des messages"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Afficher à côté de la liste des messages"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Liste des dossiers"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Longue liste de dossiers"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Liste de dossiers courte"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Modèle pour les nouveaux messages"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Modèle de message pour la réponse"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Modèle de message pour la réponse à tous"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Modèle de message pour la transmission"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Marques de citation"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Définit la politique utilisée à l'affichage de celle-ci"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6080,7 +6101,7 @@
 "une utilisation interne uniquement)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6090,7 +6111,7 @@
 "utilisation interne uniquement)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6100,7 +6121,7 @@
 "(pour une utilisation interne uniquement)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6110,7 +6131,7 @@
 "(pour une utilisation interne uniquement)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6120,7 +6141,7 @@
 "une utilisation interne uniquement)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6394,7 +6415,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6430,7 +6451,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6766,8 +6787,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Vérifie la présence d'URL de suivi de courriel"
+msgid "Scan emails for tracking URLs"
+msgstr "Détecter des URL de pistage dans les emails"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7401,6 +7422,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Réactiver tous les avertissements « Ne plus poser la question »"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 secondes"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Annuler l'envoi"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7456,6 +7487,12 @@
 msgid "Zoom: %1%"
 msgstr "Zoom : %1 %"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Fragments de texte"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Vérifie la présence d'URL de suivi de courriel"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Nom du dossier et taille proche du quota"
 
@@ -11291,11 +11328,6 @@
 #~ msgstr "Utiliser l'identité par &défaut"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Nom de l'identité"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "&Le serveur gère les extensions « Sieve »"
@@ -13387,10 +13419,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "Ouverture de l'URL..."
 
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "Voulez-vous vraiment exécuter la commande <filename>%1</filename> ?"
-
 #~ msgid "Execute"
 #~ msgstr "Exécuter"
 
diff -Nru kmail-19.04.3/po/fr/kmail-refresh-settings.po kmail-19.12.3/po/fr/kmail-refresh-settings.po
--- kmail-19.04.3/po/fr/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/fr/kmail-refresh-settings.po	2020-03-03 00:34:01.000000000 +0000
@@ -0,0 +1,106 @@
+# Simon Depiets <sdepiets@gmail.com>, 2019, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-10 13:50+0800\n"
+"Last-Translator: Simon Depiets <sdepiets@gmail.com>\n"
+"Language-Team: French <kde-francophone@kde.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 20.03.70\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Simon Depiets"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "sdepiets@gmail.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Assistant KMail de rafraîchissement des paramètres"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Auteur"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Rafraîchissement des paramètres de KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Avertissement"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Paramètres de nettoyage"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Terminer"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Nettoyer"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Suppression des paramètres « TipOfDay » obsolètes : Terminé"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr ""
+"Suppression des paramètres de boîtes de dialogue dans le fichier « %1 » : "
+"Terminé"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Suppression des paramètres de filtres dans le fichier « %1 » : Terminé"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+"Nettoyage des paramètres des Dossiers dans le fichier de configuration "
+"« %1 » : Terminé"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr ""
+"Nettoyage de la taille des boîtes de dialogue dans le fichier de "
+"configuration « %1 » : Terminé"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Veuillez fermer KMail / Kontact avant de l'utiliser."
diff -Nru kmail-19.04.3/po/fr/ktnef.po kmail-19.12.3/po/fr/ktnef.po
--- kmail-19.04.3/po/fr/ktnef.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/fr/ktnef.po	2020-03-03 00:34:01.000000000 +0000
@@ -3,21 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Joëlle Cornavin <jcorn@free.fr>, 2012, 2013.
 # Vincent Pinon <vpinon@kde.org>, 2017.
+# Simon Depiets <sdepiets@gmail.com>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2017-05-10 18:02+0100\n"
-"Last-Translator: Vincent Pinon <vpinon@kde.org>\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
+"PO-Revision-Date: 2019-11-11 07:38+0800\n"
+"Last-Translator: Simon Depiets <sdepiets@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.07.70\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
@@ -25,12 +26,12 @@
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
-msgstr "Joëlle Cornavin"
+msgstr "Joëlle Cornavin, Simon Depiets"
 
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
-msgstr "jcorn@free.fr"
+msgstr "jcorn@free.fr, sdepiets@gmail.com"
 
 #: attachpropertydialog.cpp:58
 #, kde-format
diff -Nru kmail-19.04.3/po/ga/akonadi_archivemail_agent.po kmail-19.12.3/po/ga/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ga/akonadi_archivemail_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/ga/akonadi_archivemail_agent.po	2020-03-03 00:34:02.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: archivemailagent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2012-05-14 16:25-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -179,12 +179,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr ""
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/ga/akonadi_mailfilter_agent.po kmail-19.12.3/po/ga/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ga/akonadi_mailfilter_agent.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/ga/akonadi_mailfilter_agent.po	2020-03-03 00:34:02.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: mailfilteragent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2011-12-28 12:28-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -22,40 +22,40 @@
 msgid "Filter Log Viewer"
 msgstr ""
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr ""
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
 "data is collected and shown only when logging is turned on. "
 msgstr ""
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Mionsonraí Logála"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr ""
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -65,34 +65,34 @@
 "given."
 msgstr ""
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr ""
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr ""
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr ""
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "gan teorainn"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -101,70 +101,70 @@
 "until the limit is no longer exceeded. "
 msgstr ""
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Earráid KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr ""
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr ""
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr ""
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr ""
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Rialacha scagtha á luacháil:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Comhoiriúnaíodh rialacha scagaire.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr ""
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr ""
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr ""
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Réidh"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/ga/kmail.po kmail-19.12.3/po/ga/kmail.po
--- kmail-19.04.3/po/ga/kmail.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/ga/kmail.po	2020-03-03 00:34:02.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kdepim/kmail.po\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -181,8 +181,8 @@
 msgstr "il-eochracha criptithe le haghaidh seoladh amháin"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -287,27 +287,27 @@
 "in the addresses by hand."
 msgstr ""
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Cuóta"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Úsáid:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Stádas:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr ""
@@ -328,7 +328,7 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Teimpléid"
@@ -339,107 +339,107 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Amharc"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Úsáid deilbhíní sa&incheaptha"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "G&nách:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Gan léamh:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Tai&speáin colún:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Réamhshocrú"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Seoltóir"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Faighteoir"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Liosta Teachtaireachtaí"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Úsáid comhbhailúchán réamhshocraithe"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Comhbhailiúchán"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Úsáid an téama réamhshocraithe"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Téama"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Message Status"
 msgid "Message Default Format"
 msgstr "Stádas na Teachtaireachta"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Global Options"
 msgid "Use Global Settings"
@@ -450,134 +450,139 @@
 msgid "Retrieval Options"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "A&itheantas"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Fáil"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Seoladh"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Cuntais amach (cuir ceann leis ar a laghad):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Roghanna Coitianta"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Seol Anois"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Seol Níos Déanaí"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Cuir Cuntas Leis"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu Foreground color setting"
 #| msgid "Custom..."
 msgid "Custom Account..."
 msgstr "Saincheaptha..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Seiceáil ríomhphost ag am tosaithe"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -635,7 +640,7 @@
 msgid "Fixed Width Font"
 msgstr "Cló Aonleithid"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Cumadóir"
@@ -924,93 +929,93 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Ginearálta"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Teimpléid Chaighdeánacha"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Teimpléid Shaincheaptha"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Ábhar"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Tacar carachtar"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Ceanntásca"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Iatáin"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Uathcheartú"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Síniú"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "F&ormáid:"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1018,7 +1023,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1026,17 +1031,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1044,7 +1049,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1052,36 +1057,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Inlíne"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Mar Iatán"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Default Forwarding Type:"
 msgid "Default forwarding type:"
 msgstr "Cineál Réamhshocraithe Curtha Ar Aghaidh:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "All Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Gach Faighteoir"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1089,17 +1094,17 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1110,52 +1115,52 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Ná sábháil go huathoibríoch"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Edit Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "Cuir Seoltaí is Déanaí in Eagar"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Cumraigh Ord Comhlíonta..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Ná sábháil go huathoibríoch"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Ná sábháil go huathoibríoch"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1167,77 +1172,77 @@
 msgstr[3] " nóiméad"
 msgstr[4] " nóiméad"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "C&uir Leis..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Ba&in"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Athra&igh..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Cuir Leis..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Bain"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Athraigh..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1245,127 +1250,127 @@
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Athraigh..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Iontráil tacar carachtar:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Ní thacaítear leis an tacar carachtar seo."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Ainm"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Luach"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "N&ua"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "Ai&nm:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Luach:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid signature."
 msgid "Invalid header"
 msgstr "Síniú neamhbhailí."
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Iontráil lorgfhocal nua:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Le hIatán"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Gan teorainn"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1452,7 +1457,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Cumadóir"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1571,7 +1576,7 @@
 msgid "Archive Folder"
 msgstr "Comh&ad Cartlainne:"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "Archive"
 msgctxt "@action"
@@ -1639,7 +1644,7 @@
 msgid "Notification"
 msgstr "Fógraí"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1649,12 +1654,12 @@
 msgstr[3] "%1 n-iatán (%2)"
 msgstr[4] "%1 iatán (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Folaigh liosta na n-iatán"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Taispeáin liosta na n-iatán"
@@ -1671,454 +1676,454 @@
 msgid "Encoding"
 msgstr "Ionchódú"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Socraigh ábhar na teachtaireachta seo"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "A&itheantas:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Foclóir:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "Ó:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Á&bhar:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Seol Post"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Seol Post Trí"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Seol"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Seo&l Níos Déanaí"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Seol &Níos Déanaí Trí"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Cuir sa Chiú"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Sábháil mar &Dhréacht"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Sábháil mar &Theimpléad"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Sábháil mar &Chomhad"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Ionsáigh Téacschomhad..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Le&abhar Seoltaí"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Oscail an Leabhar Seoltaí"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "Cumadóir &Nua"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Sábháil Liosta &Dáilte..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "G&lan Spásanna"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Ú&sáid Cló Aonleithid"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Práinneach"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Timfhilleadh Focal"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Lose the formatting?"
 msgid "Rich Text Editing"
 msgstr "Úsáid gnáth-théacs mar sin féin?"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "G&ach Réimse"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "A&itheantas"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Foclóir"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Ó"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Á&bhar"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Litreoir..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Litreoir"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Criptigh"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Sínigh"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Aimsigh Teachtaireachtaí..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Cumraigh KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Líne: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Colún: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "FOR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "IONS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Litreoir: ann"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Litreoir: as"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Ath&shábháil mar Theimpléad"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Sábháil mar Dhréacht"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
 "An bhfuil fonn ort an teachtaireacht a shábháil chun é a chur in eagar ar "
 "ball?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Dún an Cumadóir"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Theip ar Sheoladh"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert Text File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "&Ionsáigh Téacschomhad..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Ainm an iatáin:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid signature."
 msgid "Invalid Attachment Name"
 msgstr "Síniú neamhbhailí."
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "&Edit Message"
 msgid "Add URL into Message"
@@ -2129,7 +2134,7 @@
 msgstr[3] "Cuir an Teachtaireacht in &Eagar"
 msgstr[4] "Cuir an Teachtaireacht in &Eagar"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2139,17 +2144,17 @@
 msgstr[3] "Cuir Comh&aid leis mar Iatáin"
 msgstr[4] "Cuir Comh&aid leis mar Iatáin"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "gan ainm"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2158,12 +2163,12 @@
 "identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2171,12 +2176,12 @@
 "in the identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Eochair shínithe neamhshainithe"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2184,131 +2189,131 @@
 "for each message."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Níor sonraíodh ábhar"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "S&eol mar atá"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Seol Deimhniú"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Seol Anois"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "An iomarca faighteoirí"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Seol mar atá"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Cuir na Faighteoirí in &Eagar"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Úsáid gnáth-théacs mar sin féin?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2316,7 +2321,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Account Information"
 msgid "Plugin Editor Information"
@@ -2394,25 +2399,25 @@
 msgid "External editor was started."
 msgstr "Eagarthóir Seachtrach"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2439,11 +2444,6 @@
 msgid "Message will not be encrypted"
 msgstr "Ní bheidh an teachtaireacht criptithe"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Blúirí Téacs"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2492,28 +2492,28 @@
 msgid "Cannot move messages."
 msgstr "Ní féidir an teachtaireacht a bhogadh. %1"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "Níl aon fhillteán roghnaithe"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgctxt ""
 #| "@info:tooltip Formats to something like 'Messages received Yesterday'"
@@ -2557,50 +2557,50 @@
 msgid "&Existing identities:"
 msgstr "Aith&eantais atá ann:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Earráid agus fillteán %1 á athainmniú"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Iontráil lorgfhocal nua:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Cuir Aitheantas in Eagar"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Ginearálta"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&D'ainm:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2608,12 +2608,12 @@
 "this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Eagra&s:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2621,12 +2621,12 @@
 "sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "S&eoladh ríomhphoist:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2636,12 +2636,12 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Ai&liasanna ríomhphoist:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2652,12 +2652,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Cripteagrafaíocht"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2667,12 +2667,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Eochair shínithe OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2683,12 +2683,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Eochair criptithe OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2697,12 +2697,12 @@
 "not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Teastas sínithe S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2712,41 +2712,41 @@
 "functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Teastas criptiúcháin S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr ""
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "Sínigh te&achtaireachtaí go huathoibríoch"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Criptigh te&achtaireachtaí go huathoibríoch nuair is féidir"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Casta"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr ""
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2757,12 +2757,12 @@
 "address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Seoltaí &CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2773,12 +2773,12 @@
 "blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Seoltaí &BCC:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2789,92 +2789,92 @@
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Focló&ir:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Fillteán na dteachtaireachtaí seolta:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Fillteán na n&Dréachtanna:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr ""
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Cuntas Amach:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Cuir mo v-chárta leis an teachtaireacht"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Cruthaigh..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 #| msgid "Autocorrection"
 msgid "Autocorrection language:"
 msgstr "Uathcheartú"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Fearann réamhshocrai&the:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Fearann réamhshocrai&the:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr ""
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Síniú"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Pictiúr"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Ailias Neamhbhailí Ríomhphoist \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Ríomhsheoladh neamhbhailí"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2883,14 +2883,14 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
 "with the configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2899,36 +2899,36 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr ""
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Is neamhbhailí é an comhad sínithe"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Cuir Aitheantas \"%1\" in Eagar"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Eagar..."
@@ -2965,6 +2965,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Seol Deimhniú"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3114,7 +3127,7 @@
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3151,7 +3164,7 @@
 msgstr[3] ""
 msgstr[4] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Cuir leis an Leabhar Seoltaí"
@@ -3162,23 +3175,23 @@
 msgid "Contact created successfully"
 msgstr "D'éirigh le scriosadh na dteachtaireachtaí."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Failed to parse vCard."
 msgid "Failed to store contact"
 msgstr "Níorbh fhéidir an v-Chárta a pharsáil."
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr ""
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Ceangail Fillteán"
@@ -3383,7 +3396,7 @@
 msgstr "F&illteán"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "A&pply Filter"
@@ -3391,7 +3404,7 @@
 msgstr "Cuir Scagaire i bh&Feidhm"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3417,7 +3430,7 @@
 msgstr "Ar A&ghaidh"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Cuir Scagaire i bh&Feidhm"
@@ -3443,7 +3456,7 @@
 msgstr "Cab&hair"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Príomhbharra Uirlisí"
@@ -3502,44 +3515,44 @@
 msgid "The file does not contain a message."
 msgstr "Níl aon teachtaireacht sa chomhad."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Seol Mar Dhíolaim"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Seol Ceann ar Cheann"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr ""
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr ""
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Teachtaireachtaí á mbogadh"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Teachtaireachtaí á scriosadh"
@@ -3568,45 +3581,45 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "Tá KMail as líne; tá gach jab líonra curtha ar fionraí"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr ""
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr ""
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Ar Líne/As Líne"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr ""
@@ -3615,34 +3628,34 @@
 #
 #
 #
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Oibrigh As Líne"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Níl aon cheangal líonra ar fáil, tá gach jab líonra curtha ar fionraí"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr ""
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3653,7 +3666,7 @@
 msgstr[3] ""
 msgstr[4] ""
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3664,174 +3677,177 @@
 msgstr[3] ""
 msgstr[4] ""
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Teachtaireachtaí á seoladh"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr ""
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Earráid KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Ní féidir an treoraí iompórtála a thosú"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr ""
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start import wizard"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Ní féidir an treoraí iompórtála a thosú"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Ní féidir an treoraí iompórtála a thosú"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Gan Ábhar"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(gan teimpléid)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr ""
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr ""
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Folmhaigh an Bruscar"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Cuir sa Bhruscar"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr ""
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Bhí gach teachtaireacht curtha sa bhruscar"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr ""
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr ""
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr ""
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3839,17 +3855,17 @@
 "compromised by other present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Rabhadh Slándála"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr ""
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3863,769 +3879,775 @@
 msgstr[3] ""
 msgstr[4] ""
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Scrios Teachtaireachtaí"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Scrios Teachtaireacht"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Teachtaireachtaí á mbogadh..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Teachtaireachtaí á scriosadh..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "D'éirigh le scriosadh na dteachtaireachtaí."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "D'éirigh le bogadh na dteachtaireachtaí."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Bog Teachtaireachtaí go Fillteán"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Teachtaireachtaí á gcóipeáil..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "D'éirigh le cóipeáil na dteachtaireachtaí."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Teachtaireachtaí á gcur sa bhruscar..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Teachtaireachtaí á gcur sa bhruscar..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "D'éirigh le cur na dteachtaireachtaí sa Bhruscar."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "D'éirigh le cur na dteachtaireachtaí sa Bhruscar."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Teachtaireachtaí á gcur sa bhruscar..."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Teachtaireachtaí á gcur sa bhruscar..."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Sábháil M&ar..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Cuir Gach Fillteán As &Feidhm"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr ""
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Faigh Ríomhphost Nua"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Faigh Ríomhphost Nua"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Seol Teachtaireachtaí Ciúáilte"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Stádas ar líne (anaithnid)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Seol Teachtaireachtaí Ciúáilte Trí"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Bainisteoir na dTeastas"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Iompórtáil Teachtaireachtaí..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr ""
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr ""
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Cuir Freagraí \"As Láthair Ón Oifig\" in Eagar..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr ""
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "Teachtaireachtaí á scriosadh..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Aimsigh Teachtaireachtaí..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Scrios"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "&Cuir Snáithe sa Bhruscar"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Cuir an snáithe sa Bhruscar"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Scrios Snáit&he"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Aimsigh Teachtaireachtaí..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Roghnaigh G&ach Teachtaireacht"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr ""
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr ""
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr ""
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr ""
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr ""
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Teachtaireacht &Nua..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nua"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr ""
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr ""
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Cruthaigh Scagaire"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr ""
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr ""
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter Action"
 msgid "Filter on &Cc..."
 msgstr "Gníomh Scagaire"
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr ""
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr ""
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr ""
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr ""
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr ""
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr ""
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr ""
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Bí ag &Faire ar an Snáithe"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Tabhair Neamha&ird ar an Snáithe"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Sábháil Ia&táin..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Cóipeáil an Mhír Go..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr ""
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr ""
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr ""
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr ""
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr ""
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr ""
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr ""
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Taispeáin Teachtaireacht"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "A&n Chéad Teachtaireacht Eile"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Téigh go dtí an chéad teachtaireacht eile"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "An Chéad Teachtaireacht &Neamhléite Eile"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Ar Aghaidh"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr ""
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Teachtaireacht &Roimhe Seo"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr ""
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Roimhe Seo"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr ""
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr ""
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr ""
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr ""
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr ""
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr ""
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Cumraigh &Scagairí..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Bainistigh Scripteanna Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Cuir Cuntas Leis"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "Tús &Eolais ar KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Taispeáin Leathanach Fáilte KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "C&umraigh Fógairt..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Cumraigh KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr ""
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr ""
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr ""
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "A&pply Filter"
 msgid "Apply All Filters"
 msgstr "Cuir Scagaire i bh&Feidhm"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "&Iompórtáil Sonraí KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr ""
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr ""
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr ""
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr ""
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr ""
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr ""
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Bog Teachtaireacht go Fillteán"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
 # no "ag"
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Socruithe"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Local Account"
+msgid "Restart Account"
+msgstr "Cuntas Logánta"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Fol&mhaigh an Bruscar"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Cuir Gach Teachtaireacht sa &Bhruscar"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Scrios Cuar&dach"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Cuir Script in Eagar..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Scagaire %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Á Thosú..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4633,12 +4655,12 @@
 "present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Úsáid HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4648,44 +4670,44 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "&Cancel"
 msgid "Cancel"
 msgstr "&Cealaigh"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Á Thosú..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Cuir sa Bhruscar"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Cuir sa Bhruscar"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Cuir an teachtaireacht sa bhruscar"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid ""
 #| "Cannot open file \"%1\":\n"
@@ -4695,177 +4717,177 @@
 "Ní féidir an comhad \"%1\" a oscailt:\n"
 "%2"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Teachtaireacht Nua Chuig..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr ""
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr ""
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Failed to parse vCard."
 msgid "Add to Existing Contact"
 msgstr "Níorbh fhéidir an v-Chárta a pharsáil."
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Oscail sa Leabhar Seoltaí"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Cruthaigh Leabharmharc don Nasc Seo"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Cuir teagmháil in eagar..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Sábháil an Nasc Mar..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr ""
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Sábháil an Íomhá ar an diosca..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Show HTML Code"
 msgid "Show HTML Format"
 msgstr "Taispeáin Cód HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Image On Disk..."
 msgid "Share image..."
 msgstr "Sábháil an Íomhá ar an diosca..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "Tacaíocht GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr ""
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "Cliant Ríomhphoist KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "retrieving folders"
 msgid "Retrieving Folder Contents"
 msgstr "fillteáin á bhfáil"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Fan go fóill, le do thoil"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "as líne"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully."
 msgid "Contact modified successfully"
 msgstr "D'éirigh le bogadh na dteachtaireachtaí."
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Teachtaireachtaí Nua I"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Níl aon teachtaireachtaí gan léamh ann"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4891,8 +4913,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -4985,17 +5007,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5044,27 +5066,27 @@
 msgid "All"
 msgstr "Uile"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5092,7 +5114,7 @@
 msgid "&Reply"
 msgstr "&Freagair"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Freagair..."
@@ -5102,12 +5124,12 @@
 msgid "Reply to A&uthor..."
 msgstr ""
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr ""
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr ""
@@ -5138,7 +5160,7 @@
 msgid "&Edit As New"
 msgstr "Cuir an Teachtaireacht in &Eagar"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5333,45 +5355,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Aimsigh Teachtaireachtaí"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Cuardaigh"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Inlíne..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Sábháil Iatáin..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Glan Roghnúchán"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5381,74 +5403,74 @@
 msgstr[3] ""
 msgstr[4] ""
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Cuardach Is Déanaí"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "Á Thosú..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Can not get search result. %1"
 msgid "Cannot get search result. %1"
 msgstr "Ní féidir toradh an chuardaigh a fháil. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "Cealaíodh an cuardach"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgctxt "@info:status Number of emails retrieved."
 #| msgid " completed"
 msgid "Search complete."
 msgstr " críochnaithe"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid "Searches"
 msgid "Search stopped."
 msgstr "Cuardaigh"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5456,7 +5478,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5466,7 +5488,7 @@
 msgstr[3] "Cóipeáil %1 dTeachtaireacht"
 msgstr[4] "Cóipeáil %1 Teachtaireacht"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5476,7 +5498,7 @@
 msgstr[3] "Gearr %1 dTeachtaireacht"
 msgstr[4] "Gearr %1 Teachtaireacht"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5601,7 +5623,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5609,7 +5631,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5617,26 +5639,26 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr ""
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5645,19 +5667,19 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr ""
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5668,13 +5690,13 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Eatramh idir sábháil:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5683,152 +5705,152 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 #| msgid "Show crypto &icons"
 msgid "Show crypto label indicator"
 msgstr "Taispeáin de&ilbhíní criptiúcháin"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Pána Réamhamhairc"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Ná taispeáin teachtaireacht sa phána réamhamhairc"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Taispeáin an pána réamhamhairc faoi liosta na dteachtaireachtaí"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Liosta Fillteán"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Liosta fada fillteán"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Gearrliosta fillteán"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr ""
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr ""
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr ""
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr ""
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr ""
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5836,7 +5858,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5844,7 +5866,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5852,7 +5874,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5860,7 +5882,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5868,7 +5890,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6124,7 +6146,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6433,10 +6455,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Faigh Ríomhphost Nua"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -6948,6 +6969,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr ""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7016,6 +7047,14 @@
 msgid "Zoom: %1%"
 msgstr "Súmáil"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Blúirí Téacs"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Faigh Ríomhphost Nua"
+
 #~ msgid "Zoom"
 #~ msgstr "Súmáil"
 
@@ -9254,9 +9293,6 @@
 #~ msgid "Unnamed"
 #~ msgstr "Gan ainm"
 
-#~ msgid "Local Account"
-#~ msgstr "Cuntas Logánta"
-
 #~ msgid "Edit with:"
 #~ msgstr "Cuir in eagar le:"
 
diff -Nru kmail-19.04.3/po/ga/ktnef.po kmail-19.12.3/po/ga/ktnef.po
--- kmail-19.04.3/po/ga/ktnef.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/ga/ktnef.po	2020-03-03 00:34:02.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2012-05-14 16:25-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
diff -Nru kmail-19.04.3/po/gl/akonadi_archivemail_agent.po kmail-19.12.3/po/gl/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/gl/akonadi_archivemail_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/gl/akonadi_archivemail_agent.po	2020-03-03 00:34:03.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-03-03 13:43+0100\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
 "Language-Team: Galician <kde-i18n-doc@kde.org>\n"
@@ -18,10 +18,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 18.12.2\n"
-"X-Environment: kde\n"
-"X-Accelerator-Marker: &\n"
-"X-Text-Markup: kde4\n"
 
 #: addarchivemaildialog.cpp:44
 #, kde-format
@@ -183,13 +179,13 @@
 "Non se pode engadir un segundo arquivo para este cartafol. Modifique o "
 "existente no canto diso."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "O directorio non existe. Verifique a configuración. Posponse o arquivado."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Comezar a arquivar %1"
diff -Nru kmail-19.04.3/po/gl/akonadi_followupreminder_agent.po kmail-19.12.3/po/gl/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/gl/akonadi_followupreminder_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/gl/akonadi_followupreminder_agent.po	2020-03-03 00:34:03.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-29 10:00+0100\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
 "Language-Team: Galician <kde-i18n-doc@kde.org>\n"
@@ -16,99 +16,98 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Axente de lembranza de seguimento"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Lembranza de seguimento"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "© 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Mantedor."
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Adrián Chaves Fernández"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "adrian@chaves.io"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Para"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Asunto"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Data límite"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Resposta"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Recibido"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Á espera"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Mostrar a mensaxe"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Eliminar"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Quere retirar o elemento seleccionado?"
 msgstr[1] "Quere retirar os %1 elementos seleccionados?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Recibiuse unha resposta de %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Aínda está a agardar por unha resposta sobre esta mensaxe:"
diff -Nru kmail-19.04.3/po/gl/akonadi_mailfilter_agent.po kmail-19.12.3/po/gl/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/gl/akonadi_mailfilter_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/gl/akonadi_mailfilter_agent.po	2020-03-03 00:34:03.000000000 +0000
@@ -1,43 +1,40 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-#
 # Xosé <xosecalvo@gmail.com>, 2011, 2012, 2013.
 # Adrian Chaves Fernandez <adriyetichaves@gmail.com>, 2013, 2015.
-# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017, 2018.
+# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017, 2018, 2019.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2018-10-21 18:38+0100\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
+"PO-Revision-Date: 2019-10-27 08:26+0100\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
-"Language-Team: Galician <kde-i18n-doc@kde.org>\n"
+"Language-Team: Galician <proxecto@trasno.gal>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Environment: kde\n"
-"X-Accelerator-Marker: &\n"
-"X-Text-Markup: kde4\n"
+"X-Generator: Lokalize 19.11.70\n"
 
 #: filterlogdialog.cpp:67
 #, kde-format
 msgid "Filter Log Viewer"
 msgstr "Visor do rexistro de filtrado"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Compartir…"
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Rexistrar a actividade de filtrado"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -46,23 +43,23 @@
 "Pode activar aquí o rexistro das actividades de filtrado. De feito, os datos "
 "rexistrados recóllense e móstranse só cando se activa o rexistro. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalles do rexistro"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Descrición do padrón de rexistro"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Avaliación do rexistro da &regra de filtrado"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -71,39 +68,39 @@
 "about the result of the evaluation of all rules of a single filter will be "
 "given."
 msgstr ""
-"Pode controlar no rexistro o rendemento relativo á aplicación das regras de "
+"Pode controlar no rexistro o rendemento relativo á avaliación das regras de "
 "filtrado dos filtros aplicados: se marca esta opción terá un informe "
 "detallado de cada regra de filtrado; doutro xeito só terá información do "
 "resultado da avaliación completa de todas as regras de cada filtro."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Rexistrar a avaliación dos padróns de filtrado"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Rexistrar as accións de filtrado"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Límite de tamaño do rexistro:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "sen límite"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -116,7 +113,7 @@
 "quere empregar: se o tamaño dos datos rexistrados excede este límite entón "
 "os datos máis antigos descártanse ata que non se exceda máis o límite. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -125,63 +122,63 @@
 "Non se puido escribir no ficheiro %1:\n"
 "«%2» é a descrición detallada do erro."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Erro de KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Estase a filtrar a mensaxe %1 de %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Produciuse un erro ao aplicar o movemento do filtro de correo."
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Produciuse un erro ao aplicar a eliminación do filtro de correo"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Produciuse un erro ao aplicar as modificacións do filtro de correo"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Estanse a avaliar as regras de filtrado:</b>"
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>As regras de filtrado atoparon coincidencias.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Comezar a filtrar na mensaxe «%1» desde «%2» en «%3»:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Estanse a filtrar as mensaxes"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Activouse o rexistro de filtrado do correo"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Listo"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrando en %1"
diff -Nru kmail-19.04.3/po/gl/akonadi_sendlater_agent.po kmail-19.12.3/po/gl/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/gl/akonadi_sendlater_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/gl/akonadi_sendlater_agent.po	2020-03-03 00:34:03.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-12-29 10:01+0100\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
 "Language-Team: Galician <kde-i18n-doc@kde.org>\n"
@@ -18,10 +18,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
-"X-Environment: kde\n"
-"X-Accelerator-Marker: &\n"
-"X-Text-Markup: kde4\n"
 
 #: sendlaterconfiguredialog.cpp:37
 #, kde-format
@@ -65,124 +61,124 @@
 msgid "Your emails"
 msgstr "mvillarino@users.sourceforge.net, xosecalvo@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Para"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Asunto"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Enviar arredor das"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Repetido"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Identificador da mensaxe"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Non hai mensaxes agardando…"
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Enviar agora"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Eliminar"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Si"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Non"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Quere eliminar os elementos escollidos ? Quere continuar?"
 msgstr[1] "Quere eliminar os elementos seleccionados?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Retirar os elementos"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Quere retirar tamén as mensaxes?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Retirar as mensaxes"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Non se atopou ningunha mensaxe."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Non se atopou ningunha mensaxe."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Produciuse un erro ao obter a mensaxe."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Non se pode obter a mensaxe. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Non é posíbel crear o transporte"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "A mensaxe non é unha mensaxe real"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Non se pode enviar a mensaxe."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Atopouse un erro. Quere reenviala?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Atopouse un erro"
diff -Nru kmail-19.04.3/po/gl/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/gl/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/gl/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/gl/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:03.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-17 20:34+0100\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
 "Language-Team: Galician <kde-i18n-doc@kde.org>\n"
@@ -15,7 +15,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
 
 #: settingsdialog.cpp:63
 #, kde-format
@@ -52,37 +51,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Sincronizando a caixa de correo unificada %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Engadir unha caixa de correo unificada"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nome:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Seleccionar unha icona…"
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Icona:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Entrada"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Enviada"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Borradores"
diff -Nru kmail-19.04.3/po/gl/kmail.po kmail-19.12.3/po/gl/kmail.po
--- kmail-19.04.3/po/gl/kmail.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/gl/kmail.po	2020-03-03 00:34:03.000000000 +0000
@@ -19,19 +19,16 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-03-28 13:39+0100\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-11-28 00:30+0100\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
-"Language-Team: Galician <kde-i18n-doc@kde.org>\n"
+"Language-Team: Galician <proxecto@trasno.gal>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 18.12.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Environment: kde\n"
-"X-Accelerator-Marker: &\n"
-"X-Text-Markup: kde4\n"
+"X-Generator: Lokalize 19.08.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -55,7 +52,7 @@
 "Internet mailing standards including IMAP, POP3 and SMTP."
 msgstr ""
 "KMail é o cliente de correo fornecido por KDE. Está deseñado para ser "
-"completamente compatíbel cos estándares de correo de internet como IMAP, "
+"completamente compatíbel cos estándares de correo de Internet como IMAP, "
 "POP3 e SMTP."
 
 #: about/introduction_kmail.html:10
@@ -197,8 +194,8 @@
 msgstr "Varias chaves de cifrado por enderezo"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -304,27 +301,27 @@
 "KMail non puido detectar ningunha lista de correo neste cartafol de maneira "
 "automática. Introduza os enderezos á man."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Cota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Uso:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Estado:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% completa"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 de %2 utilizado"
@@ -347,7 +344,7 @@
 "desexe asociar a este cartafol.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Modelos"
@@ -358,106 +355,106 @@
 msgstr "&Usar os modelos de mensaxe personalizados deste cartafol"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copiar os modelos globais"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vista"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Empregar &iconas personalizadas"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Sen ler:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Mostrar a columna de remitente/destinatario na lista de mensaxes"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Mostrar a columna:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Predeterminado"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Remitente"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatario"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Lista de mensaxes"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Empregar o agrupamento predeterminado"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agrupamento"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Empregar o tema predeterminado"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Formato predeterminado das mensaxes"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Preferir HTML a texto"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Preferir texto a HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Empregar as opcións globais"
@@ -467,100 +464,105 @@
 msgid "Retrieval Options"
 msgstr "Opcións de obtención"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identidades"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Recepción"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Envío"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Servidor de LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contas de saída (engada polo menos unha):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opcións comúns"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Confirmar &previamente ao envío"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Comprobar a ortografía antes de enviar."
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nunca automaticamente"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Nas comprobacións manuais de correo electrónico"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "En todas as comprobacións de correo electrónico"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Enviar agora"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Enviar máis tarde"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Enviar as &mensaxes do cartafol de saída:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Método de en&vío predeterminado:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Permitir desfacer os envíos"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Engadir unha conta de correo…"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Conta personalizada…"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -569,30 +571,30 @@
 "Non se puido iniciar o asistente de contas. Asegúrese de que instalou "
 "axeitadamente o asistente de contas (AccountWizard)."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Non se pode iniciar o asistente de contas"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Incluír na comprobación man&ual do correo"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Poñer sen conexión ao apagar KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Comprobar o correo no inicio"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -608,7 +610,7 @@
 #: configuredialog/configureappearancepage.cpp:101
 #, kde-format
 msgid "Fonts"
-msgstr "Tipos de letra"
+msgstr "Fontes"
 
 #: configuredialog/configureappearancepage.cpp:107
 #, kde-format
@@ -648,9 +650,9 @@
 #: configuredialog/configureappearancepage.cpp:144
 #, kde-format
 msgid "Fixed Width Font"
-msgstr "Tipo de letra de anchura fixa"
+msgstr "Fonte monoespazo"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Editor"
@@ -663,7 +665,7 @@
 #: configuredialog/configureappearancepage.cpp:158
 #, kde-format
 msgid "&Use custom fonts"
-msgstr "&Usar tipos de letra personalizados"
+msgstr "&Usar fontes personalizadas"
 
 #: configuredialog/configureappearancepage.cpp:177
 #, kde-format
@@ -956,61 +958,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Non se pode crear a etiqueta, xa existe unha co mesmo nome."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Xeral"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Modelos estándar"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Modelos personalizados"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Asunto"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Caracteres"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Anexos"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Corrección automática."
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Axustar o tamaño da imaxe automaticamente."
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Sinatura"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1019,12 +1021,12 @@
 "Inserir automaticamente a sinatura configurada\n"
 "ao comezar a redactar unha mensaxe"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Inserir a sinatura por riba do texto citado"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1033,18 +1035,18 @@
 "Inserir o separador de sinaturas compatíbel con RFC\n"
 "(dous trazos e un espazo nunha liña) antes da sinatura"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Ao responder, non citar ningunha sinatura existente"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formato"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1055,7 +1057,7 @@
 "(no canto da mensaxe completa )\n"
 "cando houber texto seleccionado na xanela da mensaxe."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1067,17 +1069,17 @@
 "mesmo cando a liña se crease engadindo un salto de liña adicional\n"
 "ao axustar as palabras do texto."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Activar o axuste automático de palabras na anchura que se indique"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Indique a anchura de texto para o axuste automático de palabras"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1089,7 +1091,7 @@
 "Se está desmarcada, a resposta será en texto simple de maneira "
 "predeterminada."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1100,34 +1102,34 @@
 "HTML.\n"
 "Admítense negra, cursiva e texto subliñado, listas e referencias externas."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Inserir en liña"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Como anexo"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Indicar o formato predeterminado das mensaxes encamiñadas"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tipo de reenvío predeterminado:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1139,17 +1141,17 @@
 "Isto pódese escoller para cada mensaxe empregando «Opcións - Solicitar "
 "notificación de entrega»"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Avisar se se indican demasiados destinatarios"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Indicar o número máximo de destinatarios do aviso"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1166,7 +1168,7 @@
 "Lembre, porén, que isto non ten en conta as listas de distribución ou de "
 "correo."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1175,18 +1177,18 @@
 "Lembrar os enderezos recentes inseridos,\n"
 "e ofrecelos para completar automaticamente os destinatarios"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Non gardar"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Máximo de enderezos recentes retidos:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1195,23 +1197,23 @@
 "O número máximo de enderezos recentemente inseridos\n"
 "que se han de lembrar para completar"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configurar o completado…"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Gardar automaticamente"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Non gardar automaticamente"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1219,18 +1221,18 @@
 msgstr[0] " minuto"
 msgstr[1] " minutos"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Gardar automaticamente a mensaxe con este intervalo indicado"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefi&xos para os asuntos nas réplicas"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1240,59 +1242,59 @@
 "(as entradas son expresións regulares que non distinguen entre maiúsculas e "
 "minúsculas):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Enga&dir…"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Ret&irar"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mod&ificar…"
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Insira un novo prefixo de resposta:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefi&xos do asunto nos reenvíos"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Engadir…"
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Retir&ar"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modificar…"
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Insira un novo prefixo de reenvío:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1302,90 +1304,90 @@
 "busca dunha codificación que conteña todos os caracteres requiridos."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modificar…"
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Insira a codificación:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Manter a codificación orixinal cando se responda ou se reenvíe (se é "
 "posíbel)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Non se permite esta codificación."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Empregar sufixo identificador de mensaxe personalizado"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Sufixo &identificador de mensaxe personalizado:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definir campos personalizados para a cabeceira MIME:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nome"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valor"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&va"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 "«Content-Type» non é unha cadea permitida. Esta cabeceira non se gardará."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Cabeceira incorrecta"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomes de anexos compatíbel co Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1394,40 +1396,40 @@
 "Escolla esta opción para facer que o Outlook(tm) comprenda nomes de anexos "
 "que conteñan caracteres non ingleses"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Activar a detección de ficheiros anexos perdidos"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Recoñecer calquera das seguintes palabras clave como intencións de anexar un "
 "ficheiro:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Insira unha nova palabra clave:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Tamaño máximo de anexos:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Sen límite"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1513,8 +1515,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "Complementos de texto de conversión"
+msgid "Text Conversion Plugins"
+msgstr "Complementos de conversión de texto"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1628,7 +1630,7 @@
 msgid "Archive Folder"
 msgstr "Arquivar o cartafol"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1694,19 +1696,19 @@
 msgid "Notification"
 msgstr "Notificación"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 anexo (%2)"
 msgstr[1] "%1 anexos (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Agochar a lista de anexos"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Mostrar a lista de anexos"
@@ -1723,334 +1725,334 @@
 msgid "Encoding"
 msgstr "Codificación"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Seleccione o dicionario que desexe utilizar para corrixir a ortografía desta "
 "mensaxe"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Seleccione o cartafol de correo enviado no que desexe gardar unha copia "
 "desta mensaxe"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 "Seleccione a conta de envío que desexe empregar para enviar esta mensaxe"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Indique o enderezo «De:» para esta mensaxe"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Indique un asunto para esta mensaxe"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identidade:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Dicionario:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Cartafol das men&saxes enviadas:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Transpo&rte de correo:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&De:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "As&unto:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Enviar o correo"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Enviar o correo mediante"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Enviar"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Enviar &máis tarde"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Enviar &máis tarde mediante"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Pór na fila"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Gardar como &borrador"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Gardar o correo no cartafol de borradores"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Gardar como &modelo"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Gardar o correo no cartafol de modelos"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Gardar como &ficheiro"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Gardar o correo como un ficheiro de texto ou HTML."
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Inserir un ficheiro de texto…"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Inserir un ficheiro de texto recente"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "C&aderno de enderezos"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Abrir o caderno de enderezos"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Novo editor"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Escoller os &destinatarios…"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Gardar a lista de &distribución…"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Pegar como ane&xo"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Limpar os &espazos"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
-msgstr "Empregar un tipo de letra de anchura fixa"
+msgstr "Usar unha fonte monoespa&zo"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urxente"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Solicita&r confirmación de entrega da mensaxe"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Solicita&r confirmación de entrega"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Axuste de pala&bras"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "Fragmento&s"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Revisión &automática da ortografía"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Edición de texto enriquecido"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Texto enriquecido"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Alternar o método de edición de texto enriquecido"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Todos os c&ampos"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identidade"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Dicionario"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Cartafol das men&saxes enviadas"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Transporte de c&orreo"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&De"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "As&unto"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Amecer a s&inatura"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "&Engadir a sinatura ao comezo"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Inserir a sinatura na posición do &cursor"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Corrección o&rtográfica…"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Corrección ortográfica"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Cifrar a mensaxe"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Cifrar"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "A&sinar a mensaxe"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Asinar"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Formato criptográfico da mensaxe"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Escolla o formato criptográfico para esta mensaxe"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Crear unha lembranza de seguimento…"
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configurar KMail…"
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2059,53 +2061,53 @@
 "<qt>Isto agocha a barra do menú por completo. Pódese mostrar de novo "
 "escribindo %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Agochar a barra de menú"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Liña: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Columna %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "SOB"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Corrección ortográfica: activada"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Corrección ortográfica: desactivada"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Volver gardar como &modelo"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Gardar como borrador"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2114,7 +2116,7 @@
 "Volver gardar esta mensaxe no cartafol de modelos. Así poderase usar máis "
 "adiante."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2123,82 +2125,82 @@
 "Gardar esta mensaxe no cartafol de borradores. Así poderá editarse e enviada "
 "de novo no futuro."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Quere descartar a mensaxe ou gardala para despois?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Pechar o editor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "A garda automática da mensaxe fallou"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Fallou o envío da mensaxe"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Inserir un ficheiro"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Engadir como imaxe &incorporada"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Engadir como &anexo"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nome do anexo:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "O nome do anexo non pode estar baleiro"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Nome de anexo incorrecto"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Engadir o URL á mensaxe"
 msgstr[1] "Engadir os URL á mensaxe"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Engadir este ficheiro como &anexo"
 msgstr[1] "Engadir estes ficheiros como &anexos"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Inserir o texto do portapapeis como anexo"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "sen nome"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2211,12 +2213,12 @@
 "isto (OpenPGP ou S/MIME).</p><p>Por favor, escolla a(s) chave(s) a empregar "
 "na configuración da identidade.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "A chave de cifrado non está definida"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2227,12 +2229,12 @@
 "(OpenPGP ou S/MIME) a empregar.</p><p>Por favor, defina a chave a usar na "
 "configuración da identidade.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "A chave de sinatura non está definida"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2243,7 +2245,7 @@
 "estabelecer o seu enderezo de correo electrónico para todas as identidades, "
 "de xeito que non teña que inserilo para cada mensaxe."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2252,37 +2254,37 @@
 "Debe especificar como mínimo un destinatario, xa sexa no campo de "
 "destinatario, no de copia ou no de copia agochada."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "O campo «Para:» está baleiro. Enviar a mensaxe de todos os xeitos?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Non se especificou ninguén en Para:"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Non especificou o asunto. Enviar a mensaxe de todos os xeitos?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Non se especificou ningún asunto"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&Enviar deste xeito"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "E&specificar o asunto"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2290,22 +2292,22 @@
 msgstr ""
 "Debe especificar como mínimo un destinatario para poder cifrar o borrador."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "A piques de enviar o correo…"
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Enviar unha confirmación"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Env&iar agora"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2313,44 +2315,44 @@
 msgstr ""
 "Pretende enviar unha mensaxe a máis de %1 destinatarios. Envíase igual?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Demasiados destinatarios"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Envi&ar como está"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Editar os destinatarios"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "Desactivar o modo HTML fai que o texto perda o formato. Ten certeza?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Perder o formato?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perder o formato"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Engadir texto simple de etiquetas"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2359,7 +2361,7 @@
 "Usarase cifraxe de alta seguridade para este destinatario (confíase "
 "plenamente na chave de cifraxe). Prema a icona para máis información."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2368,7 +2370,7 @@
 "Usarase cifraxe de seguridade media para este destinatario (confíase "
 "parcialmente na chave de cifraxe). Prema a icona para máis información."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2377,7 +2379,7 @@
 "Usarase cifraxe de pouca seguridade para este destinatario (non se confía na "
 "chave de cifraxe). Prema a icona para máis información."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2388,7 +2390,7 @@
 "cifraxe (non se puido verificar a chave de cifraxe). Prema a icona para máis "
 "información."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Información do editor de complementos"
@@ -2465,7 +2467,7 @@
 msgid "External editor was started."
 msgstr "Iniciouse o editor externo."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2474,19 +2476,19 @@
 "Non se atopou o transporte. Verifique que usará o transporte de correo "
 "axeitado."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "O cartafol de enviado non está definido. Configúreo antes de enviar correo."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Non se atopou a identidade. Verifique que usará a identidade axeitada."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2513,11 +2515,6 @@
 msgid "Message will not be encrypted"
 msgstr "Non se cifrará a mensaxe"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Fragmentos de texto"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2563,27 +2560,27 @@
 msgid "Cannot move messages."
 msgstr "Non se poden mover as mensaxes."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Non se pode obter o cartafol. Infórmase deste erro: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Non se devolveu ningún cartafol."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Non se pode obter o cartafol pai. Infórmase deste erro: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Non se pode devolver a lista de cartafoles."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Mensaxes arquivadas"
@@ -2624,48 +2621,48 @@
 msgid "&Existing identities:"
 msgstr "Identidades &existentes:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Erro ao xerar unha nova parella de chaves: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Erro de xeración de chaves"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Sen chave"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Xerar unha nova parella de chaves"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Estase a xerar un novo par de chaves…"
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Editar a identidade"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Xeral"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "O seu &nome:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2677,12 +2674,12 @@
 "p> <p>se o deixa en branco, o seu nome real non aparecerá, senón só o seu "
 "enderezo de correo electrónico.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zación:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2694,12 +2691,12 @@
 "enviado por vostede.</p><p>É seguro (e normal) deixar isto en branco.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Enderezo de correo electrónico:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2715,12 +2712,12 @@
 "p><p>Se o deixa en branco, ou o especifica mal, a xente terá problemas para "
 "lle responder.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "A&lcumes de correo electrónico:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2737,12 +2734,12 @@
 "td></tr><tr><th>Alternativos:</th><td>nome@exemplo.org<br>último@exemplo."
 "org</td></tr></table><p>Escriba un enderezo alternativo por liña.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Criptografía"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2758,12 +2755,12 @@
 "normais non se verán afectadas.</p><p>Pode atopar máis información sobre as "
 "chaves en <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Chave de asinado OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2781,12 +2778,12 @@
 "verán afectadas.</p><p>Pode atopar máis sobre as chaves en <a>https://www."
 "gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Chave de cifrado OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2799,12 +2796,12 @@
 "KMail non será quen de asinar os correos electrónicos usando S/MIME; as "
 "funcións de correo usuais non se han ver afectadas.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificado de asinado S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2819,39 +2816,39 @@
 "cifrar os correos electrónicos usando S/MIME; as funcións de correo usuais "
 "non se verán afectadas.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificado de cifrado S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Formato preferido:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Asinar as mensaxes automaticamente"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Cifrar auto&maticamente todas as mensaxes cando se poida"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Responder a este enderezo:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2870,12 +2867,12 @@
 "enderezo dun grupo.</p><p>En caso de dúbida, deixe este campo en branco.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "En&derezos para as copias:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2892,12 +2889,12 @@
 "use comas para separar a lista de destinatarios das copias.</p><p>En caso de "
 "dúbida, deixe este campo en branco.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "En&derezo para as copias agochadas:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2915,57 +2912,57 @@
 "use comas para separar a lista de destinatarios das copias agochadas.</"
 "p><p>En caso de dúbida, deixe este campo en branco.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&icionario:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Carta&fol das mensaxes enviadas:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Cartafol &dos borradores:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Cartafol dos modelos:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Conta de saída:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Anexar o meu vCard á mensaxe"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Crear…"
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Idioma da corrección automática:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Restaurar o nome do dominio predeterminado"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Dominio &predeterminado:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2974,33 +2971,33 @@
 "<qt><p>O dominio predeterminado emprégase para completar os enderezos de "
 "correo que só consisten no nome de usuario.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Usar modelos de mensaxe personalizados para esta identidade"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Sinatura"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Imaxe"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "O alcume de correo electrónico «%1» é incorrecto"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "O enderezo de correo electrónico é incorrecto"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3014,7 +3011,7 @@
 "Isto pode resultar en mensaxes de aviso por parte do destinatario cando el/a "
 "intente verificar as sinaturas feitas con esta configuración."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3024,7 +3021,7 @@
 "identificador de usuario co enderezo de correo electrónico configurado para "
 "esta identidade (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3037,7 +3034,7 @@
 "Isto podería resultar en mensaxes de aviso no lado do destinatario cando "
 "intente verificar a sinatura feita con esta configuración."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3046,22 +3043,22 @@
 "Un dos certificados de cifrado S/MIME non contén o enderezo de correo "
 "electrónico configurado para esta identidade (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Non se atopou o enderezo de correo electrónico na chave/certificado"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "O ficheiro da sinatura non é correcto"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Editar a identidade «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3070,7 +3067,7 @@
 "Un cartafol personalizado de identidade xa non existe; usaranse polo tanto "
 "os cartafoles predeterminados."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Editar…"
@@ -3101,6 +3098,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Non se pode eliminar o ficheiro vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Seguro que quere cancelar?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmación"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3265,7 +3274,7 @@
 "Hai exemplos dispoñíbeis en <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Imaxe"
@@ -3298,7 +3307,7 @@
 msgstr[0] "A lista de distribución %2 está baleira; Non se pode empregar."
 msgstr[1] "A lista de distribución %2 está baleira. Non se pode empregar."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Engadir ao caderno de enderezos"
@@ -3308,22 +3317,22 @@
 msgid "Contact created successfully"
 msgstr "O contacto creouse satisfactoriamente"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Non se pode almacenar o contacto: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Non se puido almacenar o contacto"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Quere anexar este cartafol «%1»?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Anexar cartafol"
@@ -3536,14 +3545,14 @@
 msgstr "Cartaf&ol"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Aplicar os filtros ao cartafol"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3569,7 +3578,7 @@
 msgstr "&Reenviar"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Apl&icar un filtro"
@@ -3594,7 +3603,7 @@
 msgstr "A&xuda"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barra de ferramentas principal"
@@ -3647,12 +3656,12 @@
 msgid "The file does not contain a message."
 msgstr "O ficheiro non contén ningunha mensaxe."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "O ficheiro contén varias mensaxes. Só se mostra a primeira."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3661,32 +3670,32 @@
 "Quere reenviar as mensaxes seleccionadas como anexos nunha mensaxe (como "
 "resumo MIME) ou como mensaxes individuais?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Enviar como resumo"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Enviar individualmente"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Estanse a filtrar as mensaxes"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Estanse a filtrar a mensaxe %1 de %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Estanse a mover as mensaxes"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Estanse a eliminar as mensaxes"
@@ -3715,69 +3724,69 @@
 msgid "Text Direction Toolbar"
 msgstr "Barra de ferramentas da dirección do texto"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail está no modo desconectado; todos os traballos na rede están en suspenso"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Enviar a mensaxe"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Non se pode enviar a mensaxe"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
-msgstr "KMail está posto con conexión; retómanse todos os traballos en rede"
+msgstr "KMail está en liña; retómanse todos os traballos en rede"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr ""
-"KMail está posto para funcionar con conexión; retomaranse todos os traballos "
-"en rede cando se detecte unha conexión de rede"
+"KMail está en liña; retomaranse todos os traballos en rede cando se detecte "
+"unha conexión de rede"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail está actualmente en modo desconectado. Como quere proceder?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
-msgstr "Conectado ou desconectado"
+msgstr "En liña ou desconectado"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
-msgstr "Traballar conectado"
+msgstr "Traballar en liña"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Traballar sen conexión"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Detectouse unha conexión de rede; retómanse todos os traballos en rede"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Non se detectou ningunha conexión de rede; todos os traballos en rede están "
 "en suspenso"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3786,12 +3795,12 @@
 "Non se puido abrir ficheiro de garda automática de %1.\n"
 "Razón: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Fallou a abertura do ficheiro de garda automática"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3800,7 +3809,7 @@
 msgstr[1] ""
 "Estas %1 identidades cambiaron para que usen o transporte predeterminado:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3809,43 +3818,47 @@
 msgstr[1] ""
 "Estas %1 identidades cambiaron para que usen o transporte modificado:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Estanse a enviar as mensaxes"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Estase a iniciar o proceso de envío…"
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "O recurso %1 está estragado."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"O recurso %1 está estragado.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Non se rexistrou un axente de arquivado de correo."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Non se rexistrou o axente Enviar Máis Tarde."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Non hai ningún axente de lembranzas de seguimento rexistrado."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3854,12 +3867,12 @@
 "Non se puido iniciar o xestor de certificados. Asegúrese de que instalou "
 "Kleopatra axeitadamente."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Erro de KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3868,26 +3881,26 @@
 "Non se puido iniciar o asistente de importación. Asegúrese de que instalou "
 "axeitadamente o asistente de importanción (ImportWizard)."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Non se pode iniciar o asistente de importación"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Non se puido iniciar o «Exportador da configuración PIM». Comprobe que estea "
+"Non se puido iniciar o «Exportador de datos PIM». Comprobe que estea "
 "instalado correctamente."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Non se pode iniciar o «Exportador da configuración PIM»."
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Non se pode iniciar o «Exportador de datos PIM»."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3896,69 +3909,69 @@
 "Non se puido iniciar o asistente de importación. Asegúrese de que instalou "
 "axeitadamente o asistente de importanción (ImportWizard)."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Non se pode iniciar o asistente de importación."
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Atopouse outro aplicativo de correo no sistema. Quere importar datos del?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Non se puido iniciar o asistente de importación. Comprobe a instalación."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Sen asunto"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(sen modelos)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Este cartafol non ten ningunha opción de caducidade estabelecida"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Seguro que quere que caduque o cartafol <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Caducar o cartafol"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Caducar"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Baleirar o lixo"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Botar no lixo"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Seguro que quere baleirar o cartafol do lixo?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3967,27 +3980,27 @@
 "<qt>Seguro que quere mover todas as mensaxes desde o cartafol <b>%1</b> para "
 "o lixo?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Movéronse todas as mensaxe para o lixo"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Seguro que quere que caduquen todas as mensaxes antigas?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Caducar as mensaxes antigas?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Caducar"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3999,17 +4012,17 @@
 "seu sistema se vise comprometido por outros ocos, actuais e futuros, de "
 "seguranza."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Advertencia de seguranza"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Cargar as referencias externas"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4024,531 +4037,531 @@
 "<qt>Seguro que quere eliminar as %1 mensaxes seleccionadas?<br />Unha vez "
 "eliminadas, non se han poder recuperar.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Eliminar as mensaxes"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Eliminar a mensaxe"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Estanse a mover as mensaxes…"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Estanse a eliminar as mensaxes…"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "As mensaxes elimináronse correctamente."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "As mensaxes movéronse satisfactoriamente."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "A eliminación das mensaxes fallou."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Cancelouse a eliminación das mensaxes."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "O traslado das mensaxes fallou."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Cancelouse o traslado das mensaxes."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Mover as mensaxes para o cartafol"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Estanse a copiar as mensaxes…"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "As mensaxes movéronse satisfactoriamente."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "A copia das mensaxes fallou."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Cancelouse o copiado das mensaxes."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copiar as mensaxes para cartafol"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Botar as mensaxes no lixo…"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Eliminando e movendo as mensaxes ao lixo…"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "As mensaxes botáronse no lixo satisfactoriamente."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "As mensaxes botáronse no lixo ou elimináronse correctamente"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "O movemento das mensaxes ao lixo fallou."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "A eliminación ou movemento das mensaxes ao lixo fallou."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Cancelouse o botado das mensaxes no lixo."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Cancelouse a eliminación ou botado das mensaxes no lixo."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Saltar ao cartafol"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Gardar &como…"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Caducar todos os cartafoles"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Co&mprobar o correo"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Comprobar o correo en"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Comprobar o correo"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Enviar as mensaxes en espera"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
-msgstr "Estado de conexión (descoñecido)"
+msgstr "Estado en liña (descoñecido)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Enviar as mensaxes en fila mediante"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Xestor de certificados"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importar mensaxes…"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Depurar Sieve…"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visor do r&existro dos filtros…"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importar doutro cliente de correo electrónico…"
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Editar as respostas «En ausencia»…"
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configurar o arquivado automático…"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Mensaxes demoradas…"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Mensaxes de lembranzas de seguimento…"
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Elimina&r"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Mover o &fío ao lixo"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Botar o fío no lixo"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Eliminar o f&ío"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Atopar mensaxes…"
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Seleccionar &todas as mensaxes"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Xestión das &listas de correo…"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Asignar un atallo…"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Opcións de &caducidade"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "Cartafol de &arquivos…"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Cargar as referencias e&xternas"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copiar a mensaxe en…"
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Mover a mensaxe para…"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nova mensaxe…"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nova"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Mensaxe a partir dun &modelo"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "N&ova mensaxe para a lista de correo…"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Crear un filtro"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtrar polo a&sunto…"
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtrar por &De…"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtrar por &Para…"
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtrar por &Copia…"
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marcar o &fío"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marcar o fío como &lido"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marcar como lidas todas as mensaxes do fío seleccionado"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marcar o fío como &non lido"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marcar como non lidas todas as mensaxes do fío seleccionado"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marcar o fío como &importante"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Retirar a marca de fío &importante"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marcar o fío como elemento de &acción"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Retirar a marca de fío elemento de acción"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Vixiar este fío"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorar este fío"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Gardar os arquivos ane&xos…"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copiar descifrado a…"
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Apl&icar todos os filtros"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expandir o fío / grupo"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expandir o fío de discusión ou grupo actual"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Pregar este fío / grupo"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Pregar o fío de discusión ou grupo actual."
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ex&pandir todos os fíos"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expandir todos os fíos do cartafol actual"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Pregar t&odos os fíos"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Pregar todos os fíos de discusión do cartafol."
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Mostrar a &mensaxe"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Me&nsaxe seguinte"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Ir á seguinte mensaxe"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Mensaxe seguinte &non lida"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Seguinte"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Ir á seguinte mensaxe non lida"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Mensaxe &previa"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Ir á mensaxe previa"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Mensaxe previa &non lida"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Anterior"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Ir á mensaxe previa non lida"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Cartafol seguinte non &lido"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Ir ao seguinte cartafol con mensaxes non lidas"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Cartafol previo &non lido"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Ir ao cartafol previo con mensaxes sen ler"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "&Texto seguinte sen ler"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Ir ao seguinte texto non lido"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4557,223 +4570,228 @@
 "Desprazar cara embaixo a mensaxe actual. Ao chegar ao final da mensaxe, ir á "
 "seguinte mensaxe non lida."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configurar os &filtros…"
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Xestionar os scripts de &Sieve…"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "Eng&adir unha conta…"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introdución a KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Mostrar a páxina de benvida de KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configurar as &notificacións…"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configurar KMail…"
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Caducar…"
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Engadir o cartafol de Favoritos…"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Subscrición da parte do servidor…"
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Aplicar todos os filtros"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importar ou exportar datos de KMail…"
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Novo contacto no caderno de enderezos…"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copiar a mensaxe ao cartafol"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Saltar ao cartafol…"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Interromper a operación actual"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Foco no cartafol seguinte"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Foco no cartafol anterior"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Escoller o cartafol co foco"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Foco no primeiro cartafol"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Foco no derradeiro cartafol"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Foco na mensaxe seguinte"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Foco na mensaxe anterior"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Seleccionar a primeira mensaxe"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Seleccionar a derradeira mensaxes"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Seleccionar a mensaxe co foco"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Estabelecer o foco na Busca rápida"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Estender a selección á mensaxe anterior"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Estender a selección á mensaxe seguinte"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Mover a mensaxe ao cartafol"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Usar menos largura de banda"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Marcar como lidas todas as mensaxes deste cartafol recursivamente"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Retirar os duplicados deste cartafol recursivamente"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "&Configuración da conta"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Reiniciar a conta"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Engadir o cartafol de Favoritos"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Baleirar o lixo"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Mover todas as mensaxes para o lixo"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Eliminar a busca"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Editar a busca…"
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Desfacer"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Desfacer: «%1»"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtro %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Buscar… <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4784,12 +4802,12 @@
 "e podería incrementar o risco de que o seu sistema se vise comprometido por "
 "outros ocos de seguranza."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Empregar HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4805,118 +4823,118 @@
 "desactivar a funcionalidade completamente na configuración do complemento de "
 "KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Activar as caixas de correo unificadas?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Activar as caixas de correo unificadas"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Estase a iniciar…"
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Mover ao lixo"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Lixo"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Botar a mensaxe no lixo"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Non se pode copiar o elemento. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nova mensaxe Para…"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Responder a…"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Reenviar A…"
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Engadir a un contacto xa existente"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Abrir no caderno de enderezos"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Marcar esta ligazón"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Editar o contacto…"
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Gardar a ligazón como…"
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Atopar na mensaxe…"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Gardar unha imaxe nun disco…"
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Mostrar o formato HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Mostrar o formato HTML cando veña correo deste contacto"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Cargar as referencias externas cando veña correo deste contacto"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Compartir a imaxe…"
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4925,97 +4943,97 @@
 "KMail baséase agora na infraestrutura de xestión da información persoal "
 "Akonadi, que supón moitos cambios en todas partes."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Correo electrónico push (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Melloras nas buscas"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Posibilidade de engadir notas (e anotacións) ás mensaxes de correo"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Menos conxelacións da interface gráfica, as comprobacións do correo "
 "prodúcense no fondo."
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Compatibilidade con complementos"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Novo renderizador de HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Engadiuse unha comprobación de URL de timo"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "O cliente de correo de KDE."
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Obtendo o contido do cartafol"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Agarde…"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Desconectado"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 msgstr ""
 "KMail está en modo sen conexión. Prema <a href=\"mail:goOnline\">aquí</a> "
-"para conectalo…</p>"
+"para poñelo en liña…</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 msgstr ""
 "A conta está no modo sen conexión. Prema <a href=\"kmail:goResourceOnline"
-"\">aquí</a> para conectala…</p>"
+"\">aquí</a> para poñela en liña…</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "O contacto modificouse satisfactoriamente"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Mensaxes novas en"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Non hai mensaxes sen ler"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5038,8 +5056,8 @@
 msgstr "© 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5132,17 +5150,17 @@
 msgstr ""
 "Seleccione os complementos dos que quere ver un resumo na páxina de resumos."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Resumo de Kontact de KDE"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "© 2004 Tobias Koenig"
@@ -5188,27 +5206,27 @@
 msgid "All"
 msgstr "Todas"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Resumo de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Vista de resumo de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© 2003-2019 Desenvolvedores de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5237,7 +5255,7 @@
 msgid "&Reply"
 msgstr "&Responder"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Responder…"
@@ -5247,12 +5265,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Responder &ao autor…"
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Responder &a todos…"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Responder á &lista de correo…"
@@ -5282,7 +5300,7 @@
 msgid "&Edit As New"
 msgstr "&Editar como nova"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5473,82 +5491,82 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "A busca fallou, atopáronse algúns erros: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Atopar mensaxes"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Buscar"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Inserir en liña…"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Como &anexo…"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Gardar os arquivos anexos…"
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Limpar a selección"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Saltar ao cartafol orixinal"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 coincidencia"
 msgstr[1] "%1 coincidencias"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Última busca"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Non seleccionou un cartafol correcto."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Esqueceu seleccionar coleccións."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Esqueceu definir unha condición."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Todos os cartafoles seleccionados están baleiros ou non se indexaron."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Esqueceu engadir condicións."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5556,32 +5574,32 @@
 "Non se poden empregar as condicións «contén» cun número de caracteres "
 "inferior a catro."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Buscando…"
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Non se pode obter o resultado da busca. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "A busca fallou."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Rematou a busca."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "A busca detívose."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5592,21 +5610,21 @@
 "frecuente pode ser que xa exista outro cartafol de buscas co mesmo nome. O "
 "erro devolvido foi «%1»."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copiar a mensaxe"
 msgstr[1] "Copiar %1 mensaxes"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Recortar a mensaxe"
 msgstr[1] "Recortar %1 mensaxes"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Comprobando o estado do índice…"
@@ -5738,10 +5756,10 @@
 "Specifies whether this is the very first time that the application is run "
 "(for internal use only)"
 msgstr ""
-"Indica se é a primeira vez que se executa o aplicativo (só para uso interno)"
+"Indica se é a primeira vez que se executa a aplicación (só para uso interno)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5751,7 +5769,7 @@
 "se detecte máis dunha conta de correo electrónico. Só se preguntará unha vez."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5760,26 +5778,26 @@
 "Este valor emprégase para decidir se se debe mostrar a introdución a KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Mostrar a edición de liña de busca rápida de cartafoles"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Reenviar inserido en liña de maneira predeterminada."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Avisar se o número de destinatarios excede de:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5790,19 +5808,19 @@
 "confirmación antes de enviar a mensaxe. Pódese desactivar este aviso."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Comprobar a ortografía antes de enviar."
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Pedir automaticamen&te confirmacións de entrega das mensaxes"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5818,13 +5836,13 @@
 "em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Intervalo de garda automática:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5837,154 +5855,154 @@
 "como 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "Mostrar o panel de xestión e inserción de fragmentos de texto no editor."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Se se marca, as mensaxes enviadas almacénanse en forma cifrada"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Unha lista de todos os URL empregados recentemente"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Unha lista de todas as codificacións empregadas recentemente"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Mostrar o indicador de etiqueta de cifrado"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Validar o atallo predeterminado de envío"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "O tamaño do diálogo de identidade (só para uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "A anchura da xanela de buscas (só para uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "A altura da xanela de buscas (só para uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "A anchura do diálogo Configurar KMail (só para uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "A altura do diálogo Configurar KMail (só para uso interno)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Panel de previsualización das mensaxes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Non mostrar un panel de previsualización das mensaxes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
 "Mostrar o panel de previsualización da mensaxe embaixo da lista de mensaxes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
 "Mostrar o panel de previsualización da mensaxe a carón da lista de mensaxes"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Lista de cartafoles"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lista de cartafoles longa"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Lista de cartafoles curta"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Modelo de mensaxe para as mensaxes novas"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Modelo de mensaxe para responder"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Modelo de mensaxe para responder a todos"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Modelo de mensaxe para os reenvíos"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Caracteres para as citas"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Indica a política seguida para mostrar a política"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5994,7 +6012,7 @@
 "uso interno)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6004,7 +6022,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6014,7 +6032,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6024,7 +6042,7 @@
 "uso interno)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6034,7 +6052,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6187,9 +6205,9 @@
 "it is off, the application will only show the dialog if it cannot find the "
 "right key or if there are several which could be used."
 msgstr ""
-"Se escolle esta opción, o aplicativo mostra sempre unha lista das chaves "
-"públicas que pode escoller para o cifrado. Se non se activa isto, o "
-"aplicativo só mostra o diálogo se non se pode atopar a chave correcta ou se "
+"Se escolle esta opción, a aplicación mostra sempre unha lista das chaves "
+"públicas que pode escoller para o cifrado. Se non se activa isto, a "
+"aplicación só mostra o diálogo se non se pode atopar a chave correcta ou se "
 "hai varias que se poidan empregar."
 
 #. i18n: ectx: property (text), widget (QCheckBox, mShowKeyApprovalDlg)
@@ -6305,7 +6323,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6341,7 +6359,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6591,7 +6609,7 @@
 "<qt><p>Algunha publicidade está en HTML e contén referencias a, por exemplo, "
 "imaxes que os anunciantes empregan para descubrir se vostede leu a mensaxe "
 "(«fallos web»).</p><p> Non hai ningunha razón correcta para cargar así as "
-"imaxes de internet, xa que o remitente pode sempre anexalas directamente á "
+"imaxes de Internet, xa que o remitente pode sempre anexalas directamente á "
 "propia mensaxe.</p><p> Para previr este abuso da funcionalidade de mostrar "
 "HTML de KMail, esta opción está <em>desactivada</em> de maneira "
 "predeterminada.</p><p>Porén, se se queren ver imaxes en mensaxes HTML que "
@@ -6602,7 +6620,7 @@
 #: ui/securitypagegeneraltab.ui:58
 #, kde-format
 msgid "Allow messages to load external references from the Internet"
-msgstr "Permitir que as mensaxes carguen contidos externos de internet"
+msgstr "Permitir que as mensaxes carguen contidos externos de Internet"
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
 #: ui/securitypagegeneraltab.ui:74
@@ -6671,8 +6689,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Comprobar o seguimento por URL do correo"
+msgid "Scan emails for tracking URLs"
+msgstr "Examinar as mensaxes en busca de URL de seguimento"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -6824,21 +6842,21 @@
 "the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
 "responder below."
 msgstr ""
-"Se se escolle esta opción, os certificados S/MIME valídanse por internet "
-"utilizando o protocolo de estado de certificados por internet (OCSP). "
+"Se se escolle esta opción, os certificados S/MIME valídanse por Internet "
+"utilizando o protocolo de estado de certificados por Internet (OCSP). "
 "Introduza o URL do servidor de OCSP embaixo."
 
 #. i18n: ectx: property (text), widget (QRadioButton, OCSPRB)
 #: ui/smimeconfiguration.ui:33
 #, kde-format
 msgid "Validate certificates online (OCSP)"
-msgstr "Validar certificados por internet (OCSP)"
+msgstr "Validar certificados por Internet (OCSP)"
 
 #. i18n: ectx: property (title), widget (QGroupBox, OCSPGroupBox)
 #: ui/smimeconfiguration.ui:40
 #, kde-format
 msgid "Online Certificate Validation"
-msgstr "Validación de certificados por internet"
+msgstr "Validación de certificados por Internet"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #: ui/smimeconfiguration.ui:50
@@ -6859,7 +6877,7 @@
 "Enter here the address of the server for online validation of certificates "
 "(OCSP responder). The URL is usually starting with http://."
 msgstr ""
-"Insira aquí o enderezo do servidor de validación por internet de "
+"Insira aquí o enderezo do servidor de validación por Internet de "
 "certificados (OCSP). O URL comeza normalmente por http://."
 
 #. i18n: ectx: property (text), widget (QCheckBox, ignoreServiceURLCB)
@@ -6968,7 +6986,7 @@
 "HTTP request."
 msgstr ""
 "Se escolle esta opción, empregarase o valor do proxy HTTP que se mostra á "
-"dereita (que ven da variábel de ambiente http_proxy) para todas as "
+"dereita (que ven da variábel de contorno http_proxy) para todas as "
 "solicitudes HTTP."
 
 #. i18n: ectx: property (text), widget (QRadioButton, honorHTTPProxyRB)
@@ -7291,6 +7309,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Activar de novo todas as advertencias «Non preguntar de novo»"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 segundos"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Desfacer o envío"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7346,6 +7374,12 @@
 msgid "Zoom: %1%"
 msgstr "Ampliación: %1%"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Fragmentos de texto"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Comprobar o seguimento por URL do correo"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Nome do cartafol e tamaño cando estea preto da cota"
 
@@ -8890,9 +8924,6 @@
 #~ msgid "R&emove"
 #~ msgstr "R&etirar"
 
-#~ msgid "Restart"
-#~ msgstr "Reiniciar"
-
 #~ msgid "Message Delayed..."
 #~ msgstr "Mensaxe adiada..."
 
diff -Nru kmail-19.04.3/po/gl/kmail-refresh-settings.po kmail-19.12.3/po/gl/kmail-refresh-settings.po
--- kmail-19.04.3/po/gl/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/gl/kmail-refresh-settings.po	2020-03-03 00:34:03.000000000 +0000
@@ -0,0 +1,103 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-11 17:17+0200\n"
+"Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
+"Language-Team: Galician <proxecto@trasno.gal>\n"
+"Language: gl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 19.04.1\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Adrian Chaves (Gallaecio)"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "adrian@chaves.io"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Asistente de KMail para a configuración de actualización"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "© 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Configuración de actualización de KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Aviso"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Limpeza da configuración"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Rematar"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Limpar"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Retirar a opción obsoleta «TipOfDay»: Feito"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Eliminar as opcións de Dialog do ficheiro «%1»: Feito"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Eliminar as opcións de Filters do ficheiro «%1»: Feito"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Limpar as opcións de Folder no ficheiro «%1»: Feito"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Limpar Dialog Size no ficheiro «%1»: Feito"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Peche KMail e Kontact antes de usar."
diff -Nru kmail-19.04.3/po/gl/ktnef.po kmail-19.12.3/po/gl/ktnef.po
--- kmail-19.04.3/po/gl/ktnef.po	2019-07-09 00:20:21.000000000 +0000
+++ kmail-19.12.3/po/gl/ktnef.po	2020-03-03 00:34:02.000000000 +0000
@@ -1,26 +1,23 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-#
 # Xosé <xosecalvo@gmail.com>, 2012, 2013.
 # Adrian Chaves Fernandez <adriyetichaves@gmail.com>, 2013, 2015, 2017.
-# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017, 2018.
+# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017, 2018, 2019.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2018-04-22 10:53+0100\n"
-"Last-Translator: Adrian Chaves <adrian@chaves.io>\n"
-"Language-Team: Galician <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
+"PO-Revision-Date: 2019-09-29 09:16+0200\n"
+"Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
+"Language-Team: Galician <proxecto@trasno.gal>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
-"X-Environment: kde\n"
-"X-Accelerator-Marker: &\n"
-"X-Text-Markup: kde4\n"
+"X-Generator: Lokalize 19.11.70\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -82,8 +79,8 @@
 "You will be presented with a dialog where you can configure the application-"
 "wide shortcuts."
 msgstr ""
-"Aparece un diálogo no que se poden configurar os atallos globais do "
-"aplicativo."
+"Aparece un diálogo no que se poden configurar os atallos globais da "
+"aplicación."
 
 #: ktnefmain.cpp:113
 #, kde-format
diff -Nru kmail-19.04.3/po/he/kmail.po kmail-19.12.3/po/he/kmail.po
--- kmail-19.04.3/po/he/kmail.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/he/kmail.po	2020-03-03 00:34:03.000000000 +0000
@@ -19,7 +19,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2017-05-16 06:41-0400\n"
 "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
 "Language-Team: Hebrew <kde-i18n-doc@kde.org>\n"
@@ -194,8 +194,8 @@
 msgstr "מפתחות הצפנה מרובים לכתובת"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -303,27 +303,27 @@
 "לא הייתה באפשרות KMail לזהות רשימת־דיוור בתיקייה זו. אנא מלא את הכתובות "
 "ידנית."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, fuzzy, kde-format
 msgid "Quota"
 msgstr "סך הכל"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, fuzzy, kde-format
 msgid "Usage:"
 msgstr "הו&דעה"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, fuzzy, kde-format
 msgid "Status:"
 msgstr "מצב: "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 %2"
@@ -343,7 +343,7 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr ""
@@ -354,106 +354,106 @@
 msgstr "השתמש ב&סיומת זיהוי הודעה מותאמת אישית"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, fuzzy, kde-format
 msgid "&Copy Global Templates"
 msgstr "הח&לף"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, fuzzy, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "תצוגה"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "השתמש ב&סמלים מותאמים אישית"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, fuzzy, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&רגיל:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, fuzzy, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&לא נקראו:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&הצג טור:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, fuzzy, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "קבע כברירת מחדל"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, fuzzy, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "השולח"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, fuzzy, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "הנמען"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "רשימת ההודעות"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, fuzzy, kde-format
 msgid "Use default aggregation"
 msgstr "&מחק אשכול"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, fuzzy, kde-format
 msgid "Aggregation"
 msgstr "הצעות"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, fuzzy, kde-format
 msgid "Use default theme"
 msgstr "&מחק אשכול"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 msgid "Message Default Format"
 msgstr "מאפייני חלק של ההודעה"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 msgid "Prefer HTML to text"
 msgstr "הע&דף HTML על פני טקסט רגיל"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 msgid "Prefer text to HTML"
 msgstr "ה&עדף HTML על פני טקסט רגיל"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 msgid "Use Global Settings"
 msgstr "אפס הגדרות גופנים"
@@ -463,131 +463,136 @@
 msgid "Retrieval Options"
 msgstr "אפשרויות כלליות"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&זהות"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, fuzzy, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "&קבלה"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, fuzzy, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "&שליחה"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "חשבונות דואר יוצא (הוסף לפחות חשבון אחד):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "אפשרויות נפוצות"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "שא&ל לפני שליחה"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "לעולם לא אוטומטית"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "בבדיקת דוא\"ל ידנית"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "בכל בדיקת דוא\"ל"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "שלח עכשיו"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "שלח אחר כך"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "שלח את ההו&דעות שבתיבת הדואר היוצא:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "שיטת השלי&חה המשמשת כברירת מחדל:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 msgid "Add Mail Account..."
 msgstr "הוספת חשבון"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 msgid "Custom Account..."
 msgstr "הוספת חשבון"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
 msgstr "אין אפשרות להפעיל את מנהל התעודות. בדוק את ההתקנה שלך."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, fuzzy, kde-format
 msgid "Unable to start account wizard"
 msgstr "אין אפשרות ליצור את החשבון"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, fuzzy, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "כלול בבדיקת דואר &ידנית"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, fuzzy, kde-format
 msgid "Check mail on startup"
 msgstr "&בדוק דואר בהפעלה"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -643,7 +648,7 @@
 msgid "Fixed Width Font"
 msgstr "גופן ברוחב קבוע"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "כתבן"
@@ -946,91 +951,91 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, fuzzy, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "כללי"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, fuzzy, kde-format
 msgid "Standard Templates"
 msgstr "הח&לף"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, fuzzy, kde-format
 msgid "Custom Templates"
 msgstr "הח&לף"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, fuzzy, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "נושא"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, fuzzy, kde-format
 msgid "Charset"
 msgstr "&מערך תווים"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, fuzzy, kde-format
 msgid "Headers"
 msgstr "הוסף כותרת"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, fuzzy, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "&מצורפים"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "חתימה"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "השתמש בגופן קטן יותר עבור ציטוטים"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "&רגיל:"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1038,7 +1043,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1046,17 +1051,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1064,7 +1069,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1072,34 +1077,34 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, fuzzy, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "&מוטבעים"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, fuzzy, kde-format
 msgid "As Attachment"
 msgstr "מכיל מצורף"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 msgid "Default forwarding type:"
 msgstr "תחום &ברירת מחדל:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "<נמענים>"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1107,17 +1112,17 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "הצג אזהרה אם תעודת השורש &פגה תוך פחות מ:"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1128,49 +1133,49 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "ללא שמירה אוטומטית"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "ערוך כתובות אחרונות"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 msgid "Configure Completion..."
 msgstr "הגדרות סדר השלמה"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "ללא שמירה אוטומטית"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "ללא שמירה אוטומטית"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1178,18 +1183,18 @@
 msgstr[0] " דקות"
 msgstr[1] " דקות"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "רשימת ההודעות"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "&קידומות לנושאי תשובות"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1198,59 +1203,59 @@
 "זהה כל רצף של הקידומות הבאות\n"
 "(הרשומות הן ביטויים סדירים שאינם תלויי רישיות):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "ה&וספה..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "הס&ר"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&שינוי..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "הזן קידומת תשובה חדשה:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "&קידומות לנושאי העברות"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "הוספה..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "ה&סר"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "שינוי..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "הזן קידומת העברה חדשה:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1260,125 +1265,125 @@
 "תווים המכיל את כל התווים הנדרשים."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "שי&נוי..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "הזן מערך תווים:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "שמור על מערך התווי&ם המקורי בעת תשובה או העברה (אם הדבר אפשרי)."
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "מערך תווים זה אינו נתמך."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "השתמש ב&סיומת זיהוי הודעה מותאמת אישית"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "סיומת זיהוי הו&דעה מותאמת אישית:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "הגדר שדות כותרות Mime מותאמים אישית:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, fuzzy, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "שם"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, fuzzy, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "ערך"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, fuzzy, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&חדש"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, fuzzy, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&שם:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&ערך:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 msgid "Invalid header"
 msgstr "&רק כותרות"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "הזן קידומת תשובה חדשה:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "מכיל מצורף"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, fuzzy, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " MB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1457,7 +1462,7 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "כתבן"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1569,7 +1574,7 @@
 msgid "Archive Folder"
 msgstr "תיקייה חדשה"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1635,19 +1640,19 @@
 msgid "Notification"
 msgstr "הודעה לגבי דואר חדש"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "מצורף:  %1"
 msgstr[1] "מצורף:  %1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 msgid "Hide attachment list"
 msgstr "שמירת מצורף בשם"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 msgid "Show attachment list"
 msgstr "שמירת מצורף בשם"
@@ -1664,471 +1669,471 @@
 msgid "Encoding"
 msgstr "קידוד"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 msgid "Set a subject for this message"
 msgstr "                 קבע את נושא ההודעה"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "זה&ות:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&מילון:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "תיקיית דואר נשל&ח:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "מעביר &דואר:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&מאת:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, fuzzy, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&נושא:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&שלח דואר"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&שלח דואר באמצעות"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, fuzzy, kde-format
 msgid "Send"
 msgstr "&שלח"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "שלח &אחר-כך"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "שלח &אחר-כך באמצעות"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, fuzzy, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "בתור"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, fuzzy, kde-format
 msgid "Save as &Draft"
 msgstr "&שמור כטיוטה"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 msgid "Save email in Draft folder"
 msgstr "חפש בכל התיקיות ה&מקומיות"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, fuzzy, kde-format
 msgid "Save as &Template"
 msgstr "הח&לף"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 msgid "Save email in Template folder"
 msgstr "הח&לף"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 msgid "Save as &File"
 msgstr "שמור לקובץ"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, fuzzy, kde-format
 msgid "&Insert Text File..."
 msgstr "&הוספת קובץ..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, fuzzy, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&הוסף קובץ אחרון"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&פנקס כתובות"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 msgid "Open Address Book"
 msgstr "פתח בפנקס הכתובות"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&כתבן חדש"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "בחר &נמענים"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "שמור רשימת &תפוצה..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "הדבק בתור &מצורף"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&נקה רווחים"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "השתמש ב&גופן ברוחב קבוע"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, fuzzy, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&דחוף"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&גלישת שורות"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "בדיקת איות &אוטומטית"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 msgid "Rich Text Editing"
 msgstr "מידע אודות החיבור"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&כל השדות"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&זהות"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&מילון"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "תיקיית דואר נשל&ח"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "מעביר &דואר"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&מאת"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, fuzzy, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&נושא"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "&הוסף חתימה"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, fuzzy, kde-format
 msgid "Pr&epend Signature"
 msgstr "&הוסף חתימה"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&בדיקת איות..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "בודק איות"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "ה&צפן את ההודעה"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "הצפן"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&חתום על ההודעה"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "חתום"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "&חיפוש הודעות..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, fuzzy, kde-format
 msgid "Configure KMail..."
 msgstr "ה&גדרת KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, fuzzy, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " שורה: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " טור: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, fuzzy, kde-format
 msgid "Spellcheck: on"
 msgstr "בודק איות"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, fuzzy, kde-format
 msgid "Spellcheck: off"
 msgstr "בודק איות"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, fuzzy, kde-format
 msgid "Re&save as Template"
 msgstr "הח&לף"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&שמור כטיוטה"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "האם ברצונך להיפטר מההודעה או לשמור אותה לאחר כך?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "סגור כתבן"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 msgid "Autosave Message Failed"
 msgstr "שמירה אוטומטית נכשלה"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 msgid "Sending Message Failed"
 msgstr "שמירה אוטומטית נכשלה"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "&הוספת קובץ..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, fuzzy, kde-format
 msgid "Add as &Attachment"
 msgstr "הוסף בתור מצורף"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "שם המצורף:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 msgid "Invalid Attachment Name"
 msgstr "&רק כותרות"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "הודעה מוצפנת"
 msgstr[1] "הודעה מוצפנת"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, fuzzy, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "הוסף בתור מצורף"
 msgstr[1] "הוסף בתור מצורף"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, fuzzy, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "הדבק בתור &מצורף"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "ללא שם"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2137,12 +2142,12 @@
 "identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "מפתח הצפנה לא מוגדר"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2153,12 +2158,12 @@
 "(OpenPGP או S/MIME) שישמש לשם כך. </p><p> באפשרותך להגדיר את המפתח שייעשה בו "
 "שימוש עם הזהות הנוכחית בדו-שיח הגדרות הזהות. </p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "מפתח חתימה לא מוגדר"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2166,131 +2171,131 @@
 "for each message."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr "עליך לציין לפחות נמען אחד בשדה, או בשדה \"נמען\" או \"עותק סמוי\"."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, fuzzy, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "לא ציינת נושא. האם לשלוח את ההודעה בכל זאת?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, fuzzy, kde-format
 msgid "No To: specified"
 msgstr "לא צויין נושא"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "לא ציינת נושא. האם לשלוח את ההודעה בכל זאת?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "לא צויין נושא"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&שלח ללא שינוי"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&תן לי לציין את הנושא"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "עליך לציין לפחות נמען אחד בשדה, או בשדה \"נמען\" או \"עותק סמוי\"."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "עומד לשלוח דואר..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "וידוא שליחה"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "שלח &עכשיו"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, fuzzy, kde-format
 msgid "Too many recipients"
 msgstr "<נמענים>"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&שלח ללא שינוי"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, fuzzy, kde-format
 msgid "&Edit Recipients"
 msgstr "<נמענים>"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 msgid "Lose Formatting"
 msgstr "מידע אודות החיבור"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 msgid "Add Markup Plain Text"
 msgstr "הודעה בתור טקסט רגיל"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2298,7 +2303,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 msgid "Plugin Editor Information"
 msgstr "וידוא שליחה"
@@ -2369,25 +2374,25 @@
 msgid "External editor was started."
 msgstr "עורך חיצוני"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2414,11 +2419,6 @@
 msgid "Message will not be encrypted"
 msgstr "שמור הודעות בצורה מוצ&פנת"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr ""
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2462,27 +2462,27 @@
 msgid "Cannot move messages."
 msgstr "העברת הודעות לתיקייה"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "נכשל בעת יצירת התיקייה"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 msgid "No folder returned."
 msgstr "לא נבחרה תיקייה."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "נכשל בעת יצירת התיקייה"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 msgid "Unable to return list of folders."
 msgstr "נמחקה הודעה ישנה אחת מהתיקייה %2."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 msgid "Messages archived"
 msgstr "ההודעה נחתמה על ידי %1."
@@ -2523,48 +2523,48 @@
 msgid "&Existing identities:"
 msgstr "זהויות &קיימות:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "שגיאה בעת שינוי שם התיקייה %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 msgid "Generate a new key pair"
 msgstr "הזן קידומת תשובה חדשה:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "עריכת זהות"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, fuzzy, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "כללי"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "ה&שם שלך:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2572,12 +2572,12 @@
 "this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "אי&רגון:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2585,12 +2585,12 @@
 "sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "כתובת &דוא\"ל:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2600,12 +2600,12 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 msgid "Email a&liases:"
 msgstr "כתובת &דוא\"ל:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2616,12 +2616,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, fuzzy, kde-format
 msgid "Cryptography"
 msgstr "&קריפטוגרפיה"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2631,12 +2631,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "מפתח OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2647,12 +2647,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "מפתח הצפנה של OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2661,12 +2661,12 @@
 "not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr ""
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2676,39 +2676,39 @@
 "functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr ""
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "מועדף"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 msgid "Automatically sign messages"
 msgstr "&חתום על הודעות באמצעות OpenPGP באופן אוטומטי"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "הצ&פן הודעות באופן אוטומטי בכל עת שהדבר אפשרי"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, fuzzy, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "&מתקדם"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "כתובת &תשובה:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2719,12 +2719,12 @@
 "address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 msgid "&CC addresses:"
 msgstr "כתובות עותק &סמוי:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2739,12 +2739,12 @@
 "זה משמש בדרך כלל כדי לשלוח עותק מכל הודעה לחשבון נוסף ששייך לך.</p><p> אם "
 "אינך בטוח מה לעשות, השאר שדה זה ריק.</p> </qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "כתובות עותק &סמוי:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2759,57 +2759,57 @@
 "זה משמש בדרך כלל כדי לשלוח עותק מכל הודעה לחשבון נוסף ששייך לך.</p><p> אם "
 "אינך בטוח מה לעשות, השאר שדה זה ריק.</p> </qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&מילון:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "תיקיית דואר שנש&לח:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "תיקיית &טיוטות:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, fuzzy, kde-format
 msgid "&Templates folder:"
 msgstr "תיקיית אש&פה:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 msgid "Outgoing Account:"
 msgstr "הגדרות החשבון"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 msgid "Attach my vCard to message"
 msgstr "     להודעה \"header\" הוסף את הכותרת"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 msgid "Create..."
 msgstr "שינוי שם..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 msgid "Autocorrection language:"
 msgstr "בחר ש&פה:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 msgid "Restore default domain name"
 msgstr "תחום &ברירת מחדל:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "תחום &ברירת מחדל:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2818,33 +2818,33 @@
 "<qt><p>תחום ברירת המחדל משמש להשלמת כתובות דוא\"ל שמורכבות משם משתמש בלבד.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, fuzzy, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "השתמש ב&סיומת זיהוי הודעה מותאמת אישית"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "חתימה"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, fuzzy, kde-format
 msgid "Picture"
 msgstr "&תמונה"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "כתובת דוא\"ל לא תקפה"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "כתובת דוא\"ל לא תקפה"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2853,14 +2853,14 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
 "with the configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2869,29 +2869,29 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "כתובת הדוא\"ל של רשות התעודות שמנפיקה תעודות"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "קובץ החתימה לא תקף"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "עריכת הזהות \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -2900,7 +2900,7 @@
 "תיקיית הטיוטות המותאמת אישית עבור הזהות \"%1\" אינה קיימת (עוד). לכן, ייעשה "
 "שימוש בתיקיית הטיוטות המוגדרת כברירת מחדל."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "ערוך..."
@@ -2931,6 +2931,19 @@
 msgid "We cannot delete vCard file."
 msgstr "אין אפשרות לסנכרן את תיקיית ספריית הדואר."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "וידוא שליחה"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3081,7 +3094,7 @@
 "קיימות מספר דוגמאות בכתובת <a href=\"http://www.xs4all.nl/~ace/X-Faces/\"> "
 "http://www.xs4all.nl/~ace/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3114,7 +3127,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "הוסף לפנקס הכתובות"
@@ -3124,22 +3137,22 @@
 msgid "Contact created successfully"
 msgstr "ההודעות נמחקו בהצלחה"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 msgid "Failed to store contact"
 msgstr "שם המצורף:"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "האם אתה בטוח שברצונך לרוקן את תיקיית האשפה?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 msgid "Attach Folder"
 msgstr "תיקייה חדשה"
@@ -3345,14 +3358,14 @@
 msgstr "ת&יקייה"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 msgid "Apply Filters on Folder"
 msgstr "ה&חל את כל מסננים"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3378,7 +3391,7 @@
 msgstr "ה&עברה"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "החל מס&נן"
@@ -3403,7 +3416,7 @@
 msgstr "&צפצף"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr ""
@@ -3457,44 +3470,44 @@
 msgid "The file does not contain a message."
 msgstr "הקובץ הזה לא מכיל הודעה."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 msgid "Send As Digest"
 msgstr "לשלוח ללא חתימה?"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, fuzzy, kde-format
 msgid "Filtering messages"
 msgstr "מוחק הודעות"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, fuzzy, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "מעביר את הודעה %3 מתוך %2 מ-%1."
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "מעביר הודעות"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "מוחק הודעות"
@@ -3523,78 +3536,78 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "&שלח דואר"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "עומד לשלוח דואר..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr ""
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "כרגע, KMail רצה במצב לא מקוון. איך ברצונך להמשיך?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr ""
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "עבוד באופן מקוון"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "עבוד באופן לא מקוון"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "שמירה אוטומטית נכשלה"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3602,7 +3615,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3610,146 +3623,148 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "שולח הודעות"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, fuzzy, kde-format
 msgid "Initiating sending process..."
 msgstr "מאתחל תהליך שליחה..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
 "properly installed."
 msgstr "אין אפשרות להפעיל את מנהל התעודות. בדוק את ההתקנה שלך."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "שגיאה של KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr "אין אפשרות להפעיל את מנהל התעודות. בדוק את ההתקנה שלך."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 msgid "Unable to start import wizard"
 msgstr "אין אפשרות ליצור את החשבון"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "אין אפשרות להפעיל את מנהל התעודות. בדוק את ההתקנה שלך."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "אין אפשרות להפעיל את העורך החיצוני."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr "אין אפשרות להפעיל את מנהל התעודות. בדוק את ההתקנה שלך."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "אין אפשרות ליצור את החשבון"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "אין אפשרות להפעיל את מנהל התעודות. בדוק את ההתקנה שלך."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "ללא נושא"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, fuzzy, kde-format
 msgid "(no templates)"
 msgstr "השתמש ב&סיומת זיהוי הודעה מותאמת אישית"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "לתיקייה זו אין אפשרויות תפוגה מוגדרות"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>האם אתה בטוח שברצונך להפיג את התיקייה <b>%1</b>? </qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "הפגת תיקייה"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&הפג"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "רוקן אשפה"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "העבר לאשפה"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "האם אתה בטוח שברצונך לרוקן את תיקיית האשפה?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3758,27 +3773,27 @@
 "<qt> האם אתה בטוח שברצונך להעביר את כל ההודעות מהתיקייה <b>%1</b> אל האשפה?  "
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "כל ההודעות הועברו לאשפה"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "האם אתה בטוח שברצונך להפיג את כל ההודעות הישנות?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "הפג הודעות ישנות?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "הפג"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3789,17 +3804,17 @@
 "הסבירות לכך שהמערכת שלך תהיה נתונה לסיכונים מצד ניצולי אבטחה קיימים או "
 "עתידיים אחרים."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "אזהרת אבטחה"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "טען הפניות חיצוניות"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, fuzzy, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3814,535 +3829,535 @@
 "<qt>האם אתה בטוח שברצונך למחוק את %1 ההודעות הנבחרות?<br>מרגע שהן יימחקו, לא "
 "ניתן יהיה לשחזר אותן.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "מחיקת הודעות"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "מחיקת הודעה"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, fuzzy, kde-format
 msgid "Moving messages..."
 msgstr "מעביר הודעות"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, fuzzy, kde-format
 msgid "Deleting messages..."
 msgstr "מוחק הודעות"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, fuzzy, kde-format
 msgid "Messages deleted successfully."
 msgstr "ההודעות נמחקו בהצלחה"
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, fuzzy, kde-format
 msgid "Messages moved successfully."
 msgstr "ההודעות הועברו בהצלחה"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "מחיקת ההודעות נכשלה."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "מחיקת ההודעות נכשלה."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "העברת ההודעות נכשלה."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "העברת ההודעות בוטלה."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "העברת הודעות לתיקייה"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, fuzzy, kde-format
 msgid "Copying messages..."
 msgstr "מעביר הודעות"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, fuzzy, kde-format
 msgid "Messages copied successfully."
 msgstr "ההודעות הועברו בהצלחה"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, fuzzy, kde-format
 msgid "Copying messages failed."
 msgstr "העברת ההודעות נכשלה."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, fuzzy, kde-format
 msgid "Copying messages canceled."
 msgstr "העברת ההודעות בוטלה."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, fuzzy, kde-format
 msgid "Copy Messages to Folder"
 msgstr "העתקת הודעה לתיקייה"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "מעביר הודעות אל האשפה..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "מעביר הודעות אל האשפה..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "ההודעות הועברו לפח בהצלחה"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "ההודעות הועברו לפח בהצלחה"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "העברת ההודעות אל הפח נכשלה."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "העברת ההודעות אל הפח נכשלה."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "העברת ההודעות אל הפח בוטלה."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "העברת ההודעות אל הפח בוטלה."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "העתק לתיקייה"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "שמירה &בשם..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "הפ&ג את כל התיקיות"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "בדוק דו&אר"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, fuzzy, kde-format
 msgid "Check Mail In"
 msgstr "בדוק דוא&ר בחשבון"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, fuzzy, kde-format
 msgid "Check Mail"
 msgstr "בדוק דו&אר"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&שלח הודעות שבתור"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr ""
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "&שלח הודעות שבתור דרך"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, fuzzy, kde-format
 msgid "Certificate Manager"
 msgstr "מנהל תעודות..."
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 msgid "&Import Messages..."
 msgstr "&ייבוא הודעות..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr ""
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, fuzzy, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "סינון לפי &מאת..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "ערוך הודעות \"מחוץ למשרד\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "הגדרות &התראות..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 msgid "Delayed Messages..."
 msgstr "מוחק הודעות"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "&חיפוש הודעות..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, fuzzy, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "נמחק"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "&העבר אשכל לאשפה"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "העבר אשכול אל פח האשפה"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "&מחק אשכול"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&חיפוש הודעות..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "בחר את &כל ההודעות"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, fuzzy, kde-format
 msgid "&Mailing List Management..."
 msgstr "ניהול רשימת־דיוור"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&שייך קיצור..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "הגדרות &תפוגה"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, fuzzy, kde-format
 msgid "&Archive Folder..."
 msgstr "תיקייה &חדשה..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "טען הפניות &חיצוניות"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, fuzzy, kde-format
 msgid "Copy Message To..."
 msgstr "הודעה חדשה אל..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, fuzzy, kde-format
 msgid "Move Message To..."
 msgstr "הודעה חדשה אל..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "הודעה &חדשה..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, fuzzy, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "חדש"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, fuzzy, kde-format
 msgid "Message From &Template"
 msgstr "אין הודעות חדשות בשרת"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "הודעה חדשה לרשימת־ה&דיוור..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&צור מסנן"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "סינון לפי ה&נושא..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "סינון לפי &מאת..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "סינון לפי &אל..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 msgid "Filter on &Cc..."
 msgstr "סינון לפי &אל..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "סמ&ן אשכול"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "סמן אשכול בתור &נקרא"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "סימון כל ההודעות באשכול הנבחר בתור הודעות שנקראו"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "סמן אשכול בתור &לא נקרא"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "סימון כל ההודעות באשכול הנבחר בתור הודעות שלא נקראו"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "סמן אשכול בתור &חשוב"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "בטל סימון של אשכול &חשוב"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, fuzzy, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "סמן אשכול בתור ח&דש"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "הסר סימון של הודעה &חשובה"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&עקוב אחר אשכול"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "ה&תעלם מאשכול"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "שמירת &מצורפים..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 msgid "Copy Decrypted To..."
 msgstr "הודעה חדשה אל..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "ה&חל את כל מסננים"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&הרחב אשכול"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 msgid "Expand the current thread or group"
 msgstr "הרחבת האשכול הנוכחי"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&צמצם אשכול"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 msgid "Collapse the current thread or group"
 msgstr "צמצום האשכול הנוכחי"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "ה&רחב את כל האשכולות"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "הרחבת כל האשכולות בתיקייה הנוכחית"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "צמצם את כ&ל האשכולות"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "צמצום כל האשכולות בתיקייה הנוכחית"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&הצג הודעה"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&ההודעה הבאה"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "מעבר להודעה הבאה"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "ההודעה ה&באה שלא נקראה"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr ""
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "מעבר להודעה הבאה שלא נקראה"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "ההודעה ה&קודמת"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "מעבר להודעה הקודמת"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "ההודעה הקודמת ש&לא נקראה"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, fuzzy, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "ההודעה ה&קודמת"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "מעבר להודעה הקודמת שלא נקראה"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "ה&תיקייה הבאה שלא נקראה"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "מעבר לתיקייה הבאה שיש בה הודעות שלא נקראו"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "התיקייה הקודמת שלא &נקראה"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "מעבר לתיקייה הקודמת שיש בה הודעות שלא נקראו"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "ה&טקסט הבא שלא נקרא"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "מעבר לטקסט הבא שלא נקרא"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4351,224 +4366,229 @@
 "גלילה כלפי מטה של ההודעה הנוכחית. אם זהו סוף ההודעה הנוכחית, מעבר להודעה "
 "הבאה שלא נקראה."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "הגדרות &מסננים..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "נהיול &תסירטי Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 msgid "&Add Account..."
 msgstr "הוספת חשבון"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "מ&בוא ל־KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "הצגת דף הכניסה של KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "הגדרות &התראות..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "ה&גדרת KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "הפג..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, fuzzy, kde-format
 msgid "Add Favorite Folder..."
 msgstr "תיקייה &חדשה..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, fuzzy, kde-format
 msgid "Serverside Subscription..."
 msgstr "רישום..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "ה&חל את כל מסננים"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "ה&גדרת KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 msgid "New AddressBook Contact..."
 msgstr "&פנקס כתובות..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "העתקת הודעה לתיקייה"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, fuzzy, kde-format
 msgid "Jump to Folder..."
 msgstr "העתק לתיקייה"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "בטל פעולה נוכחית"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "התמקד בתיקייה הבאה"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "התמקד בתיקייה הקודמת"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "בחר את התיקייה בעלת ההתמקדות"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 msgid "Focus on First Folder"
 msgstr "התמקד בתיקייה הבאה"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 msgid "Focus on Last Folder"
 msgstr "התמקד בתיקייה הבאה"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "התמקד בהודעה הבאה"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "התמקד בהודעה הקודמת"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 msgid "Select First Message"
 msgstr "בחר את &כל ההודעות"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 msgid "Select Last Message"
 msgstr "בחר את &כל ההודעות"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "בחר את ההודעה בעלת ההתמקדות"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, fuzzy, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "אפס חיפוש מהיר"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, fuzzy, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "התמקד בהודעה הקודמת"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, fuzzy, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "התמקד בהודעה הבאה"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "העברת הודעה לתיקייה"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 msgid "Use Less Bandwidth"
 msgstr "חלון ה&הודעה"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 msgid "Account &Settings"
 msgstr "&שליחה"
 
 #: kmmainwidget.cpp:3590
 #, fuzzy, kde-format
+msgid "Restart Account"
+msgstr "הוספת חשבון"
+
+#: kmmainwidget.cpp:3601
+#, fuzzy, kde-format
 msgid "Add Favorite Folder"
 msgstr "תיקייה חדשה"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&רוקן אשפה"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "העבר את כל ההודעות ל&אשפה"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&מחק חיפוש"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 msgid "Edit Search..."
 msgstr "עריכה..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "סנן %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "רישום..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4579,12 +4599,12 @@
 "הסבירות לכך שהמערכת שלך תהיה נתונה לסיכונים מצד ניצולי אבטחה קיימים או "
 "עתידיים אחרים."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr ""
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4594,180 +4614,180 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, fuzzy, kde-format
 msgid "Starting..."
 msgstr "רישום..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "העבר ל&אשפה"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "אשפה"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "העברת ההודעה אל האשפה"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 msgid "Cannot copy item. %1"
 msgstr "העברת הודעות לתיקייה"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "הודעה חדשה אל..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "שליחת תשובה אל..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "העברה אל..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 msgid "Add to Existing Contact"
 msgstr "שם המצורף:"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "פתח בפנקס הכתובות"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "שים קישור זה במועדפים"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 msgid "Edit contact..."
 msgstr "עריכה..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "שמירת הקישור בשם..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&חיפוש בהודעה..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 msgid "Save Image On Disk..."
 msgstr "שמירת הקישור בשם..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 msgid "Show HTML Format"
 msgstr "הצג פס &מצב HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "טען הפניות חיצונית מהאינטרנט עבור הודעה זו"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 msgid "Share image..."
 msgstr "שמירת הקישור בשם..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 msgid "Plugins support"
 msgstr "הוספת מעביר"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "שא&ל לפני שליחה"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 msgid "The KDE Mail Client"
 msgstr "תוכנית הדוא\"ל של KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "מאחזר רשימת תיקיות"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 msgid "Please wait . . ."
 msgstr "נא המתן"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 msgid "Offline"
 msgstr "עבוד באופן לא מקוון"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4776,7 +4796,7 @@
 "<h2 style='margin-top: 0px;'>לא מקוון</h2><p> KMail כרגע במצב לא מקוון. לחץ "
 "<a href=\"kmail:goOnline\">כאן</a> כדי לעבור למצב מקוון . . . </p> &nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4785,22 +4805,22 @@
 "<h2 style='margin-top: 0px;'>לא מקוון</h2><p> KMail כרגע במצב לא מקוון. לחץ "
 "<a href=\"kmail:goOnline\">כאן</a> כדי לעבור למצב מקוון . . . </p> &nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 msgid "Contact modified successfully"
 msgstr "ההודעות הועברו בהצלחה"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "הודעות חדשות ב"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, fuzzy, kde-format
 msgid "There are no unread messages"
 msgstr "אין הודעות שלא נקראו"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, fuzzy, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4823,8 +4843,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -4912,17 +4932,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 msgid "kontactsummary"
 msgstr "אנשי קשר"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -4966,27 +4986,27 @@
 msgid "All"
 msgstr "הכל"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2005, KMail המפתחים של"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5013,7 +5033,7 @@
 msgid "&Reply"
 msgstr "&השב"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&השב..."
@@ -5023,12 +5043,12 @@
 msgid "Reply to A&uthor..."
 msgstr "השב ל&כותב..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "השב ל&כולם..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "השב &לרשימת־הדיוור..."
@@ -5059,7 +5079,7 @@
 msgid "&Edit As New"
 msgstr "&ערוך הודעה"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5248,113 +5268,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "חפש הודעות"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, fuzzy, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&חפש"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, fuzzy, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "בצורה &מוטבעת..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "בצורת מ&צורף..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "שמירת מצורפים..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "נקה בחירה"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 msgid "Jump to original folder"
 msgstr "העתק לתיקייה"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 התאמה"
 msgstr[1] "%1 התאמות"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "חיפוש אחרון"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 msgid "You did not selected a valid folder."
 msgstr "אין אפשרות לסנכרן את תיקיית ספריית הדואר."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 msgid "Searching..."
 msgstr "רישום..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 msgid "Cannot get search result. %1"
 msgstr "העברת הודעות לתיקייה"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 msgid "Search failed."
 msgstr "החיפוש בוטל"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 msgid "Search complete."
 msgstr " בדיקת האיות הושלמה."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 msgid "Search stopped."
 msgstr " בדיקת האיות הופסקה."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5362,21 +5382,21 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, fuzzy, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "הודעת מטלה"
 msgstr[1] "הודעת מטלה"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, fuzzy, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "מחיקת הודעות"
 msgstr[1] "מחיקת הודעות"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 msgid "Checking index status..."
 msgstr "&בדוק דואר בהפעלה"
@@ -5498,7 +5518,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5506,7 +5526,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5514,26 +5534,26 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 msgid "Show folder quick search line edit"
 msgstr "הצג חיפוש מהיר"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "הצג אזהרה אם תעודת השורש &פגה תוך פחות מ:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5542,19 +5562,19 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 msgid "Check spelling before send"
 msgstr "שא&ל לפני שליחה"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, fuzzy, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "רשימת ההודעות"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5565,13 +5585,13 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, fuzzy, kde-format
 msgid "Autosave interval:"
 msgstr "שירה אוטומטית כל:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5580,151 +5600,151 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 msgid "Show crypto label indicator"
 msgstr "הצג סמלי הצפ&נה"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, fuzzy, kde-format
 msgid "Do not show a message preview pane"
 msgstr "&אל תציג הודעה במציג ההודעות"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "רשימת התיקיות"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, fuzzy, kde-format
 msgid "Long folder list"
 msgstr "רשימת תיקיות &ארוכה"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, fuzzy, kde-format
 msgid "Short folder list"
 msgstr "רשימת תיקיות &קצרה"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, fuzzy, kde-format
 msgid "Message template for new message"
 msgstr "רשימת ההודעות - הודעות חדשות"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, fuzzy, kde-format
 msgid "Message template for reply"
 msgstr "רשימת ההודעות - הודעות חדשות"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, fuzzy, kde-format
 msgid "Message template for reply to all"
 msgstr "רשימת ההודעות - הודעות חדשות"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, fuzzy, kde-format
 msgid "Message template for forward"
 msgstr "רשימת ההודעות - הודעות חדשות"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, fuzzy, kde-format
 msgid "Quote characters"
 msgstr "הוסף &מרכאות ציטוט:"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5732,7 +5752,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5740,7 +5760,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5748,7 +5768,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5756,7 +5776,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5764,7 +5784,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6017,7 +6037,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6342,9 +6362,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "בדוק דוא&ר בחשבון"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -6898,6 +6918,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr ""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 msgid "Move To Trash"
@@ -6953,6 +6983,10 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "בדוק דוא&ר בחשבון"
+
 #~ msgid "&Reply to:"
 #~ msgstr "ה&שב אל:"
 
diff -Nru kmail-19.04.3/po/hi/kmail.po kmail-19.12.3/po/hi/kmail.po
--- kmail-19.04.3/po/hi/kmail.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/hi/kmail.po	2020-03-03 00:34:03.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2008-01-20 16:51+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -189,8 +189,8 @@
 msgstr "प्रत्येक पता बहुत से एनक्रिप्शन कुंजियाँ"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "के-मेल"
@@ -299,28 +299,28 @@
 "in the addresses by hand."
 msgstr ""
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "नियतांश"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "उपयोग:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, fuzzy, kde-format
 #| msgid "Status: "
 msgid "Status:"
 msgstr "स्थिति:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 %3 used"
 msgid "%1 of %2 used"
@@ -342,7 +342,7 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "प्रारूप"
@@ -354,12 +354,12 @@
 msgstr "मनपसंद संदेश टैम्प्लेट इस्तेमाल करें (&U)"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "वैश्विक टैम्प्लेट्स नक़ल करें (&C)"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, fuzzy, kde-format
 #| msgctxt "to view something"
 #| msgid "View"
@@ -367,107 +367,107 @@
 msgid "View"
 msgstr "दृश्य"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "मनपसंद प्रतीक इस्तेमाल करें (&i)"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, fuzzy, kde-format
 #| msgid "&Normal:"
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "सामान्य: (&N)"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, fuzzy, kde-format
 #| msgid "&Unread:"
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "बिनपढ़ाः (&U)"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "संदेशों की सूची में प्रेषक/प्राप्तकर्ता स्तम्भ दिखाएँ"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "स्तम्भ दिखाएँ: (&w)"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, fuzzy, kde-format
 #| msgid "Default"
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "डिफ़ॉल्ट"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, fuzzy, kde-format
 #| msgid "Sender"
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "प्रेषक"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, fuzzy, kde-format
 #| msgid "Receiver"
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "पाने वाला"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "संदेश सूची"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default aggregation"
 msgstr "कड़ी मिटाएँ (&h)"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, fuzzy, kde-format
 #| msgid "Suggestions"
 msgid "Aggregation"
 msgstr "सुझाव"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default theme"
 msgstr "कड़ी मिटाएँ (&h)"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, fuzzy, kde-format
 #| msgid "Time"
 msgid "Theme"
 msgstr "समय"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "असुरक्षित संदेश फ़ॉर्मेट"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "एचटीएमएल के बजाए सादा पाठ को प्राथमिकता दें"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "एचटीएमएल के बजाए सादा पाठ को प्राथमिकता दें (&H)"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -479,14 +479,14 @@
 msgid "Retrieval Options"
 msgstr "सामान्य विकल्प"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "उपयोक्ता (&I)"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, fuzzy, kde-format
 #| msgid "&Receiving"
 msgctxt ""
@@ -494,90 +494,95 @@
 msgid "Receiving"
 msgstr "प्राप्त किया जा रहा है (&R)"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, fuzzy, kde-format
 #| msgid "&Sending"
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "भेज रहे (&S)"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "आउटगोइंग ख़ाता (कम से कम एक जोड़ें):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "सामान्य विकल्प"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "भेजने से पहले पुष्टि करें (&b)"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "स्वचालित कभी नहीं"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "हस्तचालित डाक चेक करने पर"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "सभी डाक चेक करने पर"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "अभी भेजें"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "बाद में भेजें"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "गई-डाक फ़ोल्डर के संदेशों को भेजें (&m):"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "डिफ़ॉल्ट प्रेषण विधिः (&u)"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "खाता जोड़ें"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Custom Account..."
 msgstr "खाता जोड़ें"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -585,33 +590,33 @@
 "properly installed."
 msgstr "प्रमाणपत्र प्रबंधक प्रारंभ नहीं कर सका. कृपया अपना संस्थापन जांचें."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start account wizard"
 msgstr "खाता बनाने में अक्षम."
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, fuzzy, kde-format
 #| msgid "Include in manual mail chec&k"
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "हस्तचालित जांच में शामिल करें (&k)"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Check mail on startup"
 msgstr "प्रारंभ में डाक चेक करें (&k)"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -673,7 +678,7 @@
 msgid "Fixed Width Font"
 msgstr "स्थिर चौड़ाई फ़ॉन्ट"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "कम्पोज़र"
@@ -973,45 +978,45 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "सामान्य"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, fuzzy, kde-format
 #| msgid "Standard &Templates"
 msgid "Standard Templates"
 msgstr "मानक टैम्प्लेट्स (&T)"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, fuzzy, kde-format
 #| msgid "&Custom Templates"
 msgid "Custom Templates"
 msgstr "मनपसंद टैम्प्लेट्स (&C)"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, fuzzy, kde-format
 #| msgid "Subject"
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "विषय"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, fuzzy, kde-format
 #| msgid "Cha&rset"
 msgid "Charset"
 msgstr "अक्षरसेट (&r)"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, fuzzy, kde-format
 #| msgid "H&eaders"
 msgid "Headers"
 msgstr "शीर्षक (&e)"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "A&ttachments"
@@ -1019,56 +1024,56 @@
 msgid "Attachments"
 msgstr "संलग्नक (&t)"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "हस्ताक्षर"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 #| msgid "Use smaller font for quoted text"
 msgid "Insert the signature above any quoted text"
 msgstr "उद्घृत पाठ के लिए छोटे फ़ॉन्ट उपयोग में लें"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "&Normal:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "सामान्य: (&N)"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1076,7 +1081,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1084,17 +1089,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1102,7 +1107,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1110,7 +1115,7 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, fuzzy, kde-format
 #| msgctxt "View->attachments->"
 #| msgid "&Inline"
@@ -1118,30 +1123,30 @@
 msgid "Inline"
 msgstr "इनलाइन (&I)"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "As Attachment"
 msgstr "संलग्नक है"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Default forwarding type:"
 msgstr "डिफ़ॉल्ट डोमेनः (&t)"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "अतिरिक्त प्राप्तकर्ता"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1149,18 +1154,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Set the maximum number of recipients for the warning"
 msgstr "प्राप्तकर्ता संपादक के पंक्तियों की अधिकतम संख्या."
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1171,52 +1176,52 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "स्वचालित नहीं सहेजें"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "हालिया पते"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "पूर्णता अनुक्रम कॉन्फ़िगर करें..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "स्वचालित नहीं सहेजें"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "स्वचालित नहीं सहेजें"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1225,78 +1230,78 @@
 msgstr[0] "मि."
 msgstr[1] "मि."
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "संदेश डिस्पॉज़िशन सूचना स्वचलित निवेदित करें (&m)"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "विषय उपसर्ग के साथ जवाब भेजें (&y)"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "जोड़ें... (&d)"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "मिटाएँ (&m)"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "परिवर्धित... (&i)"
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "नया जवाब उपसर्ग भरें:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "विषय उपसर्ग आगे भेजें (&w)"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "जोड़ें..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "मिटाएँ (&v)"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "सुधारें..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "नया आगे भेजने का उपसर्ग भरें:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1304,132 +1309,132 @@
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "सुधारें... (&M)"
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "अक्षरसेट: भरें"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "जब जवाब भेजें या आगे भेजें तो मूल अक्षरसेट को बनाए रखें (यदि संभव हो). (&K)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "यह अक्षरसेट अभी समर्थित नहीं है."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "मनपसंद संदेश आईडी प्रत्यय इस्तेमाल करें (&U)"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "मनपसंद संदेश आईडी प्रत्ययः (&i)"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "मनपसंद माइम शीर्ष फ़ील्ड्स पारिभाषित करें:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, fuzzy, kde-format
 #| msgid "Name"
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "नाम"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, fuzzy, kde-format
 #| msgid "Value"
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "मान"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, fuzzy, kde-format
 #| msgid "Ne&w"
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "नया (&w)"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, fuzzy, kde-format
 #| msgid "&Name:"
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "नाम: (&N)"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "मान: (&V)"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 msgid "Invalid header"
 msgstr "हस्ताक्षर सक्षम करें (&E)"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "आउटलुक-कम्पेटिबल संलग्नक नामकरण"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "गुमे संलग्नकों का पता लगाना सक्षम करें (&n)"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "नया कुंजी-शब्द भरें:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "संलग्नक है"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, fuzzy, kde-format
 #| msgid " MB"
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr "मे.बा."
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "लॉग आकार सीमा:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1519,7 +1524,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "कम्पोज़र"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1641,7 +1646,7 @@
 msgid "Archive Folder"
 msgstr "नया फ़ोल्डर"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "List Archives"
 msgctxt "@action"
@@ -1716,7 +1721,7 @@
 msgid "Notification"
 msgstr "नई डाक की सूचना"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "Attachment: %1"
 msgid "1 attachment (%2)"
@@ -1724,13 +1729,13 @@
 msgstr[0] "संलग्नक: %1"
 msgstr[1] "संलग्नक: %1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Hide attachment list"
 msgstr "संलग्नक ऐसे सहेजें"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Show attachment list"
@@ -1749,469 +1754,469 @@
 msgid "Encoding"
 msgstr "एनकोडिंग"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "के-मेल"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 #| msgid "Set subject of message"
 msgid "Set a subject for this message"
 msgstr "संदेश का विषय सेट करें"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "उपयोक्ताः (&I)"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "शब्दकोश: (&D)"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "प्रेषित-डाक फ़ोल्डरः (&S)"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "डाक हस्तांतरणः (&M)"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "द्वारा: (&F)"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, fuzzy, kde-format
 #| msgid "S&ubject:"
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "विषयः (&u)"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "ई-मेल भेजें (&S)"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "मेल यहां से भेजें (&S)"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "भेजें"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "बाद में भेजें (&L)"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "पत्र को यहाँ से भेजें (&L)"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, fuzzy, kde-format
 #| msgid "Queue"
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "क़तार में लगाएँ"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "प्रारूप के रूप में सहेजें (&D)"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "सभी स्थानीय फ़ोल्डरों में ढूंढें (&a)"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "टैम्प्लेट के रूप में सहेजें (&T)"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 #| msgid "Save as &Template"
 msgid "Save email in Template folder"
 msgstr "टैम्प्लेट के रूप में सहेजें (&T)"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "फ़ाइल में सहेजें"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgid "&Insert Text File..."
 msgstr "फ़ाइल प्रविष्ट करें... (&I)"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, fuzzy, kde-format
 #| msgid "&Insert File Recent"
 msgid "&Insert Recent Text File"
 msgstr "हाल ही में प्रयुक्त फ़ाइल प्रविष्ट करें (&I)"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "पता पुस्तिका (&A)"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "Open Address Book"
 msgstr "पता पुस्तिका में खोलें"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "नया कम्पोज़र (&N)"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "प्राप्तकर्ता चुनें... (&R)"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "वितरण सूची सहेजें... (&D)"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "संलग्नक के रूप में चिपकाएँ (&h)"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "फ़ालतू फ़ासले हटाएँ (&e)"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "तय फ़ॉन्ट इस्तेमाल करें (&x)"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, fuzzy, kde-format
 #| msgid "&Urgent"
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "अत्यावश्यक (&U)"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "डिस्पोज़ीशन अधिसूचना निवेदित करें (&R)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "डिस्पोज़ीशन अधिसूचना निवेदित करें (&R)"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "वर्ड-रैप (&W)"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "वर्तनीजाँच स्वचलित करें (&A)"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Rich Text Editing"
 msgstr "लॉगइन जानकारी"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "सभी फील्ड (&A)"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "उपयोक्ता (&I)"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "शब्दकोष (&D)"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "भेजी-डाक फ़ोल्डर (&S)"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "डाक हस्तांतरण (&M)"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "द्वारा (&F)"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, fuzzy, kde-format
 #| msgid "S&ubject"
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "विषयः (&u)"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "हस्ताक्षर जोड़ें (&i)"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, fuzzy, kde-format
 #| msgid "Append S&ignature"
 msgid "Pr&epend Signature"
 msgstr "हस्ताक्षर जोड़ें (&i)"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, fuzzy, kde-format
 #| msgid "Set Cursor Position"
 msgid "Insert Signature At C&ursor Position"
 msgstr "संकेतक स्थिति सेट करें"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "वर्तनी शोधक... (&S)"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, fuzzy, kde-format
 msgid "Spellchecker"
 msgstr "वर्तनी शोधक... (&S)"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "संदेश एनक्रिप्ट करें (&E)"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "एनक्रिप्ट"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "संदेश हस्ताक्षरित करें (&S)"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "हस्ताक्षर"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "क्रिप्टोग्राफ़िक संदेश फॉर्मेट (&C)"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "संदेश ढूंढें... (&F)"
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "के-मेल कॉन्फ़िगर करें..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, fuzzy, kde-format
 #| msgid " Line: %1 "
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr "पंक्ति: %1"
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr "स्तम्भ: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "वर्तनी जांच: चालू"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "वर्तनी जांच: बन्द"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "टैम्प्लेट के रूप में फिर से सहेजें (&s)"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "मसौदा के रूप में सहेजें (&S)"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "क्या आप संदेश को फेंकना चाहते हैं या इसे बाद के लिए सहेजना चाहते हैं?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "कम्पोज़र बन्द करें"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Autosave Message Failed"
 msgstr "स्वचालित सहेजना असफल"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Sending Message Failed"
 msgstr "स्वचालित सहेजना असफल"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "फ़ाइल सामग्री प्रविष्ट करें"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add as &Attachment"
 msgstr "संलग्नक के रूप में जोड़ें"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "संलग्नक का नाम"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 msgid "Invalid Attachment Name"
 msgstr "हस्ताक्षर सक्षम करें (&E)"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Quoted Message"
 msgid "Add URL into Message"
@@ -2219,7 +2224,7 @@
 msgstr[0] "उद्धृत संदेश"
 msgstr[1] "उद्धृत संदेश"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add File as &Attachment"
@@ -2227,18 +2232,18 @@
 msgstr[0] "संलग्नक के रूप में जोड़ें"
 msgstr[1] "संलग्नक के रूप में जोड़ें"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, fuzzy, kde-format
 #| msgid "Paste as text or attachment?"
 msgid "Insert clipboard text as attachment"
 msgstr "पाठ या संलग्नक के रूप में चिपकाएँ?"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "बेनाम"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2247,12 +2252,12 @@
 "identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "अपारिभाषित एनक्रिप्शन कुंजी"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2260,12 +2265,12 @@
 "in the identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "अपारिभाषित साइनिंग कुंजी"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2273,7 +2278,7 @@
 "for each message."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2285,37 +2290,37 @@
 "आपको मिलेः फ़ील्ड में या इन्हें भी या बेनामी प्रति में कम से कम एक प्राप्तकर्ता को उल्लेखित "
 "करना आवश्यक होगा."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "को: फ़ील्ड रिक्त है. जो भी हो संदेश भेजें?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "इनको नहीं: निर्दिष्ट"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "आपने कोई विषय अंकित नहीं किया है. जैसा भी हो, संदेश भेज दें?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "कोई विषय उल्लेखित नहीं है."
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "जैसा है वैसा ही भेजें (&e)"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "विषय उल्लेखित करें (&S)"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2327,90 +2332,90 @@
 "आपको मिलेः फ़ील्ड में या इन्हें भी या बेनामी प्रति में कम से कम एक प्राप्तकर्ता को उल्लेखित "
 "करना आवश्यक होगा."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "ई-मेल भेजने में..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "पुष्टिकरण भेजें"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "अभी भेजें (&S)"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, fuzzy, kde-format
 #| msgid "No recipients"
 msgid "Too many recipients"
 msgstr "कोई प्राप्तकर्ता नहीं"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "जैसा है वैसा ही भेजें (&S)"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, fuzzy, kde-format
 msgid "&Edit Recipients"
 msgstr "अतिरिक्त प्राप्तकर्ता"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Lose Formatting"
 msgstr "लॉगइन जानकारी"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "संदेश सादा पाठ में"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2418,7 +2423,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2498,25 +2503,25 @@
 msgid "External editor was started."
 msgstr "बाहरी संपादक"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2545,11 +2550,6 @@
 msgid "Message will not be encrypted"
 msgstr "भेजे गए संदेशों को एनक्रिप्टेड भंडारित करें (&p)"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr ""
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2598,32 +2598,32 @@
 msgid "Cannot move messages."
 msgstr "संदेशों को फ़ोल्डर में खिसकाएँ"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "फ़ोल्डर बनाने में असफल"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No Folder Selected"
 msgid "No folder returned."
 msgstr "कोई फ़ोल्डर चयनित नहीं"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "फ़ोल्डर बनाने में असफल"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Removed 1 old message from folder %2."
 #| msgid_plural "Removed %1 old messages from folder %2."
 msgid "Unable to return list of folders."
 msgstr "फ़ोल्डर %2 में से १ पुराना संदेश मिटाया."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Message was signed by %1."
 msgid "Messages archived"
@@ -2668,51 +2668,51 @@
 msgid "&Existing identities:"
 msgstr "मौज़ूदा उपयोक्ताः (&E)"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "फ़ोल्डर %1 का नाम बदलने की कोशिश में एक त्रुटि हुई"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "नया कुंजी-शब्द भरें:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "उपयोक्ता का संपादन करें"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "सामान्य"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "आपका नामः (&Y)"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2720,12 +2720,12 @@
 "this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "संगठनः (&z)"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2733,12 +2733,12 @@
 "sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "ई-मेल पताः (&E)"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2748,13 +2748,13 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 #| msgid "&Email address:"
 msgid "Email a&liases:"
 msgstr "ई-मेल पताः (&E)"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2765,13 +2765,13 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, fuzzy, kde-format
 #| msgid "Cryptograph&y"
 msgid "Cryptography"
 msgstr "क्रिप्टोग्राफ़ी (&y)"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2781,12 +2781,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "ओपनपीजीपी हस्ताक्षर कुंजीः"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2797,12 +2797,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "ओपनपीजीपी एनक्रिप्शन कुंजीः"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2811,12 +2811,12 @@
 "not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "एस/माइम हस्ताक्षर प्रमाणपत्र:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2826,43 +2826,43 @@
 "functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "एस/माइम एनक्रिप्शन प्रमाणपत्र:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred crypto message format:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "वांछित क्रिप्टो संदेश फ़ॉर्मेट:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "संदेश स्वचलित हस्ताक्षरित करें (&A)"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "जहाँ संभव हो स्वचलित रूप से संदेश एनक्रिप्ट करें (&m)"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, fuzzy, kde-format
 #| msgid "&Advanced"
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "विस्तृत (&A)"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "जवाब भेजने का पताः (&R)"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2873,13 +2873,13 @@
 "address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "बेनामी नक़ल पताः (&B)"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2890,12 +2890,12 @@
 "blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "बेनामी नक़ल पताः (&B)"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2906,98 +2906,98 @@
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "शब्दकोष (&i)"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "भेजी-डाक फ़ोल्डरः (&f)"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "मसौदा फ़ोल्डरः (&D)"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "टैम्पलेट्स फ़ोल्डर: (&T)"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 #| msgid "Configure Account"
 msgid "Outgoing Account:"
 msgstr "खाता कॉन्फ़िगर करें"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "संदेश में 'हेडर' जोड़ें."
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "नाम बदलें..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 #| msgid "Choose &language:"
 msgid "Autocorrection language:"
 msgstr "भाषा चुनें: (&l)"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "डिफ़ॉल्ट डोमेनः (&t)"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "डिफ़ॉल्ट डोमेनः (&t)"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, fuzzy, kde-format
 #| msgid "&Use custom message templates"
 msgid "&Use custom message templates for this identity"
 msgstr "मनपसंद संदेश टैम्प्लेट इस्तेमाल करें (&U)"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "हस्ताक्षर"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, fuzzy, kde-format
 #| msgid "&Picture"
 msgid "Picture"
 msgstr "चित्र: (&P)"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Email Alias \"%1\""
 msgstr "अवैध ई-मेल पता"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "अवैध ई-मेल पता"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3006,14 +3006,14 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
 "with the configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3022,36 +3022,36 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "ई-मेल पता जो कुंजी/प्रमाणपत्र में नहीं मिला"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "हस्ताक्षर फ़ाइल वैध नहीं है"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "उपयोक्ता का संपादन करें \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "संपादन..."
@@ -3087,6 +3087,22 @@
 msgid "We cannot delete vCard file."
 msgstr "मेलडिर फ़ोल्डर सिंक नहीं कर सका."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+"<qt>क्या आप सचमुच में चलाना चाहते हैं इसे-\n"
+" <b>'%1'</b>?</qt>"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "पुष्टिकरण भेजें"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3241,7 +3257,7 @@
 "उदाहरण यहाँ उपलब्ध हैं <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www."
 "xs4all.nl/~ace/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3275,7 +3291,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "पता पुस्तिका में जोड़ें"
@@ -3286,24 +3302,24 @@
 msgid "Contact created successfully"
 msgstr "संदेशों को सफलतापूर्वक मिटाया."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Failed to store contact"
 msgstr "संलग्नक को संपादित करने में अक्षम"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "क्या आप वाक़ई रद्दी का फ़ोल्डर खाली करना चाहते हैं?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "New Folder"
 msgid "Attach Folder"
@@ -3513,7 +3529,7 @@
 msgstr "फ़ोल्डर (&o)"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3521,7 +3537,7 @@
 msgstr "सारे फ़िल्टर्स लागू करें (&y)"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current folder and all subfolders"
@@ -3548,7 +3564,7 @@
 msgstr "आगे (&F)"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "फ़िल्टर्स लागू करें (&p)"
@@ -3573,7 +3589,7 @@
 msgstr "मदद (&H)"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "मुख्य औज़ार पट्टी"
@@ -3629,45 +3645,45 @@
 msgid "The file does not contain a message."
 msgstr "फ़ाइल में संदेश नहीं है."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "फ़ाइल में बहुत से संदेश हैं. सिर्फ पहला संदेश ही दिखाया जाएगा."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 #| msgid "Send Digest"
 msgid "Send As Digest"
 msgstr "डाइजेस्ट भेजें"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "संदेश फ़िल्टर किया जा रहा है"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "%2 में से %1 संदेश फिल्टर किया जा रहा है"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "संदेश खिसकाया जा रहा है"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "संदेश मिटाया जा रहा है"
@@ -3696,29 +3712,29 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "केमेल को ऑफ़लाइन के रूप में सेट किया गया है, सभी नेटवर्क कार्य निलंबित हैं"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "सेंडमेल"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "ई-मेल भेजने में..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "केमेल को ऑनलाइन के रूप में सेट किया गया है, सभी नेटवर्क कार्य फिर से चालू हैं"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3726,52 +3742,52 @@
 "connection is detected"
 msgstr "केमेल को ऑनलाइन के रूप में सेट किया गया है, सभी नेटवर्क कार्य फिर से चालू हैं"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "केमेल अभी ऑफ़लाइन मोड में है. आप किस तरह आगे बढ़ना चाहते हैं?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "ऑनलाइन/ऑफ़लाइन"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "आनलाइन कार्य करें"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "ऑफ़लाइन कार्य करें"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
 msgstr "केमेल को ऑनलाइन के रूप में सेट किया गया है, सभी नेटवर्क कार्य फिर से चालू हैं"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "केमेल को ऑफ़लाइन के रूप में सेट किया गया है, सभी नेटवर्क कार्य निलंबित हैं"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Opening Autosave File Failed"
 msgstr "स्वचालित सहेजना असफल"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3779,7 +3795,7 @@
 msgstr[0] "डिफ़ॉल्ट ट्रांसपोर्ट का प्रयोग करने के लिए इस पहचान को बदल दिया गया है:"
 msgstr[1] "डिफ़ॉल्ट ट्रांसपोर्ट का प्रयोग करने के लिए इन %1 पहचानों को बदल दिया गया है:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3788,44 +3804,46 @@
 msgstr[1] ""
 "परिवर्धित ट्रांसपोर्ट का प्रयोग करने के लिए इन %1 पहचानों को बदल दिया गया है:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "संदेशों को भेजा जा रहा है"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, fuzzy, kde-format
 #| msgid "Initiating sender process..."
 msgid "Initiating sending process..."
 msgstr "भेजने की प्रक्रिया प्रारंभ किया जा रहा है..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3833,12 +3851,12 @@
 "properly installed."
 msgstr "प्रमाणपत्र प्रबंधक प्रारंभ नहीं कर सका. कृपया अपनी संस्थापना जाँचें."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "के-मेल त्रुटि"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -3846,27 +3864,27 @@
 "properly installed."
 msgstr "प्रमाणपत्र प्रबंधक प्रारंभ नहीं कर सका. कृपया अपना संस्थापन जांचें."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start import wizard"
 msgstr "खाता बनाने में अक्षम."
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "प्रमाणपत्र प्रबंधक प्रारंभ नहीं कर सका. कृपया अपना संस्थापन जांचें."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to start external editor."
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "बाहरी संपादक प्रारंभ करने में अक्षम."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -3874,69 +3892,69 @@
 "properly installed."
 msgstr "प्रमाणपत्र प्रबंधक प्रारंभ नहीं कर सका. कृपया अपना संस्थापन जांचें."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start ImportWizard"
 msgstr "खाता बनाने में अक्षम."
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "प्रमाणपत्र प्रबंधक प्रारंभ नहीं कर सका. कृपया अपना संस्थापन जांचें."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "कोई विषय नहीं"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, fuzzy, kde-format
 msgid "(no templates)"
 msgstr "(कोई पसंदीदा टैम्प्लेट नहीं)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "फ़ोल्डर में कोई मियाद-ख़त्म विकल्प नियत नहीं है."
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>क्या आप वाक़ई फ़ोल्डर <b>%1</b> की मियाद बीतने देना चाहते हैं</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "बीत गया फ़ोल्डर"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "मियाद ख़त्म (&E)"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "रद्दी खाली करें"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "रद्दी पर ले जाएँ"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "क्या आप वाक़ई रद्दी का फ़ोल्डर खाली करना चाहते हैं?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3945,27 +3963,27 @@
 "<qt>क्या आप सुनिश्चित हैं कि आप फ़ोल्डर <b>%1</b> से सभी संदेशों को रद्दी में खिसकाना चाहते "
 "हैं?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "सभी संदेशों को रद्दी में डाला"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "क्या आप वाक़ई सभी पुराने संदेशों की मियाद ख़त्म करना चाहते हैं?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "पुराने संदेशों की मियाद ख़त्म करें?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "हाँ"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3973,17 +3991,17 @@
 "compromised by other present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "सुरक्षा चेतावनी"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "बाहरी सन्दर्भों को लोड करें"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3998,431 +4016,431 @@
 "<qt>क्या आप सचमुच चयनित %1 संदेशों को मिटाना चाहते हैं?<br />एक बार मिटाने के बाद, इन्हें "
 "फिर से वापस लाया नहीं जा सकता.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "संदेश मिटाएँ"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "संदेश मिटाएँ"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Moving messages..."
 msgstr "संदेश खिसकाया जा रहा है"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Deleting messages..."
 msgstr "संदेश मिटाया जा रहा है"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, fuzzy, kde-format
 #| msgid "Messages deleted successfully."
 msgid "Messages deleted successfully."
 msgstr "संदेशों को सफलतापूर्वक मिटाया."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved successfully."
 msgstr "संदेशों को सफलतापूर्वक खिसकाया"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "संदेश मिटाना असफल."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "संदेश मिटाना रद्द."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "संदेश खिसकाना असफल."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "संदेश खिसकाना रद्द."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "संदेशों को फ़ोल्डर में खिसकाएँ"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Copying messages..."
 msgstr "संदेश खिसकाया जा रहा है"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages copied successfully."
 msgstr "संदेशों को सफलतापूर्वक खिसकाया"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Copying messages failed."
 msgstr "संदेश खिसकाना असफल."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Copying messages canceled."
 msgstr "संदेश खिसकाना रद्द."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, fuzzy, kde-format
 #| msgid "Copy Message to Folder"
 msgid "Copy Messages to Folder"
 msgstr "संदेश इस फ़ोल्डर में नक़ल करें"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Moving messages to trash..."
 msgstr "संदेश रद्दी पर ले जाएँ"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Deleting and moving messages to trash..."
 msgstr "संदेश रद्दी पर ले जाएँ"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash successfully."
 msgstr "संदेशों को सफलतापूर्वक खिसकाया"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash or deleted successfully"
 msgstr "संदेशों को सफलतापूर्वक खिसकाया"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Moving messages to trash failed."
 msgstr "संदेश खिसकाना असफल."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "संदेश खिसकाना असफल."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Moving messages to trash canceled."
 msgstr "संदेश खिसकाना रद्द."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "संदेश खिसकाना रद्द."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "इस फ़ोल्डर पर जाएँ"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "ऐसे सहेजें (&A)"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "सारे फ़ोल्डर की मियाद ख़त्म करें (&E)"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "डाक देखें (&M)"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail In"
 msgstr "डाक देखें (&M)"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail"
 msgstr "डाक देखें (&M)"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "क़तारबद्ध संदेश भेजें (&S)"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, fuzzy, kde-format
 #| msgid "Onlinestatus (unknown)"
 msgid "Online status (unknown)"
 msgstr "ऑनलाइन स्थिति (अज्ञात)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "क़तार में लगे संदेशों को यहाँ से भेजें"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, fuzzy, kde-format
 #| msgid "Certificate Manager..."
 msgid "Certificate Manager"
 msgstr "प्रमाणपत्र प्रबंधक..."
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages..."
 msgid "&Import Messages..."
 msgstr "संदेश आयात करें... (&I)"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "डिबग सीव... (&D)"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "लॉग प्रदर्शक फ़िल्टर करें... (&L)"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "का संपादन करें \"ऑफ़िस से बाहर\" जवाबों को..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "सूचनाएँ कॉन्फ़िगर करें.... (&N)"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Delayed Messages..."
 msgstr "संदेश मिटाया जा रहा है"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "संदेश ढूंढें... (&F)"
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, fuzzy, kde-format
 #| msgid "&Delete"
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "मिटाएँ (&D)"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "लड़ी रद्दी पर ले जाएँ (&o)"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "लड़ी रद्दी पर ले जाएँ"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "कड़ी मिटाएँ (&h)"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "संदेश ढूंढें... (&F)"
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "सभी संदेश चुनें (&A)"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "डाक पता सूची प्रबंधन... (&M)"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "शार्टकट आबंटित करें... (&A)"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "मियाद बीतने के विन्यास (&E)"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "&Archive Folder..."
 msgstr "नया फ़ोल्डर...(&N)"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "बाहरी सन्दर्भों को लोड करें (&x)"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Message To..."
 msgstr "को नया संदेश..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Move Message To..."
 msgstr "को नया संदेश..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "नया संदेश... (&N)"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, fuzzy, kde-format
 #| msgid "New"
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "नया"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "टेम्पलेट से संदेश (&T)"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "डाक-सूची पर नया संदेश... (&o)"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "फ़िल्टर बनाएँ (&C)"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "विषय पर फ़िल्टर... (&S)"
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "से फ़िल्टर ऑन... (&F)"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "को फ़िल्टर ऑन... (&T)"
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "को फ़िल्टर ऑन... (&T)"
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "मार्क थ्रेड (&T)"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "लड़ी को पढ़ा चिह्नित करें (&R)"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "चुनी गई लड़ी के सभी संदेशों को पढ़ा चिह्नित करें"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "लड़ी बिन पढ़ा चिह्नित करें (&U)"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "चुनी गई लड़ी के सभी संदेशों को बिन पढ़ा चिह्नित करें"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, fuzzy, kde-format
 msgid "Mark Thread as &Important"
 msgstr "लड़ी बिन पढ़ा चिह्नित करें (&U)"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, fuzzy, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "लड़ी को नया चिह्नित करें (&N)"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "मह्त्वपूर्ण संदेश"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "लड़ी देखें (&W)"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "लड़ी नज़रअंदाज़ करें (&I)"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "संलग्नक सहेजें... (&t)"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Decrypted To..."
 msgstr "को नया संदेश..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "सारे फ़िल्टर्स लागू करें (&y)"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4430,13 +4448,13 @@
 msgid "&Expand Thread / Group"
 msgstr "लड़ी फैलाएँ (&E)"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "मौज़ूदा लड़ी फैलाएँ"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4444,365 +4462,371 @@
 msgid "&Collapse Thread / Group"
 msgstr "लड़ी समेटें (&C)"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "मौज़ूदा लड़ी समेटें"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "सभी लड़ी फैलाएँ (&p)"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "मौज़ूदा फ़ोल्डर में सभी लड़ी फैलाएँ"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "सभी लड़ियाँ समेटें (&o)"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "चुनें"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "संदेश दिखाएँ (&D)"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "अगला संदेश (&N)"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "अगले संदेश पर जाएँ"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "अगला बिनपढ़ा संदेश (&U)"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, fuzzy, kde-format
 #| msgid "Next"
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "अगला"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "अगले बिना-पढ़े संदेश पर जाएँ"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "पिछला संदेश (&P)"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "पिछले संदेश पर जाएँ"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "पिछला बिनपढ़ा संदेश (&M)"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, fuzzy, kde-format
 #| msgid "Previous"
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "पिछला"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "पिछले बिना-पढ़े संदेश पर जाएँ"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "अगला बिनपढ़ा फ़ोल्डर (&F)"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "बिना-पढ़े संदेश युक्त अगले फ़ोल्डर में जाएँ"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "पिछला बिनपढ़ा फ़ोल्डर (&o)"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "पिछले फ़ोल्डर में बिना-पढ़े संदेशों पर जाएँ"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "अगला बिना-पढ़ा पाठ (&T)"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "अगले बिना-पढ़े पाठ पर जाएँ"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "फ़िल्टर्स कॉन्फ़िगर करें... (&F)"
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "सीव स्क्रिप्ट्स प्रबंधित करें... (&S)"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "खाता जोड़ें"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "के-मेल परिचय (&I)"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "के-मेल का स्वागत पृष्ठ दिखाएँ"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "सूचनाएँ कॉन्फ़िगर करें.... (&N)"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "के-मेल कॉन्फ़िगर करें... (&C)"
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "मियाद ख़त्म..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "पसंदीदा फ़ोल्डर जोड़ें..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Serverside Subscription..."
 msgstr "सब्सक्रिप्शन..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "सारे फ़िल्टर्स लागू करें (&y)"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "के-मेल कॉन्फ़िगर करें... (&C)"
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "&Address Book..."
 msgid "New AddressBook Contact..."
 msgstr "पता पुस्तिका... (&A)"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "संदेश इस फ़ोल्डर में नक़ल करें"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to Folder..."
 msgstr "इस फ़ोल्डर पर जाएँ"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "मौजूदा ऑपरेशन छोड़ें"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "अगले फ़ोल्डर पर फ़ोकस करें"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "पिछले फ़ोल्डर पर फ़ोकस करें"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "फ़ोकस के साथ फ़ोल्डर चुनें"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "अगले फ़ोल्डर पर फ़ोकस करें"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "अगले फ़ोल्डर पर फ़ोकस करें"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "अगले संदेश पर फ़ोकस करें"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "पिछले संदेश पर फ़ोकस करें"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "सभी संदेश चुनें (&A)"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "सभी संदेश चुनें (&A)"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "फ़ोकस के साथ संदेश चुनें"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, fuzzy, kde-format
 #| msgid "Show Quick Search"
 msgid "Set Focus to Quick Search"
 msgstr "तेज़ी से ढूंढना दिखाएँ"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, fuzzy, kde-format
 #| msgid "Focus on Previous Message"
 msgid "Extend Selection to Previous Message"
 msgstr "पिछले संदेश पर फ़ोकस करें"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, fuzzy, kde-format
 #| msgid "Focus on Next Message"
 msgid "Extend Selection to Next Message"
 msgstr "अगले संदेश पर फ़ोकस करें"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "संदेश इस फ़ोल्डर पर खिसकाएँ"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message W&indow"
 msgid "Use Less Bandwidth"
 msgstr "संदेश विंडो (&i)"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "विन्यास (&S)"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "उपयोक्ता नाम"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "पसंदीदा फ़ोल्डर जोड़ें"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "रद्दी खाली करें (&m)"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "सभी संदेश रद्दी में डालें (&M)"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "खोज मिटाएँ (&D)"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "स्क्रिप्ट संपादित करें..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "फ़िल्टर %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "प्रारंभ किया जा रहा है..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4810,12 +4834,12 @@
 "present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "एचटीएमएल इस्तेमाल करें"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4825,225 +4849,225 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "रद्द करें (&a)"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "प्रारंभ किया जा रहा है..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "रद्दी में डालें (&M)"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, fuzzy, kde-format
 #| msgid "Trash"
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "रद्दी"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "संदेश रद्दी पर ले जाएँ"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Move Messages to Folder"
 msgid "Cannot copy item. %1"
 msgstr "संदेशों को फ़ोल्डर में खिसकाएँ"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "को नया संदेश..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "को जवाब भेजें:"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "को आगे भेजें..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Add to Existing Contact"
 msgstr "संलग्नक को संपादित करने में अक्षम"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "पता पुस्तिका में खोलें"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "इस लिंक को  पसंदीदा  में रखें"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit With..."
 msgid "Edit contact..."
 msgstr "के साथ संपादन करें..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "लिंक ऐसे सहेजें..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "संदेश में ढूंढें... (&F)"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "लिंक ऐसे सहेजें..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 msgid "Show HTML Format"
 msgstr "एचटीएमएल इस्तेमाल करें"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 #| msgid "Load external references from the Internet for this message."
 msgid "Load external reference when mail comes for this contact"
 msgstr "इस संदेश के लिए इंटरनेट से बाहरी संदर्भों को लोड करें"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "लिंक ऐसे सहेजें..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "ग्नू-पीजी समर्थन"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "भेजने से पहले पुष्टि करें (&b)"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "केडीई ईमेल क्लाएंट"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folderlist"
 msgid "Retrieving Folder Contents"
 msgstr "फ़ोल्डर सूची फिर से प्राप्त किया जा रहा है"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "कृपया इंतजार करें"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "ऑफ़लाइन कार्य करें"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Contact modified successfully"
 msgstr "संदेशों को सफलतापूर्वक खिसकाया"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "में नया संदेश"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, fuzzy, kde-format
 #| msgid "There are no unread messages"
 msgid "There are no unread messages"
 msgstr "वहाँ पर कोई बिनपढ़े संदेश नहीं हैं"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, fuzzy, kde-format
 #| msgid "Unread Message"
 msgid "1 unread message"
@@ -5067,8 +5091,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5163,18 +5187,18 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "सम्पर्क"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5223,27 +5247,27 @@
 msgid "All"
 msgstr "सभी"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2007, के-मेल डेवलपर्स"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5272,7 +5296,7 @@
 msgid "&Reply"
 msgstr "जवाब... (&R)"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "जवाब... (&R)"
@@ -5282,12 +5306,12 @@
 msgid "Reply to A&uthor..."
 msgstr "लेखक को जवाब भेजें... (&u)"
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "सब को जवाब भेजें... (&A)"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "डाक-सूची को जवाब भेजें... (&L)"
@@ -5319,7 +5343,7 @@
 msgid "&Edit As New"
 msgstr "संदेश संपादन (&E)"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5531,122 +5555,122 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "संदेश ढूंढें"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, fuzzy, kde-format
 #| msgid "&Search"
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "ढूंढें (&S)"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, fuzzy, kde-format
 #| msgid "&Inline..."
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "यथावत्... (&I)"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "संलग्नक के रूप में... (&A)"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "संलग्नक सहेजें..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "चयन साफ करें"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "इस फ़ोल्डर पर जाएँ"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 एक जैसा"
 msgstr[1] "%1 एक जैसे"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "पिछला खोज"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 #| msgid "Could not sync maildir folder."
 msgid "You did not selected a valid folder."
 msgstr "मेलडिर फ़ोल्डर सिंक नहीं कर सका."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "प्रारंभ किया जा रहा है..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Move Messages to Folder"
 msgid "Cannot get search result. %1"
 msgstr "संदेशों को फ़ोल्डर में खिसकाएँ"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "ढूंढना रद्द"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid " Spell check complete."
 msgid "Search complete."
 msgstr "मात्रा की जांच पूरी हो गई."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid " Spell check stopped."
 msgid "Search stopped."
 msgstr "वर्तनी जांच रोका."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5654,7 +5678,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, fuzzy, kde-format
 #| msgid "Copy Messages"
 msgid "Copy Message"
@@ -5662,7 +5686,7 @@
 msgstr[0] "संदेशों की नक़ल बनाएँ"
 msgstr[1] "संदेशों की नक़ल बनाएँ"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, fuzzy, kde-format
 #| msgid "Cut Messages"
 msgid "Cut Message"
@@ -5670,7 +5694,7 @@
 msgstr[0] "संदेश काटें"
 msgstr[1] "संदेश काटें"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Checking index status..."
@@ -5796,7 +5820,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5804,7 +5828,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5812,20 +5836,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 #| msgid "Show quick search line edit"
 msgid "Show folder quick search line edit"
 msgstr "तेजी से ढूंढें पंक्ति संपादन दिखाएँ"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Warn if the number of recipients is more than:"
@@ -5833,7 +5857,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5842,20 +5866,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "भेजने से पहले पुष्टि करें (&b)"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "संदेश डिस्पॉज़िशन सूचना स्वचलित निवेदित करें (&m)"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5866,13 +5890,13 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "स्वचालित सहेजने का अंतराल:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5881,157 +5905,157 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 #| msgid "Show crypto &icons"
 msgid "Show crypto label indicator"
 msgstr "क्रिप्टो प्रतीक दिखाएँ (&i)"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "संदेश पूर्वावलोकन फलक"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, fuzzy, kde-format
 #| msgid "&Do not show a message preview pane"
 msgid "Do not show a message preview pane"
 msgstr "संदेश पूर्वावलोकन फलक नहीं दिखाएँ (&D)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane belo&w the message list"
 msgid "Show the message preview pane below the message list"
 msgstr "संदेश सूची के नीचे संदेश पूर्वावलोकन पॅन दिखाएँ (&w)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane ne&xt to the message list"
 msgid "Show the message preview pane next to the message list"
 msgstr "संदेश पूर्वावलोकन फलक संदेश के बाज़ू में दिखाएँ (&x)"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "फ़ोल्डर सूची"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, fuzzy, kde-format
 #| msgid "Lon&g folder list"
 msgid "Long folder list"
 msgstr "फ़ोल्डर लंबी सूची (&g)"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, fuzzy, kde-format
 #| msgid "Shor&t folder list"
 msgid "Short folder list"
 msgstr "फ़ोल्डर छोटी सूची (&t)"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "नए संदेश के लिए संदेश टैम्प्लेट"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "जवाब के लिए संदेश टैम्प्लेट"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "सभी को जवाब भेजने के लिए संदेश टैम्प्लेट"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "आगे भेजने हेतु संदेश टैम्पलेट"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "उद्धरण अक्षर"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6039,7 +6063,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6047,7 +6071,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6055,7 +6079,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6063,7 +6087,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6071,7 +6095,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6335,7 +6359,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6668,10 +6692,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check &Mail"
-msgid "Check Mail Url Tracking"
-msgstr "डाक देखें (&M)"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7190,6 +7213,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "सभी \"फिर से नहीं पूछें\" चेतावनियों को फिर से सक्षम करें"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7251,6 +7284,11 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Check &Mail"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "डाक देखें (&M)"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "कोटा में बन्द करते समय फ़ोल्डर नाम तथा आकार"
 
@@ -9877,11 +9915,6 @@
 #~ msgstr "डिफ़ॉल्ट पहचान इस्तेमाल करें (&D)"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "उपयोक्ता नाम"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "सर्वर सीव समर्थित करता है (&S)"
@@ -11659,14 +11692,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "यूआरएल खोला जा रहा है..."
 
-#, fuzzy
-#~| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr ""
-#~ "<qt>क्या आप सचमुच में चलाना चाहते हैं इसे-\n"
-#~ " <b>'%1'</b>?</qt>"
-
 #~ msgid "Execute"
 #~ msgstr "चलाएँ"
 
diff -Nru kmail-19.04.3/po/hr/kmail.po kmail-19.12.3/po/hr/kmail.po
--- kmail-19.04.3/po/hr/kmail.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/hr/kmail.po	2020-03-03 00:34:04.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: kmail 0\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2011-03-28 17:53+0200\n"
 "Last-Translator: Marko Dimjašević <marko@dimjasevic.net>\n"
 "Language-Team: Croatian <kde-croatia-list@lists.sourceforge.net>\n"
@@ -200,8 +200,8 @@
 # pmap: =/nom=KMail/gen=KMaila/dat=KMailu/
 # pmap: =/aku=KMail/lok=KMailu/ins=KMailom/_r=m/_b=j/
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -317,28 +317,28 @@
 msgstr ""
 "KMail nije uspio detektirati listu e-pošte. Morati ćete ručno unijeti adrese."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, fuzzy, kde-format
 msgid "Quota"
 msgstr "Ukupno"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Upotreba:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, fuzzy, kde-format
 #| msgid "Status: "
 msgid "Status:"
 msgstr "Status: "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgctxt ""
 #| "%1: name; %2: number appended to it to make it unique among a list of "
@@ -363,7 +363,7 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Predlošci"
@@ -374,113 +374,113 @@
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, fuzzy, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Zamijeni"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, fuzzy, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Pokaži"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, fuzzy, kde-format
 msgid "Use custom &icons"
 msgstr "Koristi posebne &sličice"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, fuzzy, kde-format
 #| msgid "&Normal:"
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Obično:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, fuzzy, kde-format
 #| msgid "&Unread:"
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Nepročitano:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, fuzzy, kde-format
 msgid "Sho&w column:"
 msgstr " Stupac"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Zadan"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, fuzzy, kde-format
 #| msgid "Sender"
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, fuzzy, kde-format
 #| msgid "Receiver"
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Primatelj"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Popisa poruka"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Koristi zadanu agregaciju"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregacija"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Koristi zadanu temu"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Message Part Properties"
 msgid "Message Default Format"
 msgstr "Svojstva dijela poruke"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer H&TML to plain text"
 msgid "Prefer HTML to text"
 msgstr "&Preferira HTML umjesto čistog teksta"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "Preferiraj HTML nad običnim tekstom"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Global Options"
 msgid "Use Global Settings"
@@ -492,14 +492,14 @@
 msgid "Retrieval Options"
 msgstr "Opće Mogućnosti"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Identitet"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, fuzzy, kde-format
 #| msgid "&Receiving"
 msgctxt ""
@@ -507,90 +507,95 @@
 msgid "Receiving"
 msgstr "&Primanje"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, fuzzy, kde-format
 #| msgid "&Sending"
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "&Slanje"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Izlazeći korisnički računi (dodajte barem jedan):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opće opcije"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Potvrdi prije slanja"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, fuzzy, kde-format
 msgid "On Manual Mail Checks"
 msgstr "pri ručnom &filtriranju"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, fuzzy, kde-format
 msgid "On All Mail Checks"
 msgstr "&Podesi interval za provjeru pošte"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Pošalji odmah"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Pošalji kasnije"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, fuzzy, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Pošalji poruke iz odlazeće &mape prilikom provere"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Uobičajeni način slanja:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Dodaj korisnički račun"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Custom Account..."
 msgstr "Dodaj korisnički račun"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -598,32 +603,32 @@
 "properly installed."
 msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start account wizard"
 msgstr "Ne mogu stvoriti račun"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, fuzzy, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Uključi u provjeru:"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Check mail on startup"
 msgstr "Provjeri poštu prilikom po&kretanja"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -683,7 +688,7 @@
 msgid "Fixed Width Font"
 msgstr "Pismo utvrđene širine"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Composer"
@@ -975,95 +980,95 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Općenito"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, fuzzy, kde-format
 msgid "Standard Templates"
 msgstr "&Zamijeni"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, fuzzy, kde-format
 msgid "Custom Templates"
 msgstr "&Zamijeni"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Tema"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, fuzzy, kde-format
 #| msgid "Cha&rset"
 msgid "Charset"
 msgstr "&Skup znakova"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, fuzzy, kde-format
 #| msgid "H&eaders"
 msgid "Headers"
 msgstr "&Zaglavlja"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Privitci"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signatures"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "&Oblik:"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1071,7 +1076,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1079,17 +1084,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1097,7 +1102,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1105,36 +1110,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Unutar"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Kao privitak"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Default forwarding type:"
 msgstr "Podra&zumijevana domena:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "All Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Svi primatelji"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1142,17 +1147,17 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Upozori ako koreni certifikat ističe za &manje od"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1163,49 +1168,49 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 msgid "Configure Completion..."
 msgstr "Podesi račun"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "Auto"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Automatski"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1215,19 +1220,19 @@
 msgstr[1] " min"
 msgstr[2] " min"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "Auto&matski zahtijevaj obavijest o raspoređivanju poruke"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Pref&iks za odgovor na predmet"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1236,59 +1241,59 @@
 "Prepoznaje bilo koju sekvencu sljedećih prefiksa\n"
 "(stavke su regularni izrazi neosjetljivi na mala i velika slova):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Novi …"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Ukloni"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Izmijeni …"
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Unesite novi prefiks za odgovor:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Proslijeđivanje &prefiksa naslova"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Dodaj …"
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "U&Kloni"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Izmijeni …"
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Unesite novi prefiks za proslijeđivanje:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, fuzzy, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1298,93 +1303,93 @@
 "pronalaženja skupa znakova koji sadrži sve zahtjevane znake."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Iz&mijeni …"
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Unesite znakovni skup:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, fuzzy, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Zadrži originalni kod lokalnih znakova kod odgovora ili proslijeđivanja "
 "(ako je moguće)."
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, fuzzy, kde-format
 msgid "This charset is not supported."
 msgstr "Ovaj skup znakova nije podržan."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, fuzzy, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Poseban suf&iks za id. poruke:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definirajte posebna mime polja zaglavlja:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, fuzzy, kde-format
 #| msgid "Name"
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Ime"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, fuzzy, kde-format
 #| msgid "Value"
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Vrijednost"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, fuzzy, kde-format
 #| msgid "Ne&w"
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Novi"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Naziv:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Vrijednost:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid header"
 msgstr "&Uključi potpis"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1393,41 +1398,41 @@
 "Uključite ovu opciju ako želite da Outlook(tm) razumije imena privitaka koja "
 "sadrže ne-engleske znakove"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Uključi detekciju &nedostajućih privitaka"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Prepoznaj bilo koju od sljedećih ključnih riječi kao namjeru da se priloži "
 "datoteka:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Unesite novu ključnu riječ:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "prilog"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "Logiraj granicu veličine:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1518,7 +1523,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Composer"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1638,7 +1643,7 @@
 msgid "Archive Folder"
 msgstr "Arhivna mapa"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgctxt "Start of the filename for a mail archive file"
 #| msgid "Archive"
@@ -1709,7 +1714,7 @@
 msgid "Notification"
 msgstr "&Obavijest o novim porukama"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "Attachment: %1"
 msgid "1 attachment (%2)"
@@ -1718,12 +1723,12 @@
 msgstr[1] "Prilog: %1"
 msgstr[2] "Prilog: %1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 msgid "Hide attachment list"
 msgstr "Snimi prilog kao"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 msgid "Show attachment list"
 msgstr "Pogledaj prilog: "
@@ -1742,457 +1747,457 @@
 
 # pmap: =/nom=KMail/gen=KMaila/dat=KMailu/
 # pmap: =/aku=KMail/lok=KMailu/ins=KMailom/_r=m/_b=j/
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Odaberite mapu poslane pošte gdje će se spremiti kopija ove poruke"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 msgid "Set a subject for this message"
 msgstr "Postavi temu poruke."
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitet:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Rječnik:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Mapa po&slane pošte:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Prijenos pošte:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Od:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "T&ema:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "P&ošalji poštu"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Pošalji poštu k&roz"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, fuzzy, kde-format
 msgid "Send"
 msgstr "&Pošalji"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Poša&lji kasnije"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Pošalj&i kasnije kroz"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Odgodi"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Spremi kao ski&cu"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 msgid "Save email in Draft folder"
 msgstr "Provjeri &poštu u ovoj mapi"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Spremi kao pre&dložak"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 #| msgid "Save as &Template"
 msgid "Save email in Template folder"
 msgstr "Spremi kao pre&dložak"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "Spremi u datoteku"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Umetn&i tekstualnu datoteku…"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Umetn&i nedavnu tekstualnu datoteku"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adresar …"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "Open Address Book"
 msgstr "Otvori u adresaru"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Novi uređivač"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Odabe&ri primatelje…"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, fuzzy, kde-format
 msgid "Save &Distribution List..."
 msgstr "Opis:"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Umetni kao pri&vitak"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Očisti razmake"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "&Koristi pismo fiksne širine"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, fuzzy, kde-format
 #| msgid "&Urgent"
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Hitno"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Zatraži obavijest dispozicije"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Zatraži obavijest dispozicije"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, fuzzy, kde-format
 msgid "&Wordwrap"
 msgstr "&Prelom teksta"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Svaštice"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatska provjera pravopisa"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Sva &polja"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitet"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Rječnik"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Mapa po&slane pošte"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Prijenos &pošte"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Od"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, fuzzy, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Tema:"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Dodaj po&tpis"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, fuzzy, kde-format
 #| msgid "Append S&ignature"
 msgid "Pr&epend Signature"
 msgstr "Dodaj po&tpis"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Provjera pravopisa…"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Provjera pravopisa"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Kriptiraj poruku"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Kriptiraj"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, fuzzy, kde-format
 msgid "&Sign Message"
 msgstr "&Potpiši poruku"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Potpiši"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Nađi poruke…"
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, fuzzy, kde-format
 msgid "Configure KMail..."
 msgstr "&Namjesti KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linija: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Stupac: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Provjera pravopisa: uključena"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Provjera pravopisa: isključena"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Ponovno &spremi kao predložak"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Spremi kao skicu"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, fuzzy, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Želite li odbaciti poruku ili je spremiti za kasnije?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, fuzzy, kde-format
 msgid "Close Composer"
 msgstr "&Novi uređivač"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 msgid "Autosave Message Failed"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 msgid "Sending Message Failed"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Umetni datoteku"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Do&daj kao privitak"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, fuzzy, kde-format
 msgid "Name of the attachment:"
 msgstr "prilog"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid Attachment Name"
 msgstr "&Uključi potpis"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2200,7 +2205,7 @@
 msgstr[1] "Šifriraj poruku"
 msgstr[2] "Šifriraj poruku"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, fuzzy, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2208,17 +2213,17 @@
 msgstr[1] "Dodaj Privitak..."
 msgstr[2] "Dodaj Privitak..."
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, fuzzy, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "prilog"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "neimenovan"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2227,12 +2232,12 @@
 "identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, fuzzy, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Nedefiniran ključ za kriptiranje"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2240,12 +2245,12 @@
 "in the identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, fuzzy, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nedefiniran ključ za potpisivanje"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2253,44 +2258,44 @@
 "for each message."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr "Morate odreditti bar jednog primatelja u polju „Za:“."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, fuzzy, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, fuzzy, kde-format
 msgid "No To: specified"
 msgstr "Nije naznačen naslov"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Niste upisali temu. Da li da pošaljem poruku sa praznom temom?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nije naznačen naslov"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, fuzzy, kde-format
 msgid "S&end as Is"
 msgstr "Pošalji ponovo..."
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, fuzzy, kde-format
 msgid "&Specify the Subject"
 msgstr "Ne, želim upisati temu"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2298,88 +2303,88 @@
 msgstr ""
 "Morate navesti barem jednog primatelja kako biste mogli kriptirati skicu."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Spremam se poslati email …"
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, fuzzy, kde-format
 msgid "Send Confirmation"
 msgstr "Potvrda slanja poruke"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Pošalji &odmah"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, fuzzy, kde-format
 msgid "Too many recipients"
 msgstr "<primatelji>"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, fuzzy, kde-format
 msgid "&Send as Is"
 msgstr "Pošalji &kako jest"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Ur&edi primatelje"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 msgid "Lose Formatting"
 msgstr "Potvrda slanja poruke"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "Poruka kao čisti tekst"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2387,7 +2392,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 msgid "Plugin Editor Information"
 msgstr "Potvrda slanja poruke"
@@ -2467,25 +2472,25 @@
 msgid "External editor was started."
 msgstr "Eksterni uređivač"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2513,11 +2518,6 @@
 msgid "Message will not be encrypted"
 msgstr "Poruka neće biti kriptirana"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Tekstualna svaštice"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2565,31 +2565,31 @@
 msgid "Cannot move messages."
 msgstr "Premjesti poruku u mapu"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Neuspjelo stvaranje direktorija"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "Nije odabrana ni jedna mapa"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Neuspjelo stvaranje direktorija"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Unable to retrieve folder list."
 msgid "Unable to return list of folders."
 msgstr "Nije moguće dohvatiti listu mapa."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 msgid "Messages archived"
 msgstr "Poruku je potpisao"
@@ -2632,52 +2632,52 @@
 msgid "&Existing identities:"
 msgstr "&Postojeći identiteti:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 "Greška prilikom pisanja datoteke:\n"
 "%1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Unesite novu ključnu riječ:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Uredi identitet"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Općenito"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Vaše ime:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2685,12 +2685,12 @@
 "this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Or&ganizacija:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2698,12 +2698,12 @@
 "sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Email adresa:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2713,13 +2713,13 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 #| msgid "&Email address:"
 msgid "Email a&liases:"
 msgstr "Email adresa:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2730,12 +2730,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr ""
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2745,12 +2745,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, fuzzy, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP ključ:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2761,12 +2761,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, fuzzy, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP ključ:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2775,12 +2775,12 @@
 "not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, fuzzy, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Slanje certifikata"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2790,42 +2790,42 @@
 "functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, fuzzy, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Odaberite &certifikat:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred handler:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Preferirani rukovoditelj:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 msgid "Automatically sign messages"
 msgstr "Automatski potp&isuj poruke koristeći OpenPGP"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Auto&matski kriptiraj poruke kad god je to moguće"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, fuzzy, kde-format
 #| msgid "Advanced"
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "&Napredno"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Ad&resa za odgovor (Reply-To):"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2836,13 +2836,13 @@
 "address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "BCC a&drese:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2853,12 +2853,12 @@
 "blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "BCC a&drese:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2869,95 +2869,95 @@
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Rječnik:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Mapa poslane pošt&e:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Mapa &nacrta:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, fuzzy, kde-format
 msgid "&Templates folder:"
 msgstr "&Mapa za smeće:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 #| msgid "Configure Account"
 msgid "Outgoing Account:"
 msgstr "Podesi račun"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 msgid "Attach my vCard to message"
 msgstr "Dodaj 'zaglavlje' poruci. '"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "Preimenuj…"
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 #| msgid "Choose &language:"
 msgid "Autocorrection language:"
 msgstr "Odaberite &jezik:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Podra&zumijevana domena:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Podra&zumijevana domena:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, fuzzy, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Koristi poseban s&ufiks za id. poruke"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, fuzzy, kde-format
 msgid "Signature"
 msgstr "Signatures"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, fuzzy, kde-format
 msgid "Picture"
 msgstr "&Potpis"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Email Alias \"%1\""
 msgstr "Neispravna adresa e-pošte"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Neispravna adresa e-pošte"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2966,14 +2966,14 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
 "with the configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2982,36 +2982,36 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, fuzzy, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "&E-mail adresa od CA koja-i izdaje certifikate:"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, fuzzy, kde-format
 msgid "The signature file is not valid"
 msgstr "Potpis je istekao."
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Uredi identitet „%1“"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Uredi …"
@@ -3046,6 +3046,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "<qt>Da li zaista želite izvršiti <b>%1</b>?</qt>"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Potvrda slanja poruke"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3195,7 +3208,7 @@
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3230,7 +3243,7 @@
 msgstr[1] "Distribucijska lista \"%1\" je prazn pa se ne može koristiti."
 msgstr[2] "Distribucijska lista \"%1\" je prazn pa se ne može koristiti."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Dodaj u adresar"
@@ -3240,24 +3253,24 @@
 msgid "Contact created successfully"
 msgstr "Poruke su uspješno premještene."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Failed to store contact"
 msgstr "Nije moguće urediti privitak"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Jeste li sigurni da želite isprazniti mapu za smeće?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Attach File"
 msgid "Attach Folder"
@@ -3472,7 +3485,7 @@
 msgstr "&Mapa"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3480,7 +3493,7 @@
 msgstr "Primij&eni sve filtre"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3506,7 +3519,7 @@
 msgstr "&Proslijedi"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Primijeni filtar"
@@ -3531,7 +3544,7 @@
 msgstr "&Beep"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr ""
@@ -3588,44 +3601,44 @@
 msgid "The file does not contain a message."
 msgstr "Izbaci &nepročitane poruke"
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 msgid "Send As Digest"
 msgstr "Pošalji „o&dbijen“"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, fuzzy, kde-format
 msgid "Filtering messages"
 msgstr "Obriši poruke"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, fuzzy, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Premještam poruku %3 od %2 iz %1."
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, fuzzy, kde-format
 msgid "Moving messages"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, fuzzy, kde-format
 msgid "Deleting messages"
 msgstr "Obriši poruke"
@@ -3654,30 +3667,30 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail je postavljen da radi odspojeno; svi mrežni poslovi su obustavljeni"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Spremam se poslati email …"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid ""
@@ -3686,51 +3699,51 @@
 msgstr ""
 "KMail je postavljen da radi odspojeno; svi mrežni poslovi su obustavljeni"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail je trenutno odspojen s mreže. Kako želite postupiti?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr ""
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Radi spojeno"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Radi odspojeno"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "KMail je postavljen da radi odspojeno; svi mrežni poslovi su obustavljeni"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3739,7 +3752,7 @@
 msgstr[1] "Promijenjena su %1 identiteta tako da koriste zadani prijenos:"
 msgstr[2] "Promijenjeno je %1 identiteta tako da koriste zadani prijenos:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3750,43 +3763,45 @@
 msgstr[2] ""
 "Promijenjeno je %1 identiteta tako da koriste promijenjeni prijenos:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Šaljem poruke"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Započinjem proces slanja…"
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -3794,12 +3809,12 @@
 "properly installed."
 msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail greška"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -3807,26 +3822,26 @@
 "properly installed."
 msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start import wizard"
 msgstr "Ne mogu stvoriti račun"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Ne mogu pokrenuti vanjski uređivač."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -3834,70 +3849,70 @@
 "properly installed."
 msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start ImportWizard"
 msgstr "Ne mogu stvoriti račun"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Ne mogu pokrenuti upravite certifikata. Provjerite vašu instalaciju!"
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Nema Teme"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(nema predložaka)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Ova mapa nema postavljene opcije vezane uz istek"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Jeste li sigurni da želite izbaciti stare poruke iz mape <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Izbaci stare poruke iz mape"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Istječe"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Isprazni smeće"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Pošalji u smeće"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Jeste li sigurni da želite isprazniti mapu za smeće?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3906,27 +3921,27 @@
 "<qt>Jeste li sigurni da želite premjestiti sve poruke iz mape <b>%1</b> u "
 "smeće?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Sve poruke su premještene u smeće"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Jeste li sigurni da želite da isteknu sve stare poruke?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Izbaciti stare poruke?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Izbaci stare poruke"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, fuzzy, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3937,17 +3952,17 @@
 "povećati vjerojatnoću da će vaš sustav biti kompromitovan drugim prisutnim i "
 "očekivanim bezbedonosnim zloupotrebama."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Sigurnosno upozorenje"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr ""
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3959,412 +3974,412 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, fuzzy, kde-format
 msgid "Delete Messages"
 msgstr "Obriši poruke"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, fuzzy, kde-format
 msgid "Delete Message"
 msgstr "Obriši poruke"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, fuzzy, kde-format
 msgid "Moving messages..."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, fuzzy, kde-format
 msgid "Deleting messages..."
 msgstr "Obriši poruke"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, fuzzy, kde-format
 msgid "Messages deleted successfully."
 msgstr "Poruke su uspješno premještene."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, fuzzy, kde-format
 msgid "Messages moved successfully."
 msgstr "Poruke su uspješno premještene."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, fuzzy, kde-format
 msgid "Deleting messages failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, fuzzy, kde-format
 msgid "Deleting messages canceled."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, fuzzy, kde-format
 msgid "Moving messages canceled."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, fuzzy, kde-format
 msgid "Move Messages to Folder"
 msgstr "Premjesti poruku u mapu"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, fuzzy, kde-format
 msgid "Copying messages..."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, fuzzy, kde-format
 msgid "Messages copied successfully."
 msgstr "Poruke su uspješno premještene."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Copying messages failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, fuzzy, kde-format
 msgid "Copying messages canceled."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopiraj poruke u mapu"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Moving messages to trash..."
 msgstr "Premjesti poruku u smeće"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Deleting and moving messages to trash..."
 msgstr "Premjesti poruku u smeće"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, fuzzy, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Poruke su uspješno premještene."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Poruke su uspješno premještene."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Moving messages to trash failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, fuzzy, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Premještanje poruka nije uspjelo."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, fuzzy, kde-format
 msgid "Jump to Folder"
 msgstr "Kopiraj u ovu mapu"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Spremi &kao…"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Izbaci stare poruke iz svih mapa"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Provjeri &poštu"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Provjeri poštu u"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Provjeri poštu"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Pošalji od&gođene poruke"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr ""
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Pošalji odgođene poruke kroz"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, fuzzy, kde-format
 #| msgid "Certificate Manager..."
 msgid "Certificate Manager"
 msgstr "Upravitelj Certifikatima..."
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages"
 msgid "&Import Messages..."
 msgstr "Uvez&i poruke"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr ""
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Preglednik filtara i &logova …"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Uredi odgovore „izvan ureda“ …"
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "Podešava&nje obavijesti …"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 msgid "Delayed Messages..."
 msgstr "Obriši poruke"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Nađi poruke…"
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, fuzzy, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "izbrisano"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Premjesti nit u s&meće"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Premjesti nit u smeće"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, fuzzy, kde-format
 msgid "Delete T&hread"
 msgstr "izbrisano"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Nađi poruke…"
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Ozn&ači sve poruke"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, fuzzy, kde-format
 msgid "&Mailing List Management..."
 msgstr "Upravljanje Certifikatima"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr ""
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, fuzzy, kde-format
 msgid "&Expiration Settings"
 msgstr "&Postojeći identiteti:"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "&Archive Folder..."
 msgstr "&Novi direktorij …"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr ""
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopiraj poruku u…"
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Nova poruka za…"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nova poruka…"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nova"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Poru&ka iz predloška"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, fuzzy, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nova poruka u &raspravnoj listi …"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Napravi filtar"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtriraj po &Naslovu …"
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filter po polju &Od …"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtriraj po polju &Za …"
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Filtriraj po polju &Za …"
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "&Označi nit"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Označi nit kao &pročitanu"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Označi sve poruke u odabranoj niti kao pročitane"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Označi nit kao nep&ročitanu"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Označi sve poruke u odabranoj niti kao nepročitane"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Označi nit kao &važnu"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, fuzzy, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Važna poruka"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, fuzzy, kde-format
 #| msgid "Mark Thread as &New"
 msgid "Mark Thread as &Action Item"
 msgstr "Označi nit kao &novu"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Važna poruka"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Gledaj nit"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignoriraj nit"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Spremi privitke …"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Message To..."
 msgid "Copy Decrypted To..."
 msgstr "Kopiraj poruku u…"
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Primij&eni sve filtre"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4372,13 +4387,13 @@
 msgid "&Expand Thread / Group"
 msgstr "Pr&oširi nit"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "Proširi trenutnu nit"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4386,123 +4401,123 @@
 msgid "&Collapse Thread / Group"
 msgstr "Sklo&pi nit"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "Sklopi trenutnu nit"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "&Proširi sve niti"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Proširi sve niti u trenutnoj mapi"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Skl&opi sve niti"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Sklopi sve niti u trenutnoj mapi"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Pri&kaži poruku"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Slje&deća poruka"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Idi na sljedeću poruku"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Sljedeća nepročitana por&uka"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Sljedeća"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Idi na sljedeću nepročitanu poruku"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Prethodna poruka"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Idi na prethodnu poruku"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Pr&ethodna nepročitana poruka"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Prethodna"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Idi na prethodnu nepročitanu poruku"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Sljedeća nepročitana &mapa"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Idi na sljedeću mapu s nepročitanim porukama"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Preth&odna nepročitana mapa"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Idi na prethodnu mapu s nepročitanim porukama"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Sljedeći nepročitani &tekst"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Idi na sljedeći nepročitani tekst"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4511,233 +4526,239 @@
 "Kliži prema dolje trenutnu poruku. Ako je dosegnut kraj trenutne poruke, idi "
 "na sljedeću nepročitanu poruku."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Podesi &filtre…"
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, fuzzy, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Postojeći Filteri"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Dodaj korisnički račun"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "Uvod u KMa&il"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Prikaži KMailovu stranicu dobrodošlice"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Podešava&nje obavijesti …"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Pode&si KMail…"
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Istek…"
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Dodaj omiljenu mapu…"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Serverside Subscription..."
 msgstr "Opis:..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Primij&eni sve filtre"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "Export..."
 msgid "Import/Export KMail Data..."
 msgstr "Izvezi…"
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "&Address Book..."
 msgid "New AddressBook Contact..."
 msgstr "&Adresar..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopiraj poruku u mapu"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Skoči u mapu…"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Prekini trenutni postupak"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Fokusiraj na sljedeću mapu"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Fokusiraj na prethodnu mapu"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Odaberi mapu s fokusom"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "Fokusiraj na sljedeću mapu"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "Fokusiraj na sljedeću mapu"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Fokusiraj na sljedeću poruku"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Fokusiraj na prethodnu poruku"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "Ozn&ači sve poruke"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "Ozn&ači sve poruke"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Odaberi poruku s fokusom"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Postavi fokus na brzu pretragu"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Proširi odabir na prethodnu poruku"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Proširi odabir na sljedeću poruku"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Premjesti poruku u mapu"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Popisa poruka"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 msgid "Account &Settings"
 msgstr "&Slanje"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "Ime identiteta"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Dodaj omiljenu mapu"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Isprazni s&meće"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Premjesti sve poruke u s&meće"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "I&zbriši pretragu"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Uredi skriptu…"
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtar %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "&Traži"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, fuzzy, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4748,12 +4769,12 @@
 "povećati vjerojatnoću da će vaš sustav biti kompromitovan drugim prisutnim i "
 "očekivanim bezbedonosnim zloupotrebama."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr ""
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4763,45 +4784,45 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "O&tkaži"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Pokrećem…"
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Pre&mjesti u smeće"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, fuzzy, kde-format
 #| msgid "trash"
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "smeće"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Premjesti poruku u smeće"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid ""
 #| "Cannot open file \"%1\":\n"
@@ -4811,175 +4832,175 @@
 "Ne mogu otvoriti datoteku „%1“:\n"
 "%2"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nova poruka za…"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Odgovori na…"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Proslijedi za…"
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr ""
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Otvori u adresaru"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Spremi oznaku za ovaj link"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit Note..."
 msgid "Edit contact..."
 msgstr "Uredi bilješku…"
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Spremiti link kao…"
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Nađi u poruci…"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "Spremiti link kao…"
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 msgid "Show HTML Format"
 msgstr "Pokaži HTML statusnu trak&u"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Dozvoli porukama da učitaju &vanjske reference sa Interneta"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr ""
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "Add Transport"
 msgid "Plugins support"
 msgstr "Dodaj transport"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "&Potvrdi prije slanja"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE-ov klijent e-pošte"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Dobavljam popis mapi"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Molim pričekajte"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "Radi odspojeno"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 msgid "Contact modified successfully"
 msgstr "Poruke su uspješno premještene."
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nove poruke u"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5003,8 +5024,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5095,17 +5116,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 msgid "kontactsummary"
 msgstr "&Zbijeno"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5151,27 +5172,27 @@
 msgid "All"
 msgstr "Dozvole"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2004, KMail-ov razvojni tim"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5199,7 +5220,7 @@
 msgid "&Reply"
 msgstr "&Odgovori"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "Odgovo&ri …"
@@ -5209,12 +5230,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Odgovori a&utoru.."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Odgovori svim&a…"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Odgovori na poštansku &listu…"
@@ -5245,7 +5266,7 @@
 msgid "&Edit As New"
 msgstr "Ur&edi poruku"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5445,12 +5466,12 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Nađi poruke"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, fuzzy, kde-format
 #| msgctxt "@action:button Search for messags"
 #| msgid "&Search"
@@ -5458,34 +5479,34 @@
 msgid "&Search"
 msgstr "&Traži"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Unutar…"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "K&ao privitak…"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Spremi privitke …"
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Obriši odabir"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 msgid "Jump to original folder"
 msgstr "Kopiraj u ovu mapu"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5493,72 +5514,72 @@
 msgstr[1] "%1 podudaranja"
 msgstr[2] "%1 podudaranja"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Posljednja pretraga"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "Pokrećem…"
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Premjesti poruku u mapu"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "Pretraga je otkazana"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid " Spell check complete."
 msgid "Search complete."
 msgstr "Završena provjera pravopisa."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid " Spell check stopped."
 msgid "Search stopped."
 msgstr "Zaustavljena provjera pravopisa."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5566,7 +5587,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5574,7 +5595,7 @@
 msgstr[1] "Kopiraj %1 poruke"
 msgstr[2] "Kopiraj %1 poruka"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5582,7 +5603,7 @@
 msgstr[1] "Izreži %1 poruke"
 msgstr[2] "Izreži %1 poruka"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Checking index status..."
@@ -5705,7 +5726,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5713,7 +5734,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5721,26 +5742,26 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr ""
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Upozori ako koreni certifikat ističe za &manje od"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5749,20 +5770,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "&Potvrdi prije slanja"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Auto&matski zahtijevaj obavijest o raspoređivanju poruke"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5773,13 +5794,13 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, fuzzy, kde-format
 msgid "Autosave interval:"
 msgstr "Pe&riod provjere:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5788,153 +5809,153 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 msgid "Show crypto label indicator"
 msgstr "Pokaži šifro &sličice"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Ploča za pregled poruke"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, fuzzy, kde-format
 #| msgid "Message Preview Pane"
 msgid "Do not show a message preview pane"
 msgstr "Ploča za pregled poruke"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, fuzzy, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Pokaži pano za pregled poruke &ispod liste poruka"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, fuzzy, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Pokaži pano za pregled poruke &pored liste poruka"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Popis direktorija"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, fuzzy, kde-format
 #| msgid "Lon&g folder list"
 msgid "Long folder list"
 msgstr "&Duži popis mapa"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, fuzzy, kde-format
 msgid "Short folder list"
 msgstr "&Kratka lista mapi"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, fuzzy, kde-format
 msgid "Message template for new message"
 msgstr "Lista poruka — polje za datum"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, fuzzy, kde-format
 msgid "Message template for reply"
 msgstr "Označi trenutnu poruku kao p&roslijeđenu"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, fuzzy, kde-format
 msgid "Message template for reply to all"
 msgstr "Označi trenutnu poruku kao p&roslijeđenu"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, fuzzy, kde-format
 msgid "Message template for forward"
 msgstr "Označi trenutnu poruku kao p&roslijeđenu"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, fuzzy, kde-format
 msgid "Quote characters"
 msgstr "Dodaj znake za &citiranje"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5942,7 +5963,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5950,7 +5971,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5958,7 +5979,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5966,7 +5987,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5974,7 +5995,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6242,7 +6263,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6557,10 +6578,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Provjeri poštu u"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7128,6 +7148,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr ""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7191,6 +7221,14 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#~ msgid "Text Snippets"
+#~ msgstr "Tekstualna svaštice"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Provjeri poštu u"
+
 #~ msgid "&Reply to:"
 #~ msgstr "&Odgovori na:"
 
@@ -9651,11 +9689,6 @@
 #~ msgstr "&Ukloni"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Ime identiteta"
-
-#, fuzzy
 #~ msgid "Define if server supports sieve"
 #~ msgstr "&Poslužitelj podržava Sieve"
 
@@ -10749,12 +10782,6 @@
 #~ msgstr "Otvaram URL …"
 
 #, fuzzy
-#~| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "<qt>Da li zaista želite izvršiti <b>%1</b>?</qt>"
-
-#, fuzzy
 #~ msgid "Execute"
 #~ msgstr "izvrši naredbu"
 
diff -Nru kmail-19.04.3/po/hu/akonadi_archivemail_agent.po kmail-19.12.3/po/hu/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/hu/akonadi_archivemail_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/hu/akonadi_archivemail_agent.po	2020-03-03 00:34:04.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2014-09-04 16:34+0200\n"
 "Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -180,14 +180,14 @@
 "Nem adható hozzá egy második archívum ehhez a mappához. Inkább módosítsa a "
 "meglévőt."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "A könyvtár nem létezik. Ellenőrizze a beállításokat. Az archiválás "
 "elhalasztva."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "%1 archiválásának elkezdése"
diff -Nru kmail-19.04.3/po/hu/akonadi_followupreminder_agent.po kmail-19.12.3/po/hu/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/hu/akonadi_followupreminder_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/hu/akonadi_followupreminder_agent.po	2020-03-03 00:34:04.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2017-03-04 14:42+0100\n"
 "Last-Translator: Kiszel Kristóf <kiszel.kristof@gmail.com>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -19,99 +19,99 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Nyomkövető emlékeztető ügynök"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, fuzzy, kde-format
 #| msgid "Follow Up Reminder Agent"
 msgid "Follow Up Reminder"
 msgstr "Nyomkövető emlékeztető ügynök"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, fuzzy, kde-format
 #| msgid "Copyright (C) 2014-2017 Laurent Montel"
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright © Laurent Montel, 2014-2017."
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Karbantartó"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kiszel Kristóf,Úr Balázs"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "ulysses@kubuntu.org,urbalazs@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Címzett"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Tárgy"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Határidő"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Válasz"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Fogadott"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Tartás"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Üzenet megjelenítése"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Törlés"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Válasz érkezett tőle: %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Még mindig választ vár erre a levélre:"
diff -Nru kmail-19.04.3/po/hu/akonadi_mailfilter_agent.po kmail-19.12.3/po/hu/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/hu/akonadi_mailfilter_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/hu/akonadi_mailfilter_agent.po	2020-03-03 00:34:04.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2013-07-07 11:24+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -23,17 +23,17 @@
 msgid "Filter Log Viewer"
 msgstr "Szűrési napló megjelenítő"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Szűrési tevékenységek nap&lózása"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -42,23 +42,23 @@
 "Itt kapcsolhatja be és ki a szűrési tevékenységek naplózását. Az adatok csak "
 "akkor kerülnek gyűjtésre és megjelenítése, ha a naplózás be van kapcsolva. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Naplózási részletek"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Naplóminta leírása"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Naplószű&rési szabály kiértékelése"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -72,34 +72,34 @@
 "visszajelzést kap minden egyes szűrési szabályhoz, egyébként csak egy szűrő "
 "összes szabálya kiértékelésének eredmény lesz megadva."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Naplószűrési minta kiértékelése"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Naplószűrési műveletek"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Napló méretkorlátja:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "korlátlan"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -112,7 +112,7 @@
 "naplóadatok mérete túllépi ezt a korlátot, a legrégebbi adatok el lesznek "
 "dobva. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -121,64 +121,64 @@
 "Nem sikerült írni a(z) %1 fájlt:\n"
 "Részletes hibaleírás: „%2”."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Hiba - KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "%1 / %2 üzenet szűrése"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, fuzzy, kde-format
 #| msgid "Error applying mail filter delete"
 msgid "Error applying mail filter move"
 msgstr "Hiba a törlés levélszűrő alkalmazásakor"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Hiba a törlés levélszűrő alkalmazásakor"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Hiba a módosítások levélszűrő alkalmazásakor"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Szűrési szabályok kiértékelése:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Szűrési szabályok illeszkedtek.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Szűrés kezdése a(z) „%1” üzeneten ettől: „%2” eddig: „%3” :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Üzenetszűrés"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Levélszűrőnapló engedélyezve"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Kész"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Szűrés ebben: %1"
diff -Nru kmail-19.04.3/po/hu/akonadi_sendlater_agent.po kmail-19.12.3/po/hu/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/hu/akonadi_sendlater_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/hu/akonadi_sendlater_agent.po	2020-03-03 00:34:04.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2014-09-11 16:48+0200\n"
 "Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -61,57 +61,57 @@
 msgid "Your emails"
 msgstr "ulysses@kubuntu.org,urbalazs@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Címzett"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Tárgy"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Küldés körbe"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Ismétlődő"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Üzenetazonosító"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Nem várakozik üzenet…"
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Küldés most"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Törlés"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Igen"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nem"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected items? Do you want to continue?"
 msgid "Do you want to delete the selected item?"
@@ -119,68 +119,68 @@
 msgstr[0] "Szeretné törölni a kijelölt elemeket? Szeretné folytatni?"
 msgstr[1] "Szeretné törölni a kijelölt elemeket? Szeretné folytatni?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Elemek eltávolítása"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Szeretné eltávolítani az üzeneteket is?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Üzenetek eltávolítása"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Nem található üzenet."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Nem található üzenet."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Hiba az üzenet letöltése közben."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Nem sikerült letölteni az üzenetet. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Nem tudunk továbbítást létrehozni"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Az üzenet nem valódi üzenet"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Nem sikerült elküldeni az üzenetet."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Üzenet elküldve"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Hiba történt. Szeretné újraküldeni?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Hiba történt"
diff -Nru kmail-19.04.3/po/hu/kmail.po kmail-19.12.3/po/hu/kmail.po
--- kmail-19.04.3/po/hu/kmail.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/hu/kmail.po	2020-03-03 00:34:04.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: KDE 4.4\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2014-10-18 12:13+0200\n"
 "Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -195,8 +195,8 @@
 msgstr "Több titkosítási kulcs címenként"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -303,27 +303,27 @@
 "A KMail nem teljesen ismerte fel a levelezőlistát ebben a mappában. Kérem "
 "írja be a címeket kézzel."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvóta"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Használt:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Állapot:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% tele"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 / %2 felhasználva"
@@ -345,7 +345,7 @@
 "alábbi gombra és nyomja le a kívánt billentyűkombinációt.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Sablonok"
@@ -356,108 +356,108 @@
 msgstr "E&gyedi üzenetsablonok használata a mappában"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "A globális sablonok más&olása"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Nézet"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Egyéni ikonok &használata"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normál:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "Nem olvas&ott:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Feladó/címzett oszlop megjelenítése az üzenetlistában"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Oszlo&p megjelenítése:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Alapértelmezés"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Feladó"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Címzett"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Üzenetlista"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Az alapértelmezett gyűjtemény használata"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Gyűjtemény"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Az alapértelmezett téma használata"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Téma"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Alapértelmezett üzenetformátum"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "HTML használata egyszerű szöveg helyett"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &Plain Text to HTML"
 msgid "Prefer text to HTML"
 msgstr "Egyszerű szöveg előnyben részesítése a HTML-lel szemben"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Use Global Setting"
 msgid "Use Global Settings"
@@ -468,103 +468,108 @@
 msgid "Retrieval Options"
 msgstr "Letöltés beállításai"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Azonos&ító"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Fogadás"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Küldés"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Üzenetküldési azonosítók (legalább egyet hozzon létre):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Általános beállítások"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Megerősítés kérése kül&dés előtt"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Helyesírás-ellenőrzés küldés előtt"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Automatikusan soha"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Kézi levélellenőrzéskor"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Minden levélellenőrzéskor"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Küldés most"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Küldés később"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "A ki&menő üzenetek mappájában levő üzenetek elküldése:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Az ala&pértelmezett küldési mód:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Postafiók hozzáadása"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "Fióksorrend testreszabása…"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -574,30 +579,30 @@
 "Nem lehet elindítani az azonosítóbeállító varázslót. Ellenőrizze a "
 "telepítését."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Nem lehet elindítani az azonosítóbeállító varázslót"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Hozzáadás a kézi levélellenőrzéshez"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Váltás kapcsolat nélküli módba a KMail kikapcsolásakor"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Levelek keresése indításkor"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -655,7 +660,7 @@
 msgid "Fixed Width Font"
 msgstr "Állandó szélességű betűtípus"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Üzenetszerkesztő"
@@ -959,61 +964,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Nem sikerült címkét létrehozni. Ilyen nevű címke már létezik."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Általános"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Alapsablonok"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Egyedi sablonok"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Tárgy"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Karakterkészlet"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Fejlécmezők"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Mellékletek"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Automatikus javítás"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Kép automatikus átméretezése"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Aláírás"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1022,12 +1027,12 @@
 "A beállított aláírás automatikus beszúrása\n"
 "egy új levél írásának kezdetekor"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Aláírás beszúrása az idézett szöveg fölé"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1036,18 +1041,18 @@
 "Az RFC-kompatibilis aláírás elválasztó beszúrása\n"
 "(két kötőjel és egy szóköz egy sorban) az aláírás előtt"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Válasz küldésekor ne idézzen egyetlen létező aláírást sem"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formátum"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1058,7 +1063,7 @@
 "(a teljes üzenet helyett), ha\n"
 "a szöveg az üzenetablakban van kijelölve."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1069,17 +1074,17 @@
 "még akkor is, ha a sor egy további sortörés hozzáadásával jött létre\n"
 "a szöveg szótördelése közben."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Automatikus szótördelés engedélyezése a megadott szélességnél"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "A szövegszélesség beállítása az automatikus szótördeléshez"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1090,7 +1095,7 @@
 "eredeti formátumban idézze, ahogy az érkezett.\n"
 "Ha nincs bejelölve, a válasz sima szöveg lesz alapértelmezetten."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1101,34 +1106,34 @@
 "Félkövér, dőlt és aláhúzott szöveg, listák és külső hivatkozások a\n"
 "támogatottak."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Beágyazva"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Mellékletként"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Az alapértelmezett továbbított üzenetformátum beállítása"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Alapértelmezett továbbítási típus:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Címzettek"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1140,17 +1145,17 @@
 "Ezt választhatja üzenetenkénti alapon a „Beállítások - Feldolgozási "
 "visszajelzés kérése” használatával."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Figyelmeztetés, ha túl sok címzett van megadva"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "A címzettek maximális számának beállítása a figyelmeztetéshez"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1168,7 +1173,7 @@
 "levelezőlisták\n"
 "fiókjaira."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1177,18 +1182,18 @@
 "Emlékezzen a legutóbb beírt címekre,\n"
 "és ajánlja fel a címzett kiegészítéséhez"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Ne legyen mentés"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Megőrzött legutóbbi címek maximális értéke:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1197,25 +1202,25 @@
 "A legutóbb beírt címek maximális száma, amelyeket meg fog\n"
 "jegyezni a kiegészítéshez"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "A kiegészítési sorrend beállítása..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Ne legyen automatikus mentés"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Ne legyen automatikus mentés"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1223,18 +1228,18 @@
 msgstr[0] " perc"
 msgstr[1] " perc"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Az üzenet automatikus mentése a megadott időközönként"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "A tárgysor &előtagja válaszüzenetben"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1243,59 +1248,59 @@
 "A következő előtagok felismerése\n"
 "(nem nagybetűérzékeny reguláris kifejezések):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Hozzáadás..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Eltá&volítás"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mó&dosítás..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Adjon meg egy új válasz-előtagot:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "A tárgysor-előtagok t&ovábbítása"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Hozzáadás..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Eltá&volítás"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Módosítás..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Adja meg az új továbbítási előtagot:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1305,90 +1310,90 @@
 "karakterkészletet keresve, amely tartalmazza az üzenet összes karakterét."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Mó&dosítás..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Adja meg a karakterkészletet:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Az eredeti karakterkészlet megőr&zése válasznál és továbbításnál (ha "
 "lehetséges)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Ez a karakterkészlet nem támogatott."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Egyéni üzenetazonosító-&utótag használata"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Egyéni üzenet&azonosító-utótag:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Egyéni MIME fejlécmezők definiálása:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Név"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Érték"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "Ú&j"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Név:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "É&rték:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "Érvénytelen dátum"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook-kompatibilis mellékletnevek"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1398,40 +1403,40 @@
 "levelezőprogram fel tudja dolgozni a mellékletnevekben a nem angol "
 "karaktereket"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "A &hiányzó mellékletek felismerése"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Az alábbi kulcsszavak bármelyike fájlcsatolási szándékot jelez:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Adjon meg egy új kulcsszót:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgctxt "message status"
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Van csatolása"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Nincs korlát"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1525,7 +1530,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Üzenetszerkesztő"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1642,7 +1647,7 @@
 msgid "Archive Folder"
 msgstr "Archívummappa"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1708,19 +1713,19 @@
 msgid "Notification"
 msgstr "Értesítés"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 melléklet (%2)"
 msgstr[1] "%1 melléklet (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "A csatoláslista elrejtése"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "A csatoláslista elrejtése"
@@ -1737,332 +1742,332 @@
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Válassza ki az üzenet helyesírás-ellenőrzéséhez használandó szótárat"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Válassza ki az elküldött üzenet mappát, ahova az üzenet másolata kerül"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Válassza ki az üzenet küldéséhez használandó kimenő azonosítót"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Az üzenet „Feladó:” mezőjének beállítása"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Tárgy beállítása az üzenethez"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "Azonos&ító:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Szótár:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Az elkül&dött üzenetek mappája:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Üze&nettovábbítási mód:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Feladó:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Tárgy:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Levél küldése"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Levél küldése ezzel"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Elküldés"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Kül&dés később"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Kül&dés később ezzel"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Sor"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Mentés &piszkozatként"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "E-mail mentése a piszkozatok mappába"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Mentés sabl&onként"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "E-mail mentése a sablonok mappába"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Mentés &fájlba"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "E-mail mentése szövegként vagy HTML-fájlként"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Szövegfájl &beszúrása…"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "A legutó&bbi szövegfájl beszúrása"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Címjegyzék"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Címjegyzék megnyitása"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "Ú&j üzenet"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Címze&ttek kiválasztása..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "A címlista m&entése..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Be&illesztés mellékletként"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "A s&zóközök normalizálása"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Állandó szé&lességű betűtípus"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Sürgős"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Feldolgozási visszajelzés kérése"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Feldolgozási visszajelzés kérése"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Szó&tördelés"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Kódrészletek"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Automatikus &helyesírás-ellenőrzés"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Rich Text szerkesztés"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rich Text"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Rich text szerkesztési mód váltása"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Minden mező"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "Azonos&ító"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "Szó&tár"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Az &elküldött üzenetek mappája"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Üze&nettovábbítási mód"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Feladó"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Tárgy"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Alá&írás hozzáadása"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Alá&írás hozzáaddása az üzenet elején"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Aláírás beszúrása a &kurzornál"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Helyesírás-ellenőrző…"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Helyesírás-ellenőrző"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Az üzenet &titkosítása"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Titkosítás"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Az üzenet elektronikus a&láírása"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Elektronikus aláírás"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Tit&kosítási üzenetformátum"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Válasszon titkosítási formátumot az üzenethez"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "Ker&esés az üzenetek között..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Beállítások - KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2071,60 +2076,60 @@
 "<qt>Teljesen elrejti a menüsávot. Ezzel a paranccsal állítható vissza: %1.</"
 "qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Menüsáv elrejtése"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Sor: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Oszlop: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "FELÜL"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "BESZ"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Helyesírás-ellenőrzés: bekapcsolva"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Helyesírás-ellenőrzés: kikapcsolva"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Elmen&tés újból sablonként"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Mentés &piszkozatként"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "Az üzenet elmentése a Sablonok mappába későbbi felhasználásra."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2133,84 +2138,84 @@
 "Az üzenet elmentése a Piszkozatok mappába. Az üzenet ott szerkeszthető és "
 "később elküldhető."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "El szeretné dobni az üzenetet vagy inkább megőrzi piszkozatként?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "A szerkesztő bezárása"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Az üzenet automatikus mentése nem sikerült"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Az üzenet küldése sikertelen"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Fájltartalom beszúrása"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Hozzáadás beágyazott &képként"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Hozzá&adás mellékletként"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "A melléklet neve:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "Érvénytelen dátum"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "URL hozzáadása az üzenethez"
 msgstr[1] "URL-ek hozzáadása az üzenethez"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Fájl hozzáadás&a mellékletként"
 msgstr[1] "Fájlok hozzáadás&a mellékletként"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "A vágólapon levő szöveg beillesztése mellékletként"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "névtelen"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2223,12 +2228,12 @@
 "OpenPGP-s vagy S/MIME-os titkosítási kulcs.</p><p>Az azonosító "
 "beállításainál válassza ki a kívánt kulcsokat.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Nem definiált titkosítási kulcs"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2240,12 +2245,12 @@
 "p><p>Az azonosító beállításainál lehet kiválasztani a kívánt kulcsot.</p></"
 "qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nem definiált aláírási kulcs"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2256,7 +2261,7 @@
 "minden azonosítónál beírni a saját e-mail címet, hogy ne kelljen minden "
 "üzenetnél egyesével beírni."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2265,59 +2270,59 @@
 "Legalább egy címzettet meg kell adnia a Címzett mezőben vagy másolatként, "
 "vagy titkos másolatként."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "A címzett mező üres. El szeretné így küldeni az üzenetet?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Nincs megadva címzett"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nem adott meg tárgyat. El szeretné így küldeni az üzenetet?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nincs megadva tárgy"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Elküldés í&gy"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "I&nkább megadom a tárgyat"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Legalább egy címzettet meg kell adnia a piszkozat titkosításához."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Üzenet küldése..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Megerősítés küldése"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Kül&dés most"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2326,65 +2331,65 @@
 "Olyan üzenetet készül kiküldeni, amelynek több mint %1 címzettje van. "
 "Biztosan el szeretné küldeni az üzenetet?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Túl sok címzett"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Elküldés a m&ostani állapotban"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "A címzettek mó&dosítása"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "A HTML mód kikapcsolása megszünteti a szöveg formázását. Biztos benne?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Megszünteti a formázást?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "A formázás eldobása"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Jelölő egyszerű szöveg hozzáadása"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2392,7 +2397,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2472,14 +2477,14 @@
 msgid "External editor was started."
 msgstr "A külső szövegszerkesztő elindítva."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
@@ -2487,7 +2492,7 @@
 "Az archívummappa nincs meghatározva. Kérjük ellenőrizze a(z) %1 fiók "
 "beállításait"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2496,7 +2501,7 @@
 "Az archívummappa nincs meghatározva. Kérjük ellenőrizze a(z) %1 fiók "
 "beállításait"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2526,11 +2531,6 @@
 msgid "Message will not be encrypted"
 msgstr "Az üzenetek nem lesz titkosítva"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Szövegrészletek"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2579,27 +2579,27 @@
 msgid "Cannot move messages."
 msgstr "Nem sikerült áthelyezni az üzeneteket."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Nem sikerült lekérni a mappát. A jelentett hiba: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Nincs visszaadott mappa."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Nem sikerült lekérni a szülőmappát. A jelentett hiba: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Nem sikerült visszaadni a mappák listáját."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Üzenetek archiválva"
@@ -2640,50 +2640,50 @@
 msgid "&Existing identities:"
 msgstr "A már &létező azonosítók:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Hiba történt a(z) %1 mappa átnevezése közben a kiszolgálón"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Adjon meg egy új kulcsszót:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Az azonosító módosítása"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Általános"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Név:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2694,12 +2694,12 @@
 "címzettnél az e-mail cím mellett.</p><p>Ha üresen hagyja, csak az e-mail cím "
 "fog megjelenni a címzettnél.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Szerve&zet:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2710,12 +2710,12 @@
 "amelyhez Ön tartozik.</p><p>Általában üresen lehet hagyni ezt a mezőt.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "E-m&ail cím:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2731,12 +2731,12 @@
 "rosszul állítja be, akkor lehetséges, hogy másoknak problémát fog okozni, "
 "hogy válaszoljanak Önnek.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "E-mail á&lnevek:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2753,12 +2753,12 @@
 "org<br>utolso@pelda.org</td></tr></table><p>Soronként egy álnév címet adjon "
 "meg.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Titkosítás"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2779,12 +2779,12 @@
 "küldeni. A normál levélküldési funkciót ez nem érinti.</p><p>A kulcsokról "
 "részletes leírás található itt: <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-s aláírási kulcs:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2809,12 +2809,12 @@
 "kulcsokról részletes leírás található itt: <a>http://www.gnupg.org</a></p></"
 "qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-s titkosítási kulcs:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2827,12 +2827,12 @@
 "lehet S/MIME-mal elektronikusan aláírt üzeneteket küldeni. A normál "
 "levélküldési funkciót ez nem érinti.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-os aláírási tanúsítvány:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2847,40 +2847,40 @@
 "titkosítani a kimenő üzeneteknek az Elküldött üzenetek közé helyezett "
 "másolatát. A többi levélküldési funkciót ez nem érinti.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-os titkosítási tanúsítvány:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Javasolt formátum:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Az üzenetek automatikus aláírása"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Az üzenetek titkosítása min&dig, amikor csak lehetséges"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Speciális"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Válaszcím:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2896,12 +2896,12 @@
 "Beállítható, hogy az üzenetek az Ön nevében menjenek ki, de a válaszokat "
 "mindig az egész csoport kapja meg.</p><p>Általában üresen hagyható.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Másolati cí&mzettek (CC):"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2918,12 +2918,12 @@
 "megadni, vesszővel elválasztva adja meg a címeket.</p><p>Ha nincs szüksége "
 "erre a funkcióra, hagyja üresen a mezőt.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Rejtett &címzettek (BCC):"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2941,57 +2941,57 @@
 "elválasztva adja meg a címeket.</p><p>Ha nincs szüksége erre a funkcióra, "
 "hagyja üresen a mezőt.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Szótá&r:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Az elkül&dött üzenetek mappája:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "A &piszkozatok mappája:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "A &sablonok mappája:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Kimenő fiók:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Saját vCard csatolása az üzenethez"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Létrehozás…"
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Automatikus javítás nyelve:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Alapértelmezett tartománynév visszaállítása"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Az ala&pértelmezett tartomány:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3000,33 +3000,33 @@
 "<qt><p>Az alapértelmezett tartománynévvel lesznek kiegészítve azok a címek, "
 "melyek csak a felhasználónévből állnak.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "E&gyedi üzenetsablonok használata ennél az identitásnál"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Aláírás"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Kép"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Érvénytelen e-mail álnév: „%1”"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Érvénytelen e-mail cím"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3039,7 +3039,7 @@
 "Ebben az esetben az üzenetek címzettei figyelmeztetést kaphatnak, amikor "
 "ellenőrizni próbálják az aláírás érvényességét."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3048,7 +3048,7 @@
 "Az egyik beállított OpenPGP-s titkosítási kulcs nem tartalmazza a "
 "felhasználóazonosítót az azonosítóhoz (%1) beállított e-mail címmel."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3061,7 +3061,7 @@
 "Ebben az esetben az üzenetek címzettei figyelmeztetést kaphatnak, amikor "
 "ellenőrizni próbálják az aláírás érvényességét."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3070,22 +3070,22 @@
 "Az egyik beállított S/MIME-os titkosítási tanúsítvány nem tartalmazza az "
 "azonosítóhoz (%1) beállított e-mail címet."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "A kulcsban vagy tanúsítványban nem található e-mail cím"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Az aláírásfájl érvénytelen"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "A(z) „%1” azonosító módosítása"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3097,7 +3097,7 @@
 "A(z) „%1” azonosítóhoz megadott Piszkozatok mappa nem érhető el, ezért "
 "helyette az alapértelmezett Piszkozatok mappát használja a program."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Szerkesztés…"
@@ -3129,6 +3129,21 @@
 msgid "We cannot delete vCard file."
 msgstr "Nem sikerült törölni a vCard fájlt."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgctxt "@info"
+#| msgid "Do you really want to execute <filename>%1</filename>?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Biztosan futtatni szeretné ezt: <filename>%1</filename>?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Megerősítés küldése"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3294,7 +3309,7 @@
 "Néhány példa található itt: <a href=\"http://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Kép"
@@ -3327,7 +3342,7 @@
 msgstr[0] "A(z) „%2” terjesztési lista üres, nem használható."
 msgstr[1] "A(z) „%2” terjesztési listák üresek, nem használhatók."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Felvétel a címjegyzékbe"
@@ -3337,22 +3352,22 @@
 msgid "Contact created successfully"
 msgstr "Partner sikeresen létrehozva"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "A partner nem tárolható: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Nem sikerült eltárolni a partnert"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Biztosan szeretné csatolni ezt a mappát: „%1”?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Mappa csatolása"
@@ -3567,7 +3582,7 @@
 msgstr "&Mappa"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3575,7 +3590,7 @@
 msgstr "Az összes szűrő al&kalmazása a mappán"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current Folder & All Subfolders"
@@ -3602,7 +3617,7 @@
 msgstr "Tová&bbítás"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Szűrő a&lkalmazása"
@@ -3627,7 +3642,7 @@
 msgstr "&Súgó"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Alap eszköztár"
@@ -3683,12 +3698,12 @@
 msgid "The file does not contain a message."
 msgstr "A fájl nem tartalmaz üzenetet."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "A fájl több üzenetet tartalmaz. Csak az első lesz megjelenítve."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3697,32 +3712,32 @@
 "A kijelölt üzeneteket egy üzenetben, mellékletként szeretné továbbítani vagy "
 "egyesével?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Elküldés egyben"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Elküldés külön-külön"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Üzenetszűrés"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Üzenetszűrés - %2 / %1"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Üzenetek áthelyezése"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Üzenetek törlése"
@@ -3751,30 +3766,30 @@
 msgid "Text Direction Toolbar"
 msgstr "Szövegirány eszköztár"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "A KMail offline módba vált, minden hálózati adatátvitel fel lesz függesztve"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Üzenet küldése..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "A KMail online módba vált, a hálózati adatátvitel folytatódhat"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3783,37 +3798,37 @@
 "A KMail online; az összes hálózati feladat folytatódni fog hálózati "
 "kapcsolat észlelésekor"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "A KMail jelenleg offline módban van, mit szeretne tenni?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Van/nincs kapcsolat"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Online módba váltás"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Offline módban maradjon"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Hálózati kapcsolat észlelve,  a hálózati feladatok folytatása"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Nem észlelhető hálózati kapcsolat, a hálózati feladatok felfüggesztve"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3822,12 +3837,12 @@
 "Nem sikerült megnyitni az automatikusan mentett fájlt (%1).\n"
 "Ok: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Nem sikerült megnyitni az automatikusan mentett fájlt"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3836,7 +3851,7 @@
 msgstr[1] ""
 "Ennél a(z) %1 azonosítónál az alapértelmezett továbbító lett beállítva:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3844,44 +3859,47 @@
 msgstr[0] "Ennél az azonosítónál a módosított továbbító lett beállítva."
 msgstr[1] "Ennél a(z) %1 azonosítónál a módosított továbbító lett beállítva."
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Üzenetek küldése"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Küldés előkészítése…"
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "A(z) %1 erőforrás sérült."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "A levélarchiváló ügynök nincs regisztrálva."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "A küldés később ügynök nincs regisztrálva."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Send Later Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr "A küldés később ügynök nincs regisztrálva."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3891,12 +3909,12 @@
 "A tanúsítványkezelőt nem sikerült elindítani. Ellenőrizze, hogy minden "
 "szükséges rész telepítve van-e."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Hiba - KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3905,26 +3923,30 @@
 msgstr ""
 "Nem lehet elindítani az importálás varázslót. Ellenőrizze a telepítését."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Nem lehet elindítani az importálás varázslót"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Nem lehet elindítani a „PIM beállítás exportáló” programot. Ellenőrizze a "
 "telepítését."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Nem lehet elindítani a „PIM beállítás exportáló” programot"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3933,73 +3955,73 @@
 msgstr ""
 "Nem lehet elindítani az importálás varázslót. Ellenőrizze a telepítését."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Nem lehet elindítani az importálás varázslót"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Egy másik levelező található a rendszeren. Szeretne adatokat importálni "
 "belőle?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Nem lehet elindítani az importálás varázslót. Ellenőrizze a telepítését."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Nincs tárgy"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(nincs sablon)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Erre a mappára nincsenek beállítva eltávolítási szabályok"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Biztosan azt szeretné, hogy el legyen távolítva a(z) <b>%1</b> mappa "
 "tartalma?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "A mappa tartalma legyen eltávolítva"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Eltávolítás"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "A törölt üzenetek eltávolítása"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Áthelyezés a törölt üzenetek közé"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Biztosan ki szeretné üríteni a törölt üzenetek mappáját?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4008,27 +4030,27 @@
 "<qt>Biztosan át szeretné mozgatni az összes üzenetet a(z) <b>%1</b> mappából "
 "a törölt üzenetek közé?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Az összes üzenet átkerült a törölt üzenetek közé"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Biztosan azt szeretné, hogy az összes régi üzenet el legyen távolítva?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "A régi üzenetek el legyenek távolítva?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Eltávolítás"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4040,17 +4062,17 @@
 "a kockázata, hogy adatvesztés következhet be most még nem ismert biztonsági "
 "rések kihasználása révén."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Biztonsági figyelmeztetés"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "A külső hivatkozások betöltése"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4065,538 +4087,538 @@
 "<qt>Biztosan törölni szeretné a kijelölt %1 üzenetet?<br />A törölt "
 "üzeneteket nem lehet később visszanyerni!</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Az üzenetek törlése"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Üzenet törlése"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Üzenetek áthelyezése..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Üzenetek törlése..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Az üzenetek törlése sikeresen megtörtént."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Az üzenetek áthelyezése sikeresen befejeződött."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Az üzeneteket nem sikerült törölni."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Az üzenetek törlése félbe lett szakítva."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Az üzeneteket nem sikerült áthelyezni."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Az üzenetek áthelyezése félbe lett szakítva."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Üzenetek átmozgatása egy mappába"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Üzenetek átmásolása..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Az üzenetek átmásolása sikeresen befejeződött."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Az üzeneteket nem sikerült átmásolni."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Az üzenetek átmásolása megszakadt."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Üzenetek átmásolása ide"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Üzenetek áthelyezése a törölt üzenetek közé..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Üzenetek áthelyezése a törölt üzenetek közé..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Az üzeneteket sikerült áthelyezni a töröltek közé."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Az üzeneteket sikerült áthelyezni a töröltek közé."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Az üzeneteket nem sikerült áthelyezni a töröltek közé."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Az üzeneteket nem sikerült áthelyezni a töröltek közé."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Az üzenetek áthelyezése megszakadt."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Az üzenetek áthelyezése megszakadt."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Ugrás a mappára"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Mentés m&int..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Elé&vülés az összes mappában"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Üzenetek &letöltése"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Üzenetek letöltése"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Üzenetek letöltése"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "A &sorban álló üzenetek elküldése"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Kapcsolati állapot (ismeretlen)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "A sorban álló üzenetek elküldése ezzel"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Tanúsítványkezelő"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "Üzenetek &importálása…"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "A &Sieve hibakeresése…"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "A szű&rési napló megtekintése…"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "A „Házon kívül vagyok” üzenetek beállítása…"
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Automatikus archiválás beállítása…"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Késleltetett üzenetek…"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "Ker&esés az üzenetek között..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Törlés"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "A szál át&helyezése a törölt üzenetek mappájába"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "A szál átmozgatása a törölt üzenetek közé"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "A szál tö&rlése"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Ker&esés az üzenetek között..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Az összes ü&zenet kijelölése"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Le&velezőlista-kezelés..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Billentyűparan&cs hozzárendelése..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Lejárási beállítások"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "Mappa &archiválása..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "A külső h&ivatkozások betöltése"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Üzenet másolása ide…"
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Üzenet áthelyezése ide…"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Ú&j üzenet..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Új"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Új üzenet adott &sablonnal"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Új üzenet a le&velezőlistára..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Szűrő lét&rehozása"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "A &tárgyra..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "A &feladóra..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "A &címzettre..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "A &címzettre..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "A &szál megjelölése"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "A szál megjelölése &olvasottnak"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "A kijelölt szálhoz tartozó összes üzenet megjelölése &olvasottnak"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "A szál megjelölése ol&vasatlannak"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "A kijelölt szálhoz tartozó összes üzenet megjelölése olvasatlannak"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "A szál megjelölése &fontosnak"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "A Fontos megjelölés eltá&volítása"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "A szál megjelölése mű&veletelemnek"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "A Mű&veletelem száljelző eltávolítása"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "A &szál figyelése"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "A szál figyelmen kívül &hagyása"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Mellékle&tek mentése…"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Elem másolása ide…"
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Az összes szűrő al&kalmazása"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Szál / csoport ki&bontása"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Jelenlegi szál vagy csoport kibontása"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Szál / csoport össze&csukása"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Jelenleg szál vagy csoport összecsukása"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Az összes szál k&ibontása"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Az összes szál kibontása az aktuális mappában"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Az összes szál összecs&ukása"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Az összes üzenetszál összecsukása az aktuális mappában"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Az üzenet m&egjelenítése"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Következő üzenet"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Ugrás a következő üzenetre"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Következő &olvasatlan üzenet"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Következő"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Ugrás a következő olvasatlan üzenetre"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Előző üzenet"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Ugrás az előző üzenetre"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Elő&ző olvasatlan üzenet"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Előző"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Ugrás az előző olvasatlan üzenetre"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "A következő, olv&asatlan üzenetet tartalmazó mappa"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Ugrás a következő, olvasatlan üzeneteket tartalmazó mappára"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Az előző, o&lvasatlan üzenetet tartalmazó mappa"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Ugrás az előző, olvasatlan üzeneteket tartalmazó mappára"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "A következő, &még nem olvasott szöveg"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Ugrás a következő, még nem olvasott szövegre"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4605,222 +4627,228 @@
 "Az aktuális üzenet lefelé görgetése. Az üzenet végére érve ugrás a "
 "következő, még nem olvasott szövegre."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "A szűrők &beállítása..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "A Sieve-szkriptek &kezelése..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Postafiók hozzáadása"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "A KMail bem&utatkozó oldala"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "A KMail bemutatkozó oldalának megjelenítése"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Az ér&tesítések beállítása..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Beállítások..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Lejárás..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Kedvenc mappa hozzáadása..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Kiszolgálóoldali előfizetés..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Az összes szűrő al&kalmazása"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "KMail adat &exportálása…"
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Új címjegyzék partner…"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Az üzenet átmásolása ide"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Ugrás a mappára..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Az aktuális művelet félbeszakítása"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "A következő mappára lépés"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Az előző mappára lépés"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Lépés egy mappára"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "A első mappára lépés"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Az utolsó mappára lépés"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Lépés a következő üzenetre"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Lépés az előző üzenetre"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Első üzenet kijelölése"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Utolsó üzenet kijelölése"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Váltás az aktuális üzenetre"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Fókusz a gyorskeresőre"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Az előző üzenet bevétele a kijelölésbe"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "A következő üzenet bevétele a kijelölésbe"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Az üzenet átmozgatása ide"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Use message indicator"
 msgid "Use Less Bandwidth"
 msgstr "Üzenetjelző használata"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Beállítások"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "Azonosító"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Kedvenc mappa hozzáadása"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "A törölt üzenetek eltá&volítása"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Az összes üzenet áth&elyezése a törölt üzenetek közé"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Keresőmappa tör&lése"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "A keresés szerkesztése…"
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Visszavonás"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Visszavonás: „%1”"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "%1. szűrő"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4828,7 +4856,7 @@
 msgid "Search... <%1>"
 msgstr "Keresés…<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4840,12 +4868,12 @@
 "kockázata, hogy adatvesztés következhet be most még nem ismert biztonsági "
 "rések kihasználása révén."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML használata"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4855,119 +4883,119 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "&Cancel"
 msgid "Cancel"
 msgstr "&Mégsem"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Indítás..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Áthelyezés a törölt e&lemek közé"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Törölt üzenetek"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Az üzenet áthelyezése a törölt üzenetek közé"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Nem lehet másolni az elemet. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Új üzenet…"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Válasz küldése…"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Továbbítás…"
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Hozzáadás a létező partnerhez"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Megnyitás a címjegyzékben"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Könyvjelző létrehozása a linkre"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Partner szerkesztése…"
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "A link mentése mint…"
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "Ker&esés az üzenet szövegében..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "A kép mentése lemezre…"
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "HTML formátum megjelenítése"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "HTML formátum megjelenítése, amikor a levél ettől a partnertől érkezik"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Külső hivatkozás betöltése, amikor a levél ettől a partnertől érkezik"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Kép megosztása…"
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4976,68 +5004,68 @@
 "A KMail mostantól az Akonadi személyi információkezelő keretrendszeren "
 "alapul, amely számos változtatást hoz."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "E-mail küldése (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Továbbfejlesztett keresések"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Jegyzetek hozzáadása e-mailekhez"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Kevesebb lefagyás, a levelek ellenőrzése a háttérben történik"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG-támogatás"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "Helyesírás-ellenőrzés küldés előtt"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE-alapú levelezőprogram"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "Mappatulajdonságok lekérése"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Egy kis türelmet kérek"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "nem elérhető"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5051,7 +5079,7 @@
 "van. <a href=\"kmail:goOnline\">Kattintson ide</a>, ha online módba szeretne "
 "váltani . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5065,22 +5093,22 @@
 "van. Kattintson <a href=\"kmail:goResourceOnline\">ide</a>, hogy elérhető "
 "legyen…</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "A partner sikeresen módosítva"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Új üzenetek -"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Nincsenek olvasatlan üzenetek"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5103,8 +5131,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5198,19 +5226,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Névjegyek"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5259,28 +5287,28 @@
 msgid "All"
 msgstr "Teljes"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2009, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) A KMail fejlesztői, 1997-2009."
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5307,7 +5335,7 @@
 msgid "&Reply"
 msgstr "&Válasz"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Válasz..."
@@ -5317,12 +5345,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Válasz a &feladónak..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Válasz &mindenkinek..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Válasz küldése a &levelezőlistára..."
@@ -5353,7 +5381,7 @@
 msgid "&Edit As New"
 msgstr "Az üzenet s&zerkesztése"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5553,82 +5581,82 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "A keresés nem sikerült. A talált hibák: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Üzenet keresése"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Keresés"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "Beszúr&va..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Mellékletként..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "A mellékletek mentése…"
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "A kijelölés megszüntetése"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Ugrás az eredeti mappára"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 találat"
 msgstr[1] "%1 találat"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Utolsó keresés"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Nem érvényes mappát választott ki."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Elfelejtette a gyűjtemények kijelölését."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Elfelejtette a feltétel meghatározását."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Minden kijelölt mappa üres vagy nincs indexelve."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Elfelejtett feltételeket hozzáadni."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5636,32 +5664,32 @@
 "A tartalmazott feltételeket nem lehet használni 4-nél kevesebb "
 "karakterszámmal."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Keresés…"
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Nem kérhetők le a keresési eredmények. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "A keresés nem sikerült."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "A keresés befejeződött."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "A keresés leállítva."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5671,21 +5699,21 @@
 "Hiba történt a keresési mappa átnevezése közben. Ennek általában az az oka, "
 "hogy már létezik keresési mappa ezzel a névvel. A visszaadott hiba: „%1”."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Üzenet másolása"
 msgstr[1] "%1 üzenetek másolása"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Üzenet kivágása"
 msgstr[1] "%1 üzenetek kivágása"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5821,7 +5849,7 @@
 "Megadja, hogy első alkalommal fut-e az alkalmazás (csak belső használatra)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5829,7 +5857,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5837,26 +5865,26 @@
 msgstr "Ez az érték dönti el, hogy a KMail bemutatkozó oldala megjelenjen-e."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Gyorskereső mező megjelenítése"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Beágyazott továbbítás alapértelmezésben."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Figyelmeztetés, ha a címzettek száma több mint:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5867,19 +5895,19 @@
 "kér kiküldés előtt. A figyelmeztetés kikapcsolható."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Helyesírás-ellenőrzés küldés előtt"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "M&indig visszajelzést szeretnék kérni az üzenet feldolgozásáról"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5895,13 +5923,13 @@
 "em>-><em>Feldolgozási visszajelzés kérése</em> menüponttal.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Az automatikus mentés időköze:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5913,152 +5941,152 @@
 "meg, nem lesz automatikus mentés."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "Jelenjen meg a Szövegrészlet-kezelő és -beszúró panel az üzenetszerkesztőben."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Ha be van jelölve, az elküldött üzenetek titkosítva kerülnek tárolásra"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "A nemrég használt URL-címek listája"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "A nemrég használt kódolások listája"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Titkossági szint jelző megjelenítése"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Alapértelmezett küldés gyorsbillentyű ellenőrzése"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Az azonosító párbeszédablak mérete (csak belső használatra)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "A keresőablak szélessége (csak belső használatra)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "A keresőablak magassága (csak belső használatra)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "A KMail beállítóablakának szélessége (csak belső használatra)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "A KMail beállítóablakának magassága (csak belső használatra)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Előnézeti panel"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Ne legyen betekintő panel"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Az üzenetlista alatt"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Az üzenetlista mellett"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Mappalista"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Hosszú mappalista"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Rövid mappalista"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Az új üzenet sablonja"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "A válasz sablonja"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "A válasz mindenkinek sablonja"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "A továbbítás sablonja"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Idézésjelzők"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Megadja a házirend megjelenítésekor használt házirendet"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6068,7 +6096,7 @@
 "belső használatra)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6078,7 +6106,7 @@
 "használatra)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6088,7 +6116,7 @@
 "belső használatra)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6098,7 +6126,7 @@
 "belső használatra)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6108,7 +6136,7 @@
 "használatra)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6377,10 +6405,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6753,10 +6818,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Üzenetek letöltése"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7391,6 +7455,16 @@
 msgstr ""
 "Az „Ez a kérdés ne jelenjen meg ezután” beállítások alapállapotba hozása"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7448,6 +7522,14 @@
 msgid "Zoom: %1%"
 msgstr "Nagyítás"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Szövegrészletek"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Üzenetek letöltése"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Mappanév és -méret, ha közel van a kvótához"
 
@@ -11117,11 +11199,6 @@
 #~ msgstr "Az &alapértelmezett azonosító használata"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Azonosító"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "A kiszolgáló támogatja a &Sieve-et"
@@ -13146,10 +13223,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "URL megnyitása..."
 
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "Biztosan futtatni szeretné ezt: <filename>%1</filename>?"
-
 #~ msgid "Execute"
 #~ msgstr "Végrehajtás"
 
diff -Nru kmail-19.04.3/po/hu/ktnef.po kmail-19.12.3/po/hu/ktnef.po
--- kmail-19.04.3/po/hu/ktnef.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/hu/ktnef.po	2020-03-03 00:34:04.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2013-10-06 12:16+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
diff -Nru kmail-19.04.3/po/ia/akonadi_archivemail_agent.po kmail-19.12.3/po/ia/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ia/akonadi_archivemail_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/ia/akonadi_archivemail_agent.po	2020-03-03 00:34:05.000000000 +0000
@@ -1,20 +1,20 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Giovanni Sora <g.sora@tiscali.it>, 2012, 2013, 2014.
+# Giovanni Sora <g.sora@tiscali.it>, 2012, 2013, 2014, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
-"PO-Revision-Date: 2014-04-08 14:55+0200\n"
-"Last-Translator: G.Sora <g.sora@tiscali.it>\n"
-"Language-Team: Interlingua <kde-l10n-ia@kde.org>\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2020-01-20 11:54+0100\n"
+"Last-Translator: giovanni <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 18.12.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: addarchivemaildialog.cpp:44
@@ -33,10 +33,9 @@
 msgstr "&Dossier:"
 
 #: addarchivemaildialog.cpp:72
-#, fuzzy, kde-format
-#| msgid "F&ormat:"
+#, kde-format
 msgid "Format:"
-msgstr "F&ormato:"
+msgstr "Formato:"
 
 #: addarchivemaildialog.cpp:80
 #, kde-format
@@ -100,10 +99,9 @@
 msgstr "Archiva messages de e-posta automaticamente"
 
 #: archivemailwidget.cpp:106
-#, fuzzy, kde-format
-#| msgid "Copyright (C) 2012, 2013, 2014 Laurent Montel"
+#, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
-msgstr "Copyright (C) 2012, 2013,2014 Laurent Montel"
+msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
 #: archivemailwidget.cpp:107
 #, kde-format
@@ -161,10 +159,9 @@
 msgstr "Archivo essera facite %1"
 
 #: archivemailwidget.cpp:238
-#, fuzzy, kde-format
-#| msgid "Do you want to delete selected items? Do you want to continue?"
+#, kde-format
 msgid "Do you want to delete the selected items?"
-msgstr "Tu vole deler elementos seligite?Tu vole continuar?"
+msgstr "Tu vole deler elementos seligite?"
 
 #: archivemailwidget.cpp:238
 #, kde-format
@@ -179,12 +176,14 @@
 "Non pote adder un secunde archivo pro iste dossier. In loco tu modifica lo "
 "que es existente."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
+"Directorio non existe. Pro favor tu verifica le preferentias. Archivo "
+"postponite."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Initia archivar %1"
diff -Nru kmail-19.04.3/po/ia/akonadi_followupreminder_agent.po kmail-19.12.3/po/ia/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/ia/akonadi_followupreminder_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/ia/akonadi_followupreminder_agent.po	2020-03-03 00:34:05.000000000 +0000
@@ -1,117 +1,116 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Giovanni Sora <g.sora@tiscali.it>, 2016.
+# Giovanni Sora <g.sora@tiscali.it>, 2016, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2016-02-02 13:39+0100\n"
-"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
-"Language-Team: Interlingua <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
+"PO-Revision-Date: 2020-01-20 12:17+0100\n"
+"Last-Translator: giovanni <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 18.12.3\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
-msgstr ""
+msgstr "Agente de Memento de prosequer (Follow Up Reminder)"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
-#, fuzzy, kde-format
-#| msgid "Follow Up Mail"
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
+#, kde-format
 msgid "Follow Up Reminder"
-msgstr "E-posta de continuar"
+msgstr "Memento de prosequer"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
-msgstr ""
+msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Mantenitor"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Giovanni Sora"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "g.sora@tiscali.it"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Subjecto"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
-msgstr ""
+msgstr "Linmea morte"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Responde"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Recipite"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Mantenite in pausa"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
-msgstr ""
+msgstr "MOnstra message"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Dele"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tu  vole remover iste elemento seligite ?"
+msgstr[1] "Tu  vole remover iste %1 elementos  seligite ?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
-msgstr ""
+msgstr "Responsa ex %1 recepite"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
-msgstr ""
+msgstr "Tu ancora attende un responsa re iste messagge de eposta:"
 
 #~ msgid "Configure"
 #~ msgstr "Configura "
diff -Nru kmail-19.04.3/po/ia/akonadi_mailfilter_agent.po kmail-19.12.3/po/ia/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ia/akonadi_mailfilter_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/ia/akonadi_mailfilter_agent.po	2020-03-03 00:34:05.000000000 +0000
@@ -1,20 +1,20 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# g.sora <g.sora@tiscali.it>, 2011, 2012, 2013.
+# g.sora <g.sora@tiscali.it>, 2011, 2012, 2013, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2013-07-08 14:17+0200\n"
-"Last-Translator: G.Sora <g.sora@tiscali.it>\n"
-"Language-Team: Interlingua <kde-l10n-ia@kde.org>\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
+"PO-Revision-Date: 2020-01-20 13:33+0100\n"
+"Last-Translator: giovanni <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 18.12.3\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: filterlogdialog.cpp:67
@@ -22,17 +22,17 @@
 msgid "Filter Log Viewer"
 msgstr "Visor de registro de Filtro"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
-msgstr ""
+msgstr "Comparti..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Registra activitates de filtro"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -42,23 +42,23 @@
 "Naturalmente, data registrate es colligite e monstrate solo quando le "
 "registration es activate."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalios de registro"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Description de modello de registro"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Valutation de &regula de filtro de registro"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -73,34 +73,34 @@
 "modo solmente essera date le  retorno a proposito del resultato de  "
 "valutation de omne regulas de un singule filtro."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Valutation de modello de filtro de registro"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Actiones de filtro de registro"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Limite de dimension de registro:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "sin limite"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -113,7 +113,7 @@
 "usar: si le dimension de datos colligite excede iste limite alora le data "
 "plus vetere essera abandonate usque le limite non es ancora excedite."
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -122,64 +122,63 @@
 "Il non pote scriber le file %1:\n"
 "\"%2\" es le detaliate description de error."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Error de KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrante messages %1 de %2"
 
-#: filtermanager.cpp:211
-#, fuzzy, kde-format
-#| msgid "Error applying mail filter delete"
+#: filtermanager.cpp:208
+#, kde-format
 msgid "Error applying mail filter move"
-msgstr "Error durante que on applicava  deletion de filtro de posta"
+msgstr "Error durante que on applicava  le mover de filtro de posta"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Error durante que on applicava  deletion de filtro de posta"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Error durante que on applicava modificationes de filtro de posta"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Valutante regulas de filtro:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>regulas de filtro se ha date resultato.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Initia filtrar sur message \"%1\" ex \"%2\" a \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrante messages"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Registro de filtro de posta habilitate"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Preste"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrante messages in %1"
diff -Nru kmail-19.04.3/po/ia/akonadi_sendlater_agent.po kmail-19.12.3/po/ia/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ia/akonadi_sendlater_agent.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/ia/akonadi_sendlater_agent.po	2020-03-03 00:34:05.000000000 +0000
@@ -1,21 +1,21 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Giovanni Sora <g.sora@tiscali.it>, 2013, 2014.
+# Giovanni Sora <g.sora@tiscali.it>, 2013, 2014, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2014-04-08 14:56+0200\n"
-"Last-Translator: G.Sora <g.sora@tiscali.it>\n"
-"Language-Team: Interlingua <kde-l10n-ia@kde.org>\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
+"PO-Revision-Date: 2020-02-05 10:59+0100\n"
+"Last-Translator: giovanni <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #: sendlaterconfiguredialog.cpp:37
 #, kde-format
@@ -33,10 +33,9 @@
 msgstr "Agente de inviar e-posta plus tarde."
 
 #: sendlaterconfiguredialog.cpp:61
-#, fuzzy, kde-format
-#| msgid "Copyright (C) 2013, 2014 Laurent Montel"
+#, kde-format
 msgid "Copyright (C) 2013-2019 Laurent Montel"
-msgstr "Copyright (C) , 2013, 2014 Laurent Montel"
+msgstr "Copyright (C) 2013-2019 Laurent Montel"
 
 #: sendlaterconfiguredialog.cpp:63
 #, kde-format
@@ -60,128 +59,124 @@
 msgid "Your emails"
 msgstr "g.sora@tiscali.it"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Subjecto"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Invia circa a"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Recurrente"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Id de message"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Necun message expectante..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Invia ora"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Dele"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Si"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "No"
 
-#: sendlaterconfigurewidget.cpp:217
-#, fuzzy, kde-format
-#| msgid "Do you want to delete selected items? Do you want to continue?"
+#: sendlaterconfigurewidget.cpp:215
+#, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Tu vole deler elementos seligite?Tu vole continuar?"
-msgstr[1] "Tu vole deler elementos seligite?Tu vole continuar?"
+msgstr[1] "Tu vole deler elementos seligite?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Remove elementos"
 
-#: sendlaterconfigurewidget.cpp:222
-#, fuzzy, kde-format
-#| msgid "Do you want to remove messages as well?"
+#: sendlaterconfigurewidget.cpp:220
+#, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Tu vole anque remover le messages?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Remove messages"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
-#, fuzzy, kde-format
-#| msgid "Not message found."
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
+#, kde-format
 msgid "Not message found."
 msgstr "Necun message trovate."
 
-#: sendlaterjob.cpp:81
-#, fuzzy, kde-format
-#| msgid "Not message found."
+#: sendlaterjob.cpp:79
+#, kde-format
 msgid "No message found."
 msgstr "Necun message trovate."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Error durante que on cercava message."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Non pote trovar message. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "On non pote crear transporto"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "le message non es un ver message"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Il non pote inviar message."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Message inviate"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Il trovava un error. Tu vole reinviar lo?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Error trovate"
diff -Nru kmail-19.04.3/po/ia/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/ia/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/ia/akonadi_unifiedmailbox_agent.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/ia/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:05.000000000 +0000
@@ -0,0 +1,88 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Giovanni Sora <g.sora@tiscali.it>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2020-01-20 15:35+0100\n"
+"Last-Translator: giovanni <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
+"Language: ia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 18.12.3\n"
+
+#: settingsdialog.cpp:63
+#, kde-format
+msgid "Add"
+msgstr "Adde"
+
+#: settingsdialog.cpp:77
+#, kde-format
+msgid "Modify"
+msgstr "Modifica"
+
+#: settingsdialog.cpp:100
+#, kde-format
+msgid "Remove"
+msgstr "Remove"
+
+#: settingsdialog.cpp:110
+#, kde-format
+msgid "Do you really want to remove unified mailbox <b>%1</b>?"
+msgstr "Tu vermente vole remover cassa de posta unificate <b>%1</b>?"
+
+#: settingsdialog.cpp:111
+#, kde-format
+msgid "Really Remove?"
+msgstr "Vermente remove?"
+
+#: unifiedmailboxagent.cpp:59 unifiedmailboxagent.cpp:151
+#, kde-format
+msgid "Unified Mailboxes"
+msgstr "Cassas de posta unificate"
+
+#: unifiedmailboxagent.cpp:184
+#, kde-format
+msgid "Synchronizing unified mailbox %1"
+msgstr "Synchronisante cassa  de e-posta unificate %1"
+
+#: unifiedmailboxeditor.cpp:95
+#, kde-format
+msgid "Add an Unified MailBox"
+msgstr "Adde un Cassa de posta unificate"
+
+#: unifiedmailboxeditor.cpp:107
+#, kde-format
+msgid "Name:"
+msgstr "Nomine:"
+
+#: unifiedmailboxeditor.cpp:114
+#, kde-format
+msgid "Pick icon..."
+msgstr "Selige icone..."
+
+#: unifiedmailboxeditor.cpp:115
+#, kde-format
+msgid "Icon:"
+msgstr "Icone:"
+
+#: unifiedmailboxmanager.cpp:309
+#, kde-format
+msgid "Inbox"
+msgstr "Cassa de ingresso"
+
+#: unifiedmailboxmanager.cpp:316
+#, kde-format
+msgid "Sent"
+msgstr "Inviate"
+
+#: unifiedmailboxmanager.cpp:323
+#, kde-format
+msgid "Drafts"
+msgstr "Versiones provisori"
diff -Nru kmail-19.04.3/po/ia/kmail.po kmail-19.12.3/po/ia/kmail.po
--- kmail-19.04.3/po/ia/kmail.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/ia/kmail.po	2020-03-03 00:34:05.000000000 +0000
@@ -1,21 +1,21 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# g.sora <g.sora@tiscali.it>, 2010, 2011, 2012, 2013, 2014, 2016.
+# g.sora <g.sora@tiscali.it>, 2010, 2011, 2012, 2013, 2014, 2016, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2016-02-02 13:30+0100\n"
-"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
-"Language-Team: Interlingua <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2020-02-12 13:43+0100\n"
+"Last-Translator: giovanni <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 18.12.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -43,16 +43,12 @@
 "IMAP, POP3 e SMTP."
 
 #: about/introduction_kmail.html:10
-#, fuzzy
-#| msgid ""
-#| "KMail has many powerful features that are described in the <a href='help:/"
-#| "kmail/index.html'>documentation</a>."
 msgid ""
 "KMail has many powerful features that are described in the <a href='help:/"
 "kmail2/index.html'>documentation</a>."
 msgstr ""
 "KMail ha plure characteristicas potente que es describite in le <a "
-"href='help:/kmail/index.html'>documentation</a>."
+"href='help:/kmail2/index.html'>documentation</a>."
 
 #: about/introduction_kmail.html:16
 msgid "Important changes since last version:"
@@ -79,13 +75,11 @@
 
 #: about/introduction_kmail.html:39
 msgid "Thank you,"
-msgstr ""
+msgstr "Gratias,"
 
 #: about/introduction_kmail.html:40
-#, fuzzy
-#| msgid "The KDE Mail Client"
 msgid "The KMail Team"
-msgstr "Le Cliente de E-Posta de KDE"
+msgstr "Le equipa de Kmail"
 
 #: aboutdata.cpp:52
 #, kde-format
@@ -133,10 +127,9 @@
 msgstr "Supporto de PGP 6 e ulterior ampliationes del supporto de cryptation"
 
 #: aboutdata.cpp:162
-#, fuzzy, kde-format
-#| msgid "Original encryption support<br/>PGP 2 and PGP 5 support"
+#, kde-format
 msgid "Original encryption support PGP 2 and PGP 5 support"
-msgstr "Supporto de cryptation original <br/>PGP 2 e supporto PGP 5"
+msgstr "Supporto de cryptation original PGP 2 e supporto PGP 5"
 
 #: aboutdata.cpp:166
 #, kde-format
@@ -189,8 +182,8 @@
 msgstr "Claves de cryptation multiple per adresse"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -201,10 +194,9 @@
 msgstr "Cliente de E-Posta de KDE"
 
 #: aboutdata.cpp:365
-#, fuzzy, kde-format
-#| msgid "Copyright © 1997–2016, KMail authors"
+#, kde-format
 msgid "Copyright © 1997–2019, KMail authors"
-msgstr "Copyright © 1997–2016, autores de KMail"
+msgstr "Copyright © 1997–2019, autores de KMail"
 
 #: collectionpage/collectionmailinglistpage.cpp:51
 #, kde-format
@@ -297,27 +289,27 @@
 "KMail esseva incapace de relevar plenemente un lista de e-posta in iste "
 "dossier. Pro favor tu reimple le adresses per mano."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Usage:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Stato:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% plen"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 de %2  usate"
@@ -340,7 +332,7 @@
 "tu vole associar a iste dossier.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Patronos"
@@ -351,106 +343,106 @@
 msgstr "&Usa patronos de message personalisate in iste dossier"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copia patronos global"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vista"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Usa &icones personalisate"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Non Legite:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Monstra columna de mittente/destinatario in lista de messages"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Mo&nstra columna:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Predefinite"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Mittente"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatario"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Lista de message"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Usa aggregation predefinite"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Aggregation"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Usa thema predefinite"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Thema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Formato predefinite de message"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Prefere HTML a texto"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Prefere texto a HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Usa preferentias global"
@@ -460,137 +452,137 @@
 msgid "Retrieval Options"
 msgstr "Optiones de recuperar"
 
-#: configuredialog/configureaccountpage.cpp:68
-#, fuzzy, kde-format
-#| msgid "&Identity"
+#: configuredialog/configureaccountpage.cpp:69
+#, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
-msgstr "&Identitate"
+msgstr "Identitates"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Il es recipiente"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Il es inviante"
 
-#: configuredialog/configureaccountpage.cpp:87
-#, fuzzy, kde-format
-#| msgid "IMAP server"
+#: configuredialog/configureaccountpage.cpp:88
+#, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
-msgstr "Servitor IMAP"
+msgstr "Servitor LDAP "
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contos de partita (adder al minus uno):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Optiones Commun"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Confirma &ante que inviar"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Verifica orthographia ante que inviar"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Jammais Automaticamente"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Super verificationes de posta manual"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Super verificationes de omne e-postas"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Invia ora"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Invia plus tarde"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Invia  &messages in dossier de partita:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Methodo de invio &predefinite:"
 
-#: configuredialog/configureaccountpage.cpp:220
-#, fuzzy, kde-format
-#| msgid "Add Note..."
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Habilita annullar invio"
+
+#: configuredialog/configureaccountpage.cpp:241
+#, kde-format
 msgid "Add Mail Account..."
-msgstr "Adde nota..."
+msgstr "Adde conto de posta..."
 
-#: configuredialog/configureaccountpage.cpp:221
-#, fuzzy, kde-format
-#| msgid "Customize accounts order..."
+#: configuredialog/configureaccountpage.cpp:242
+#, kde-format
 msgid "Custom Account..."
-msgstr "Personalisa ordine de contos..."
+msgstr "Conto personalisate..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
-#, fuzzy, kde-format
-#| msgid "Could not start the account wizard. Please check your installation."
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
+#, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
 msgstr ""
-"Il non pote initiar le assistente de conto. Pro favor, tu verifica tu "
-"installation."
+"Il non pote initiar le assistente de conto. Pro favor, tu verifica que tu ha "
+"AccountWizard propriemente installate.."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Il non pote initiar assistente de conto"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Include in verificationes de posta manual"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Commuta foras de linea sur clausura de KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Verifica posta quando on initia"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -648,7 +640,7 @@
 msgid "Fixed Width Font"
 msgstr "Font de largessa fixate"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Compositor"
@@ -731,7 +723,7 @@
 #: configuredialog/configureappearancepage.cpp:346
 #, kde-format
 msgid "&Do not change color from original HTML mail"
-msgstr ""
+msgstr "Non mo&difica color ex le e-posta original HTML"
 
 #: configuredialog/configureappearancepage.cpp:361
 #, kde-format
@@ -907,13 +899,12 @@
 #: settings/kmail.kcfg.cmake:88
 #, kde-format
 msgid "Start minimized to tray"
-msgstr ""
+msgstr "Starta minimisate a area de notification"
 
 #: configuredialog/configureappearancepage.cpp:893
-#, fuzzy, kde-format
-#| msgid "Show unread mail in system tray"
+#, kde-format
 msgid "Show unread email in Taskbar"
-msgstr "Monstra message de e-posta non legite in tabuliero de systema"
+msgstr "Monstra message de e-posta non legite in le barra de cargas"
 
 #: configuredialog/configureappearancepage.cpp:964
 #, kde-format
@@ -957,61 +948,61 @@
 msgstr ""
 "On non pote crear un etiquetta. Un etiquetta con le mesme nomine ja existe."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "General"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Patronos Standard"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Patronos personalisate"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Subjecto"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Insimul de Characteres"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Capites"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Attachamentos"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autocorrection"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Redimensiona automaticamente image"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signatura"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1020,12 +1011,12 @@
 "Inserta automaticamente le signatura configurate\n"
 "quando on initia componer un message"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Inserta le signatura supra ulle texto citate"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1034,18 +1025,18 @@
 "Inserta le separator de signatura in conformitate con RFC\n"
 "(duo lineettas e un spatio sur un linea) ante le signatura"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Quando on responde, non cita ulle signatura existente"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formato"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1056,7 +1047,7 @@
 "( in vice del message complete), si\n"
 "on ha texto selectionate in le fenestra de message."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1067,17 +1058,17 @@
 "citate anque quando le linea esseva create per adder un interruption de \n"
 "linea additional durante que il faceva un excision de parola in le texto."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Habilita excision de parola automatic al specificate largessa"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Fixa le largessa de texto pro excision automatic de parola"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1088,7 +1079,7 @@
 " in le formato original que il esseva recipite.\n"
 "Si non marcate, il respondera per definition como texto plan."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1098,34 +1089,34 @@
 "Da forma al parte de texto plan de un message ex le marcation HTML.\n"
 "On supporta texto Grasse, Italic e Sublineate, listas e referentias externe."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Incorporate (In linea)"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Como attachamento"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Fixa le formato predefinite del message expedite"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Typo per reexpedir predefinite:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1136,17 +1127,17 @@
 "Tu pote seliger isto pro un selection per cata-message per usar \"Optiones-"
 "Require Notification de disposition\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Avisar si nimie de destinatarios es specificate"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Fixa le numero maxime de destinatarios del aviso"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1166,7 +1157,7 @@
 "non\n"
 "ttene conto de listas de distribution o de listas de e-posta."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1175,18 +1166,18 @@
 "Memora adresses recentemente insertate,\n"
 "e offere lor pro completion de destinatario"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Necun salvamento"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Maxime adresses recente retenite:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1195,24 +1186,23 @@
 "Le maxime numero de adresses insertate recentemente que\n"
 "essera memorate pro completion"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configura completamento..."
 
-#: configuredialog/configurecomposerpage.cpp:445
-#, fuzzy, kde-format
-#| msgid "No autosave"
+#: configuredialog/configurecomposerpage.cpp:447
+#, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
-msgstr "Necun salvamento de modo automatic"
+msgstr "Salvamento de modo automatic"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Necun salvamento de modo automatic"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1220,18 +1210,18 @@
 msgstr[0] " minuta"
 msgstr[1] " minutas"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Salveguarda automaticamente le message a iste intervallo specificate"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefixos de Subjecto de Respon&sa"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1240,59 +1230,59 @@
 "Recognosce omne sequentia del prefixos sequente\n"
 "(entratas es  expressiones regular non sensibile a caso):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "A&dde..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Re&move"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mod&ifica..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Inserta nove prefixo de responsa:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefixos del subjecto de invio a&vante"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Adde..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Remo&ve"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Inserta nove prefixo de reexpedir:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1302,90 +1292,91 @@
 "pro le insimul de character que contine omne characteres requirite."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Inserta insimul de characteres:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Mantene insimul original de character quando on responde o reexpedi (si "
 "possibile)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Iste insimul de character non es supportate"
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Usa suffixo de message-id personalisate"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Suffixo personalisate de message-&id:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Defini campos de capite de mime personalisate:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nomine"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valor"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&ve"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nomine:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
+"'Content-Type' non es un catena autorisate.Iste capite non essera "
+"salveguardate. "
 
-#: configuredialog/configurecomposerpage.cpp:1084
-#, fuzzy, kde-format
-#| msgid "Invalid Email Address"
+#: configuredialog/configurecomposerpage.cpp:1086
+#, kde-format
 msgid "Invalid header"
-msgstr "Adresse de e-posta invalide"
+msgstr "Capite invalide"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nominar attachamento de modo compatibile con Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1394,41 +1385,40 @@
 "Activa iste option pro facer que Outlook(tm) pote comprender nomines "
 "continente characteres non-anglese"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Ha&bilita detection de attachamento mancante"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Recognosce omne del sequente parolas clave como intention de attachar un "
 "file:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Inserta nove parola clave:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
-#, fuzzy, kde-format
-#| msgid "Attachment:"
+#: configuredialog/configurecomposerpage.cpp:1167
+#, kde-format
 msgid "Maximum Attachment Size:"
-msgstr "Attachamento:"
+msgstr "Grandor de attachamento maxime:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Necun limite"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1474,68 +1464,59 @@
 msgstr "Imprimente"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:189
-#, fuzzy, kde-format
-#| msgid "Ask Before Sending"
+#, kde-format
 msgid "Check Before Send Plugins"
-msgstr "Demanda ante inviar"
+msgstr "Pliugins de verifica ante inviar"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:196
-#, fuzzy, kde-format
-#| msgid "Composer"
+#, kde-format
 msgid "Composer Plugins"
-msgstr "Compositor"
+msgstr "Plugins de Compositor"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:202
-#, fuzzy, kde-format
-#| msgid "Ask Before Sending"
+#, kde-format
 msgid "Grammar Checker Plugins"
-msgstr "Demanda ante inviar"
+msgstr "Plugins de Verificator de grammatica"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:212
-#, fuzzy, kde-format
-#| msgid "Composer"
+#, kde-format
 msgid "Tools Plugins"
-msgstr "Compositor"
+msgstr "Plugins de instrumentos"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:219
-#, fuzzy, kde-format
-#| msgid "Composer"
+#, kde-format
 msgid "Editor Plugins"
-msgstr "Compositor"
+msgstr "Plugins de editor"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:227
-#, fuzzy, kde-format
-#| msgid "Message Window"
+#, kde-format
 msgid "Message Viewer"
-msgstr "Fenestra de message"
+msgstr "Visor de Message"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:235
 #, kde-format
 msgid "Webengine Plugins"
-msgstr ""
+msgstr "Plugins de Webengine"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:243
-#, fuzzy, kde-format
-#| msgid "Ask Before Sending"
+#, kde-format
 msgid "Header Style Plugins"
-msgstr "Demanda ante inviar"
+msgstr "Plugins de stilo de capite"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
-#, fuzzy, kde-format
-#| msgid "Composer"
-msgid "Convertor Text Plugins"
-msgstr "Compositor"
+#, kde-format
+msgid "Text Conversion Plugins"
+msgstr "Plugins de conversion de texto"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
 msgid "Misc"
-msgstr ""
+msgstr "Misc"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:279
-#, fuzzy, kde-format
-#| msgid "Akonadi Id:"
+#, kde-format
 msgid "Akonadi Agents"
-msgstr "Id de Akonadi:"
+msgstr "Agentes de Akonadi:"
 
 #: configuredialog/configuresecuritypage.cpp:55
 #, kde-format
@@ -1568,9 +1549,7 @@
 msgstr "Adresse de E-Posta:"
 
 #: configuredialog/configuresecuritypage.cpp:129
-#, fuzzy, kde-format
-#| msgid ""
-#| "Changing the global HTML setting will override all folder specific values."
+#, kde-format
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
@@ -1595,11 +1574,13 @@
 "The module is missing. Please verify your installation. This module is "
 "provided by Kleopatra."
 msgstr ""
+"Le modulo es mancante. Pro favor tu verifica tu installation. Iste modulo es "
+"fornite per Kleopatra."
 
 #: configuredialog/configuresecuritypage.cpp:378
 #, kde-format
 msgid "GnuPG Configure Module Error"
-msgstr ""
+msgstr "Error de modulo de configurar de GnuGPG"
 
 #: configuredialog/configuresecuritypage.cpp:448
 #, kde-format
@@ -1639,7 +1620,7 @@
 msgid "Archive Folder"
 msgstr "Dossier de Archivo"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1705,19 +1686,19 @@
 msgid "Notification"
 msgstr "Notification"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 attachamento (%2)"
 msgstr[1] "%1 attachamentos (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Cela lista de attachamento"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Monstra lista de attachamento"
@@ -1734,335 +1715,333 @@
 msgid "Encoding"
 msgstr "Codifica"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Selige un dictionario de usar quando on fa controlo orthographic super iste "
 "message"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Selige le dossier de e-posta inviate ubi un copia de iste message essera "
 "salvate."
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Selige le conto de partita de usar pro inviar iste message"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Fixa le adresse de e-posta \"Ex:\" pro iste message"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Fixa un Subjecto pro iste message"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitate:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Dictionario:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "&Dossier de posta inviate:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Transporto de E-Posta:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Ex:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "S&ubjecto:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Invia posta"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Invia posta via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Invia"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Invia plus &tarde"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Invia &plus tarde via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Cauda"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Salveguarda como &Version Provisori"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Salveguarda message de e-posta in un dossier de Minuta o Schizzo"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Salveguarda como &Patrono"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Salveguarda message de e-posta in un dossier Patrono"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Salveguarda como &File"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Salveguarda message de e-posta como file de texto o file html "
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "I&nserta file de texto..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Inserta file de texto recente"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adressario"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Aperi adressario"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nove compositor"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Selige  &Destinatarios..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Salveguarda Lista de &Distribution..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Colla como Attac&hamento"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "N&etta Spatios"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Usa Font Fi&xate"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgente"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Require Notification de Disposition"
 
-#: editor/kmcomposerwin.cpp:1172
-#, fuzzy, kde-format
-#| msgid "&Request Disposition Notification"
+#: editor/kmcomposerwin.cpp:1234
+#, kde-format
 msgid "&Request Delivery Confirmation"
-msgstr "&Require Notification de Disposition"
+msgstr "&Require Notification de Livration"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Excision de Parola"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Fragmentos"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Controlo Orthographic &Authomatic"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Modifica de Rich text"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rich Text"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Commuta modo de modifica de rich text"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Omne campos"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitate"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Dictionario"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Dossier de posta inviate"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Transporto de E-Posta"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Ex"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "S&ubjecto"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Adjunge S&ignatura"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Ant&epone Signatura"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Inserta signatura a position de c&ursor"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Corrector &Orthographic..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Corrector Orthographic"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Crypta message"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Crypta"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Signa message"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signa"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Formato de message cr&yptographic"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Selige un formato cryptographic pro iste message"
 
-#: editor/kmcomposerwin.cpp:1298
-#, fuzzy, kde-format
-#| msgid "Add Followup Reminder..."
+#: editor/kmcomposerwin.cpp:1360
+#, kde-format
 msgid "Create Follow Up Reminder..."
-msgstr "Adde memorar de continuation..."
+msgstr "Crea memorar de continuation..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configura KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2071,53 +2050,53 @@
 "<qt>Isto celera completemente le barra de menu. Tu pote monstrar lo de nove "
 "per typar %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Cela barra de menu"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr "Linea: %1"
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr "Columna: %1"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Controlo Orthographic:  active"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Controlo Orthographic:  Non active"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Salvegua&rda de nove como Patrono"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Salveguarda como Version Provisori"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2126,7 +2105,7 @@
 "Re-salveguardar iste message in le dossier de Patrono. Il potera esser usate "
 "plus tarde."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2135,83 +2114,82 @@
 "Salveguarda iste message in le dossier de version provisori. Il potera esser "
 "modificate e inviate plus tarde."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Tu vole salveguardar le message pro postea o tu lo abandona?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Claude  Compositor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Salveguardar  automatic de Message fallite"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Invio de Message fallite"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Inserta file"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Adde como Image &Includite"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Adde como &Attachamento"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nomine del attachamento:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
-msgstr ""
+msgstr "Nomine de attachamento non pote esser vacue"
 
-#: editor/kmcomposerwin.cpp:2110
-#, fuzzy, kde-format
-#| msgid "Invalid Email Address"
+#: editor/kmcomposerwin.cpp:2179
+#, kde-format
 msgid "Invalid Attachment Name"
-msgstr "Adresse de e-posta invalide"
+msgstr "Nomine de attachamento invalide"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Adde URL al message"
 msgstr[1] "Adde URLs al message"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Adde File como &Attachamento"
 msgstr[1] "Adde files como &Attachamentos"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Inserta texto de area de transferentia como attachamento"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "Sin nomine"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2224,12 +2202,12 @@
 "MIME) de usar se.</p><p>Pro favor tu selige le clave(s) de usar in le "
 "configuration de identitate.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Clave de Cryptar non definite"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2240,12 +2218,12 @@
 "de signatura (OpenPGP o S/MIME) de usar se,</p><p>Pro favor tu selige le "
 "clave de usar in le configuration de identitate.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Clave de Signatura non definite"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2256,7 +2234,7 @@
 "fixar tu adresse de e-posta pro omne identitate, assi que tu non debe "
 "insertar lo pro cata message."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2265,37 +2243,37 @@
 "Tu debe specificar al minus un destinatario, o in le campo A: o como CC o "
 "como BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "A: campo vacue. Tu vole inviar le message  de omne modo?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Il non specificava alcun A:"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Tu non specificava un subjecto. Inviar message de omne modo?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Necun subjecto specificate"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Invi&a  como es"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Specifica  le Subjecto"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2304,22 +2282,22 @@
 "Tu debe specificar al minus un destinatario pro poter cryptar un version "
 "provisori."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Re como inviar e-posta..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Invia confirmation"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Invia ora"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2328,22 +2306,22 @@
 "Tu es cercante de inviar un e-posta a plus que %1 destinatarios. Inviar "
 "messages de omne modo?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Nimie destinatarios"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Invia  como es"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Modifica  Destinatarios"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2352,55 +2330,63 @@
 "De-activar modo HTML facera assi que le texto perdera le formattation. Tu es "
 "secur?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Perde  le composition (formatting)?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perde  le composition (formatting)"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Adde Texto de Plan Marcation (Markup Plain Text) "
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
+"Alte nivello de cryptation essera usate per iste recipiente (le clave de "
+"cryptation es plenemente fidate). Pulsa le icone per detalios."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
+"Medie nivello de cryptation essera usate per iste recipiente (le clave de "
+"cryptation es marginalmente fidate). Pulsa le icone per detalios."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
+"Basse nivello de cryptation essera usate per iste recipiente (le clave de "
+"cryptation es non fidate). Pulsa le icone per detalios."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
 "encryption is unknown (the encryption key could not be verified). Click the "
 "icon for details."
 msgstr ""
+"Le message de e-posta de este destinatario essera cryptate, ma le securitate "
+"del cryptation es incognite /le clave de cryptation non poteva eser "
+"verificate). Pulsa sur le cone per detalios."
 
-#: editor/kmcomposerwin.cpp:3636
-#, fuzzy, kde-format
-#| msgid "Sending Without Confirmation"
+#: editor/kmcomposerwin.cpp:3735
+#, kde-format
 msgid "Plugin Editor Information"
-msgstr "Invia sin confirmation"
+msgstr "Information de editor de plugin"
 
 #: editor/potentialphishingemail/potentialphishingdetaildialog.cpp:33
 #, kde-format
@@ -2474,39 +2460,38 @@
 msgid "External editor was started."
 msgstr "Editor externe esseva startate."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
+"Il non trovava le transporto. Pro favor tu verifica que tu usara le correcte "
+"transporto de e-posta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
-#, fuzzy, kde-format
-#| msgid "Archive folder not defined. Please verify settings for account %1"
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
-"Dossier de archivo non definite. Pro favor verifica le preferentias de conto "
-"%1"
+"Dossier inviate non definite. Pro favor fixa lo ante que inviar le message "
+"de e-posta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
-#, fuzzy, kde-format
-#| msgid "Archive folder not defined. Please verify settings for account %1"
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
+#, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
-"Dossier de archivo non definite. Pro favor verifica le preferentias de conto "
-"%1"
+"Identitate non esseva trovate. Pro favor tu verifica que tu usara le "
+"identitate correcte."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
-#, fuzzy, kde-format
-#| msgid "Archive folder not defined. Please verify settings for account %1"
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
+#, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
 "dictionary."
 msgstr ""
-"Dossier de archivo non definite. Pro favor verifica le preferentias de conto "
-"%1"
+"Dictionario non trovate Pro favor verifica que tu usara un dictionario "
+"correcte."
 
 #: editor/widgets/cryptostateindicatorwidget.cpp:93
 #, kde-format
@@ -2528,11 +2513,6 @@
 msgid "Message will not be encrypted"
 msgstr "Message non essera cryptate"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Fragmentos de texto"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2568,40 +2548,38 @@
 msgstr "Lista de collection es vacue. %1"
 
 #: folderarchive/folderarchiveagentjob.cpp:105
-#, fuzzy, kde-format
-#| msgid "Archive folder not defined. Please verify settings for account %1"
+#, kde-format
 msgid ""
 "This folder %1 is read only. Please verify the configuration of account %2"
 msgstr ""
-"Dossier de archivo non definite. Pro favor verifica le preferentias de conto "
-"%1"
+"Dossier %1 de sol lettura. Pro favor verifica le configuration de conto %2"
 
 #: folderarchive/folderarchiveagentjob.cpp:117
 #, kde-format
 msgid "Cannot move messages."
 msgstr "Il non pote mover message."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Incapace trovar dossier. Error reportate: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Il retornava nulle dossier."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Incapace trovar dossier genitor. Il reportava error: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Incapace retornar lista de dossieres."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Messages archivate"
@@ -2642,49 +2620,48 @@
 msgid "&Existing identities:"
 msgstr "Identitates &Existente:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
-msgstr ""
+msgstr "Error quando il generava nove par de clave: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
-msgstr ""
+msgstr "Error de generation de clave"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
-msgstr ""
+msgstr "Necun clave"
 
-#: identity/identitydialog.cpp:248
-#, fuzzy, kde-format
-#| msgid "Enter new key word:"
+#: identity/identitydialog.cpp:247
+#, kde-format
 msgid "Generate a new key pair"
-msgstr "Inserta nove parola clave:"
+msgstr "Genera un nove copula de clave"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
-msgstr ""
+msgstr "Generante nove copula de clave..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Modifica Identitate"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "General"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Tu nomine:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2696,28 +2673,28 @@
 "vacue tu ver nomine non apparera, solmente le adresse de e-posta apparera.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zation:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
 "organization if you would like it to be shown in the email header that is "
 "sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
-"<qt><h3>Organization</h3><p>Iste campo deberea haber le nomine de tu "
+"<qt><h3>Organisation</h3><p>Iste campo deberea haber le nomine de tu "
 "organization si tu placerea que illo es monstrate in le capite de e-posta "
 "que il es inviate.</p><p>Il es secur (e normal) lassar lo vacue</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Adresse de &E-Posta:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2733,12 +2710,12 @@
 "campo vacue, o tu lo mitte errate, altere personas habera problemas quando "
 "illos te respondera.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Pseudon&ymos de e-posta"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2755,19 +2732,13 @@
 "td><tr><tr><th>Aliases:</th><td>prime@exemplo.org<br>ultime@exemplo.org</"
 "td></tr></table><p>Tu typa un adresse de alias per linea.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Cryptographia"
 
-#: identity/identitydialog.cpp:392
-#, fuzzy, kde-format
-#| msgid ""
-#| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
-#| "messages. You can also use GnuPG keys.</p><p>You can leave this blank, "
-#| "but KMail will not be able to digitally sign emails using OpenPGP; normal "
-#| "mail functions will not be affected.</p><p>You can find out more about "
-#| "keys at <a>http://www.gnupg.org</a></p></qt>"
+#: identity/identitydialog.cpp:391
+#, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
 "messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
@@ -2779,22 +2750,15 @@
 "digitalmente messages. Tu anque pote usar claves de GNUPG. </p><p>Tu pote "
 "lassar lo vacue, ma KMail non essera capace de signar digitalmente e-postas "
 "usante  OpenPGP; functiones de posta normal non essera influentiate.</p><p> "
-"Tu pote trovar altere re claves a <a>http://www.gnupg.org</a></p></qt>"
+"Tu pote trovar altere cosas re claves a <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Clave de signatura de OpenPGP:"
 
-#: identity/identitydialog.cpp:409
-#, fuzzy, kde-format
-#| msgid ""
-#| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
-#| "to yourself and for the \"Attach My Public Key\" feature in the composer. "
-#| "You can also use GnuPG keys.</p><p>You can leave this blank, but KMail "
-#| "will not be able to encrypt copies of outgoing messages to you using "
-#| "OpenPGP; normal mail functions will not be affected.</p><p>You can find "
-#| "out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+#: identity/identitydialog.cpp:408
+#, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
 "yourself and for the \"Attach My Public Key\" feature in the composer. You "
@@ -2808,15 +2772,15 @@
 "\" in le compositor. Tu anque pote usar claves de GnuPG.  </p><p> Tu pote "
 "lassar lo vacue, ma KMail non essera capace de cryptar copias de messages de "
 "partita a te per usar OpenPGP;  normal functiones de e-posta non essera "
-"influentiate.</p><p> Tu pote saper altere super claves a <a>http://www.gnupg."
-"org</a></p></qt>"
+"influentiate.</p><p> Tu pote saper altere cosas re claves a <a>https://www."
+"gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Clave de cryptation de OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2829,12 +2793,12 @@
 "essera capace de signar digitalmente tu e-postas usante S/MIME; normal "
 "functiones non essera influentiate.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificato de signatura de S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2849,40 +2813,39 @@
 "cryptar copias de messages de partita a te usante S/MIME; functiones normal "
 "de e-posta non essera influentiate.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificato de Cryptation de S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Formato preferite:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Signa automaticamente messages"
 
-#: identity/identitydialog.cpp:485
-#, fuzzy, kde-format
-#| msgid "Automatically encrypt &messages whenever possible"
+#: identity/identitydialog.cpp:484
+#, kde-format
 msgid "Automatically encrypt messages when possible"
-msgstr "Crypta automaticamente &messages quando il es possibile"
+msgstr "Crypta automaticamente messages quando il es possibile"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Adresse de &Responder-A:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2900,12 +2863,12 @@
 "a un gruppo de adresse.</p><p>Si tu dubita, tu lassa iste campo vacue.</p></"
 "qt> "
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adresses &CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2922,12 +2885,12 @@
 "adresse, tu usa virgulas pro separar le lista de destinatarios CC.</p><p>Si "
 "tu dubita, tu lassa iste campo vacue.</p></qt> "
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Adresses &BCC:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2945,57 +2908,57 @@
 "adresse, tu usa virgulas pro separar le lista de destinatarios BCC.</p><p>Si "
 "tu dubita, tu lassa iste campo vacue.</p></qt> "
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&ictionario:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Dossier de posta inviate:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Dossier de &Version Provisori:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Dossier de &Patronos:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Conto de exito:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Attacha mi vCard a message"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Crea..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Linguage de Autocorrection"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Restabili nomine de dominio predefini&e:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Dominio predefini&te:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3004,33 +2967,33 @@
 "<qt><p>Le dominio predefinite es usate pro completar adresses de e-posta que "
 "solmente consiste del nomine de usator.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Usa patronos de message personalisate pro iste identitate"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signatura"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Photo"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Alias de E-Posta invalide \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Adresse de e-posta invalide"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3043,7 +3006,7 @@
 "Isto pote originar messages de aviso sur le parte recipente quando on cerca "
 "de verificar signaturas facite con iste configuration."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3052,7 +3015,7 @@
 "Uno del claves de cryptation de OpenPGP configurate non contine alcun ID de "
 "usator con le configurate adresse de e-posta pro iste identitate (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3065,7 +3028,7 @@
 "Isto pote originar messages de aviso sur le parte recipente quando on cerca "
 "de verificar signaturas facite con iste configuration."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3074,34 +3037,31 @@
 "Uno del configurate certificatos de cryption S/MIME non contine le adresse "
 "de e-posta configurate pro iste identitate (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Adresse de e-posta non trovate in Clave/Certificatos"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Le file de signatura non es valide"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Edita identitate \"%1\""
 
-#: identity/identitydialog.cpp:933
-#, fuzzy, kde-format
-#| msgid ""
-#| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
-#| "therefore, the default drafts folder will be used."
+#: identity/identitydialog.cpp:932
+#, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
-"Le dossier de version provisori personalisate pro identitate \"%1\" non "
-"existe (plus), on usara le dossier de version provisori predefinite."
+"Alcun dossier personalisate per identitate non existe (plus), assi on usara "
+"le dossier predefinite."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Editar ..."
@@ -3117,8 +3077,7 @@
 msgstr "Dele vCard currente"
 
 #: identity/identityeditvcarddialog.cpp:71
-#, fuzzy, kde-format
-#| msgid "Are you sure to want to delete this vCard?"
+#, kde-format
 msgid "Are you sure you want to delete this vCard?"
 msgstr "Tu es secur que tu vole deler iste vCard?"
 
@@ -3133,6 +3092,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Nos non pote deler file de vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Tu vermente vole cancellar?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmation"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3289,18 +3260,15 @@
 msgstr "Usa iste campo per insertar un catena arbitrari de X-Face."
 
 #: identity/xfaceconfigurator.cpp:166
-#, fuzzy, kde-format
-#| msgid ""
-#| "Examples are available at <a href=\"http://ace.home.xs4all.nl/X-Faces/"
-#| "\">http://ace.home.xs4all.nl/X-Faces/</a>."
+#, kde-format
 msgid ""
 "Examples are available at <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
-"Exemplos es disponibile a <a href=\"http://ace.home.xs4all.nl/X-Faces/"
-"\">http://ace.home.xs4all.nl/X-Faces/</a>."
+"Exemplos es disponibile a <a href=\"https://ace.home.xs4all.nl/X-Faces/"
+"\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Imagine"
@@ -3334,7 +3302,7 @@
 msgstr[1] ""
 "Listas de distribution \"%2\" es vacue, illos non poteva esser usate."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Adde al adressario"
@@ -3344,22 +3312,22 @@
 msgid "Contact created successfully"
 msgstr "Messages create con successo."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Contacto non pote esser immagasinate: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Il falleva immagasinar contacto"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Tu es secur que tu vole attachar iste dossier \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Attacha dossier"
@@ -3453,10 +3421,9 @@
 
 #: job/removeduplicatemailjob.cpp:77
 #: job/removeduplicatemessageinfolderandsubfolderjob.cpp:100
-#, fuzzy, kde-format
-#| msgid "Error while removing duplicates"
+#, kde-format
 msgid "Error occurred during removing duplicate emails: '%1'"
-msgstr "Error durante que on removeva duplicatos"
+msgstr "Error durante que on removeva duplicatos: '%1'"
 
 #: job/removeduplicatemailjob.cpp:77
 #: job/removeduplicatemessageinfolderandsubfolderjob.cpp:100
@@ -3520,10 +3487,9 @@
 msgstr "Solmente aperi fenestra de compositor"
 
 #: kmail_options.h:55
-#, fuzzy, kde-format
-#| msgid "Set Identity To"
+#, kde-format
 msgid "Set identity"
-msgstr "Fixar Identitate A"
+msgstr "Fixar Identitate"
 
 #: kmail_options.h:59
 #, kde-format
@@ -3573,20 +3539,18 @@
 msgstr "Dossi&er"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
-#, fuzzy, kde-format
-#| msgid "Appl&y All Filters On Folder"
+#, kde-format
 msgid "Apply Filters on Folder"
-msgstr "Appl&ica  omne filtros sur dossier"
+msgstr "Applica  filtros sur dossier"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
-#, fuzzy, kde-format
-#| msgid "Remove Duplicates in This Folder and All its Subfolder"
+#, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
-msgstr "Remove duplicationes in iste dossier e in omne su sub-dossieres"
+msgstr "Applica filtros sur dossieres e sur omne su sub-dossieres"
 
 #. i18n: ectx: Menu (message)
 #. i18n: ectx: Menu (file)
@@ -3608,7 +3572,7 @@
 msgstr "&Reexpedir"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&pplica Filtro"
@@ -3633,7 +3597,7 @@
 msgstr "Ad&juta"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barra de instrumento principal"
@@ -3651,10 +3615,9 @@
 msgstr[1] "Pro favor tu attende durante que le %1 messages es transferite"
 
 #: kmcommands.cpp:524
-#, fuzzy, kde-format
-#| msgid "Save to File"
+#, kde-format
 msgid "Save To File"
-msgstr "Salveguarda al File"
+msgstr "Salveguarda a File"
 
 #: kmcommands.cpp:544
 #, kde-kuit-format
@@ -3678,22 +3641,21 @@
 msgstr "Aperi Message"
 
 #: kmcommands.cpp:733
-#, fuzzy, kde-format
-#| msgid "&Message"
+#, kde-format
 msgid "Message"
-msgstr "&Message"
+msgstr "Message"
 
 #: kmcommands.cpp:766
 #, kde-format
 msgid "The file does not contain a message."
 msgstr "Le file non contine alcun message."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Le file contine plure de messages. Solo le prime es monstrate. "
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3702,32 +3664,32 @@
 "Tu vole reexpedir le messages seligite como attachamento in un message (como "
 "un compendio de MIME) o como messages individual?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Invia un Compendio (Digest)"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Invia individualmente"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrante messages"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrante messages %1 de %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Movente Messages"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Delente messages"
@@ -3756,30 +3718,28 @@
 msgid "Text Direction Toolbar"
 msgstr "Barra de Instrumento de direction de texto"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "Kmal es fixate de modo foras de linea; omne labores de rete es suspendite"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
-#, fuzzy, kde-format
-#| msgid "&Send Mail"
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
+#, kde-format
 msgid "Send Email"
-msgstr "&Invia posta"
+msgstr "Invia e-posta"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
-#, fuzzy, kde-format
-#| msgid "About to send email..."
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
+#, kde-format
 msgid "Impossible to send email"
-msgstr "Re como inviar e-posta..."
+msgstr "Impossibile  inviar e-posta"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "Kmal es fixate de modo in linea; omne labores de rete es recuperate"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3788,37 +3748,37 @@
 "Kmal es fixate de modo in linea; omne labores de rete es recuperate quando "
 "un connexion es relevate"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "Kmail currentemente es in modo foras de linea. Como tu vole proceder?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "In linea/ Foras de Linea"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Travaliar in linea"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Travaliar Foras de linea"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Connexion de rete relevate; omne labores de rete es recuperate"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Nulle connexion de rete relevate; omne labores de rete es recuperate"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3827,12 +3787,12 @@
 "Il falleva a aperir file de salveguardar automatic a %1.\n"
 "Motivation: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Il falleva a aperir file de salveguardar automatic"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3842,7 +3802,7 @@
 msgstr[1] ""
 "Iste %1 identitates ha essite cambiate pro usar le transporto predefinite:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3852,164 +3812,165 @@
 msgstr[1] ""
 "Iste %1 identitates ha essite cambiate pro usar le transporto modificate:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Inviante messages"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Il es initiante a inviar processo..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Ressource %1 es rupte."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Ressource %1 es rupte.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Agente de e-posta de archivar non esseva registrate."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Agente de inviar plus tarde non esseva registrate."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Agente de rememorar de continuation non esseva registrate."
 
-#: kmlaunchexternalcomponent.cpp:81
-#, fuzzy, kde-format
-#| msgid "Could not start certificate manager; please check your installation."
+#: kmlaunchexternalcomponent.cpp:79
+#, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
 "properly installed."
 msgstr ""
 "Il non pote initiar gestion de certificato; pro favor tu verifica tu "
-"installation."
+"haKleopatra propriemente installate."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Error de KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
-#, fuzzy, kde-format
-#| msgid "Could not start the import wizard. Please check your installation."
+#: kmlaunchexternalcomponent.cpp:89
+#, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
-"Il non pote initiar le assistente de importation. Pro favor, tu verifica tu "
-"installation."
+"Il non pote initiar le assistente de importation. Pro favor, tu verifica que "
+"tu ha ImportWizard propriemente installate."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Il non pote initiar assistente de importation"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Il non pote initiar programma \"PIM Setting Exporter\" (exportator de "
-"preferentias de PIM). Pro favor, tu verifica tu installation."
+"Il non pote initiar programma \"PIM Data Exporter\" (exportator de datos de "
+"PIM). Pro favor, tu verifica tu installation."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr ""
-"Il non pote initiar programma \"PIM Setting Exporter\"(Exportator de "
-"preferentias de PIM)"
+"Incapace a initiar programma \"PIM Data Exporter\"(Exportator de datoss de "
+"PIM)"
 
-#: kmlaunchexternalcomponent.cpp:117
-#, fuzzy, kde-format
-#| msgid "Could not start the ImportWizard. Please check your installation."
+#: kmlaunchexternalcomponent.cpp:115
+#, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
-"Il non pote initiar le assistente de importation. Pro favor, tu verifica tu "
-"installation."
+"Il non pote initiar le assistente de importation ImportWizard. Pro favor, tu "
+"verifica tu ha propriemente installate ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Il non pote initiar assistente de importation"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Un altere agente de e-posta esseva trovate in le systema. Tu vole importar "
 "datos ex illo?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Il non pote initiar le assistente de importation. Pro favor, tu verifica tu "
 "installation."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Necun subjecto"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(necun patronos)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Iste dossier non ha fixate alcun option de termination "
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Tu es secur que tu vole expirar (terminar) le dossier <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Expira dossier"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Expira"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Vacua Corbe"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Move al Corbe"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Tu es secur que tu vole vacuar le dossier de corbe?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4018,27 +3979,27 @@
 "<qt>Tu es secur que tu vole mover omne messages ex dossier <b> %1</b>al "
 "corbe?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Movite omne messages al corbe"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Tu es secur que tu vole expirar vetere messages?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Expira vetere messages?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Expira"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4049,17 +4010,17 @@
 "\"spam\" e pote augmentar le probabilitate que tu systema essera "
 "compromittite per altere, presente e futur, exploitationes de securitate."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Advertimento de securitate"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Carga referentias externe"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4074,536 +4035,531 @@
 "<qt>Tu realmente vole deler le seligite messages %1?><br /> Un vice delite, "
 "illos non pote plus esser restituite.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Dele messages"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Dele Messages"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Movente Messages..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Delente messages..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Messages delite con successo."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Messages movite con successo"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Il falleva a deler messages"
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Cancellate le operation de deler le messages"
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Il falleva a mover le messages"
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Cancellate le operation de mover message"
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Mover messages a dossier"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Copiante Messages..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Messages copiate con successo."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Il falleva a copiar messages."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Cancellate le operation de copiar messages."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copia Messages a Dossier"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Movente messages a corbe..."
 
-#: kmmainwidget.cpp:1876
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash..."
+#: kmmainwidget.cpp:1883
+#, kde-format
 msgid "Deleting and moving messages to trash..."
-msgstr "Movente messages a corbe..."
+msgstr "Delente e Movente messages a corbe..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Messages movite a corbe con successo."
 
-#: kmmainwidget.cpp:1896
-#, fuzzy, kde-format
-#| msgid "Messages moved to trash successfully."
+#: kmmainwidget.cpp:1903
+#, kde-format
 msgid "Messages moved to trash or deleted successfully"
-msgstr "Messages movite a corbe con successo."
+msgstr "Messages movite a corbe o delite  con successo."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Il falleva a mover messages a corbe."
 
-#: kmmainwidget.cpp:1909
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash failed."
+#: kmmainwidget.cpp:1916
+#, kde-format
 msgid "Deleting or moving messages to trash failed."
-msgstr "Il falleva a mover messages a corbe."
+msgstr "Il falleva a deler o a mover messages a corbe."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Cancellate le operation de mover message a corbe."
 
-#: kmmainwidget.cpp:1922
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash canceled."
+#: kmmainwidget.cpp:1929
+#, kde-format
 msgid "Deleting or moving messages to trash canceled."
-msgstr "Cancellate le operation de mover message a corbe."
+msgstr "Cancellate le operation de deler o mover messages a corbe."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Salta a dossier"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "S&alveguarda como ..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Expira omne dossieres"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Verifica &Posta"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Verifica posta in ingresso"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Verifica posta"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Invia messages in cauda"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Stato de in linea (incognite)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Invia messages in cauda via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gerente de certificato"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importa messages..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Cribra cribro (Sieve)..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visor de &registro de filtro..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importa ex un altere cliente de e-posta..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Edita responsas de \"Foras de Officio\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configura  Archivar automaticamente..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Messages retardate..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Messages de rememorar de continuation..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Dele"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "M&ove topico a Corbe"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Move topico a corbe"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Dele t&opico"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Trova messages..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Selige &omne messages"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Gestion de lista de Posta..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Assigna via breve..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Preferentias de expiration"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Archiva dossier..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Carga referentias e&xterne"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copia message a..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Move message a..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nove message..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nove"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Message ab &Patrono"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nove message &a ista de posta..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Crea filtro"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtro super &subjecto..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtro super &Ex .."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtro super &A..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtro super &Cc..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marca &Topico"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marca topico como &legite"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marca omne messages in le topico seligite como legite"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marca topico como &non legite"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marcar omne messages in le topico seligite como non legite"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marca topico como &importante"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Remove marca de topico &importante"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marca topico como elemento de &action"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Remove marca de topico como elemento de &action"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Observa topico"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignora topico"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Salveguarda A&ttachamentos..."
 
-#: kmmainwidget.cpp:3186
-#, fuzzy, kde-format
-#| msgid "Copy Item To..."
+#: kmmainwidget.cpp:3193
+#, kde-format
 msgid "Copy Decrypted To..."
-msgstr "Copia elemento in..."
+msgstr "Copia elemento decryptate in..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Appl&ica  omne filtros"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expande topico/gruppo"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expande le topico o gruppo currente"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Plica topico / gruppo "
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Plica le topico o gruppo currente"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "E&xpande omne topicos"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expande  omne topicos in le dossier currente"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Plica  &omne topicos"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Plica  omne topicos in le dossier currente"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Monstra message"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Proxime &message"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Vade a proxime message"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Proxime message &non legite"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Proxime"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Vade  a proxime message non legite"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Previe message"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Vade a previe message"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Previe message non &legite"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Previe"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Vade a previe message non legite"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Proxime &dossier non legite"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Vade a proxime dossier con messages non legite"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Previe d&ossier non legite"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Vade a previe dossier con messages non legite"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Proxime &texto non legite"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Vade  a proxime texto non legite"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4612,230 +4568,229 @@
 "Rola a basso message currente. Si al fin del message currente, vade a "
 "proxime message non legite."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configura  &filtros..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Gerer &scripts de Sieve (Cribrar) ..."
 
-#: kmmainwidget.cpp:3335
-#, fuzzy, kde-format
-#| msgid "Add Note..."
+#: kmmainwidget.cpp:3342
+#, kde-format
 msgid "&Add Account..."
-msgstr "Adde nota..."
+msgstr "&Adde conto..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introduction de KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Monstra  pagina de benvenite de KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configura  &Notificationes ..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configura  KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Expira ..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Adde  dossier favorite..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Subscription de latere servitor..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
-#, fuzzy, kde-format
-#| msgid "Appl&y All Filters"
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
+#, kde-format
 msgid "Apply All Filters"
-msgstr "Appl&ica  omne filtros"
+msgstr "Applica  omne filtros"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importa/Exporta datos de KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nove contacto de adressario..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copiar Message a Dossier"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Salta a Dossier..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Aborta operation currente"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Foco sur proxime dossier"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Foco sur previe dossier"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Selige dossier con foco"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Foco sur prime dossier"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Foco sur ultime dossier"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Foco sur proxime message"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Foco sur message previe"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Selige prime message"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Selige ultime message"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Selige message con foco"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Fixa foco a Cerca rapide"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Extende selection a previe message"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Extende selection a proxime message"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Mover Message a Dossier"
 
-#: kmmainwidget.cpp:3566
-#, fuzzy, kde-format
-#| msgid "Low Bandwidth"
+#: kmmainwidget.cpp:3573
+#, kde-format
 msgid "Use Less Bandwidth"
-msgstr "Basse largessa de banda"
+msgstr "Usa minus largessa de banda"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 "Marca omne messages como legite in iste dossier e in omne su sub-dossieres "
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Remove duplicationes in iste dossier e in omne su sub-dossieres"
 
-#: kmmainwidget.cpp:3579
-#, fuzzy, kde-format
-#| msgid "&Settings"
+#: kmmainwidget.cpp:3586
+#, kde-format
 msgid "Account &Settings"
-msgstr "Preferentia&s"
+msgstr "Preferentia&s de conto"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Re-Initia conto"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Adde dossier favorite"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Va&cua  corbe"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Move  omne messages a corbe"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Dele  cerca"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Modifica cerca..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "Ann&ulla"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Annulla: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtro %1"
 
-#: kmmainwidget.cpp:4663
-#, fuzzy, kde-format
-#| msgctxt "Show shortcut for focus quick search. Don't change it"
-#| msgid "Search...<%1>"
+#: kmmainwidget.cpp:4695
+#, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
-msgstr "Cerca...<%1>"
+msgstr "Cerca... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4846,12 +4801,12 @@
 "augmentar le probabilitate que tu systema essera compromittite per altere, "
 "presente e futur, exploitationes de securitate."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Usa HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4860,122 +4815,127 @@
 "You can configure unified mailboxes, create custom ones or\n"
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
+"Tu ha plus que un conto de e-posta definite.\n"
+"Tu vole habilitar le characteristica de Unified Mailbox per monstrar le "
+"contento de tu dossieres de cassa de ingresso, inviate e provisori?\n"
+"Tu pote configurar cassa do posta unificate, crear los personalisate o\n"
+"dishabilitar le characteristica completemente inpreferentias de Plugin de "
+"KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
-msgstr ""
+msgstr "Habilita cassas de e-posta unificate?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
-msgstr ""
+msgstr "Habilita cassas de e-posta unificate"
 
-#: kmmainwidget.cpp:4865
-#, fuzzy, kde-format
-#| msgid "&Cancel"
+#: kmmainwidget.cpp:4897
+#, kde-format
 msgid "Cancel"
-msgstr "&Cancella"
+msgstr "Cancella"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Il Initia..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Move al corbe"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Corbe"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Move message a corbe"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Non pote copiar elemento. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nove message a ..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Responde a..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Reexpedi A ..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Adde a contacto existente"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Aperi in adressario"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Adjunge Iste ligamine a le marcatores de libro"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Edita contacto..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Salveguarda le ligamine como ..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Trova in message..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Salveguarda Imagine sur disco..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Monstra formato HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 "Monstra formato HTML quando un message de e-posta  veni ab iste contacto"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Carga referentia externe quando un message de e-posta  veni ab iste contacto"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Imparti Imagine..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4984,64 +4944,62 @@
 "KMail es ora basate sur le schema de gestion de information personal "
 "Akonadi, que comporta multe modificationes."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Pulsa e-posta (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Cercas meliorate"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Supporto pro adder notas (annotationes) a e-postas"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Less GUI bloca se, verificationes de posta occurre in le secunde plano"
 
-#: kmreaderwin.cpp:268
-#, fuzzy, kde-format
-#| msgid "GnuPG support"
+#: kmreaderwin.cpp:280
+#, kde-format
 msgid "Plugins support"
-msgstr "Supporto GnuPG"
+msgstr "Supporto de plugins"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
-msgstr ""
+msgstr "Nove renditor (renderer) HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
-#, fuzzy, kde-format
-#| msgid "Check spelling before send"
+#: kmreaderwin.cpp:282
+#, kde-format
 msgid "Added Check for Phishing URL"
-msgstr "Verifica orthographia ante que inviar"
+msgstr "Addite verifica per URL de Phishing"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Le Cliente de E-Posta de KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Recuperante contentos de dossier"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Pro favor, tu attende"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "foras de linea"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5050,7 +5008,7 @@
 "KMail es currentemente in modo Foras de Linea. Tu pulsa <a href=\"kmail:"
 "goOnline\">hic</a> pro vader in linea . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5059,22 +5017,22 @@
 "Conto es currentemente in modo Foras Linea. Tu pulsa <a href=\"kmail:"
 "goResourceOnline\">hic</a> pro vader in linea . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Contacto modificate con successo"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nove message in"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Il non ha alcun messages non legite"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5097,8 +5055,8 @@
 msgstr "Copyright (c) 2004-2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5184,41 +5142,37 @@
 #, kde-format
 msgctxt "@title:column plugin name"
 msgid "Summary Plugin Name"
-msgstr ""
+msgstr "Nomine de plugin de summario"
 
 #: kontactplugin/summary/kcmkontactsummary.cpp:103
 #, kde-format
 msgid "Select the plugin summaries to show on the summary page."
-msgstr ""
+msgstr "Selige le summarios de plugin de monstrar sur le pagina de summario."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
-#, fuzzy, kde-format
-#| msgctxt "type of folder content"
-#| msgid "Contacts"
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#, kde-format
 msgid "kontactsummary"
-msgstr "Contactos"
+msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
-msgstr ""
+msgstr "Summario de Kontact de KDE"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
-#, fuzzy, kde-format
-#| msgid "Tobias Koenig"
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
+#, kde-format
 msgid "(c), 2004 Tobias Koenig"
-msgstr "Tobias Koenig"
+msgstr "(c), 2004 Tobias Koenig"
 
 #: kontactplugin/summary/summaryview_part.cpp:69
-#, fuzzy, kde-format
-#| msgid "&Configure KMail..."
+#, kde-format
 msgid "&Configure Summary View..."
-msgstr "&Configura  KMail..."
+msgstr "&Configura vista de summario ..."
 
 #: kontactplugin/summary/summaryview_part.cpp:72
 #, kde-format
 msgid "Configure the summary view"
-msgstr ""
+msgstr "Configura le vista de summario"
 
 #: kontactplugin/summary/summaryview_part.cpp:77
 #, kde-format
@@ -5227,57 +5181,54 @@
 "Choosing this will show a dialog where you can select which summaries you "
 "want to see and also allow you to configure the summaries to your liking."
 msgstr ""
+"Seliger isto monstrara un dialogo ubi tu pote seliger qual summarios tu vole "
+"vider e anque te permitte de configurar le summarios a tu placer."
 
 #: kontactplugin/summary/summaryview_part.cpp:124
-#, fuzzy, kde-format
-#| msgid "Smart for&mat (%1)"
+#, kde-format
 msgid "Summary for %1"
-msgstr "For&mato intelligente (%1)"
+msgstr "Summario pro %1"
 
 #: kontactplugin/summary/summaryview_part.cpp:392
 #, kde-format
 msgid "What's next?"
-msgstr ""
+msgstr "Qual es proxime?"
 
 #: kontactplugin/summary/summaryview_plugin.cpp:43
-#, fuzzy, kde-format
-#| msgctxt "@action:inmenu"
-#| msgid "Sync Mail"
+#, kde-format
 msgid "Sync All"
-msgstr "Sync E-Posta"
+msgstr "Sync Omne"
 
 #: kontactplugin/summary/summaryview_plugin.cpp:56
-#, fuzzy, kde-format
-#| msgctxt "Permissions"
-#| msgid "All"
+#, kde-format
 msgctxt "@action:inmenu sync everything"
 msgid "All"
 msgstr "Omne"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
-msgstr ""
+msgstr "Summario de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
-msgstr ""
+msgstr "Vista de Summario de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
-msgstr ""
+msgstr "(c) 2003-2019 Le disveloppatores de Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
-msgstr ""
+msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
-msgstr ""
+msgstr " Cornelius Schumacher"
 
 #: manageshowcollectionproperties.cpp:98 manageshowcollectionproperties.cpp:152
 #, kde-format
@@ -5303,7 +5254,7 @@
 msgid "&Reply"
 msgstr "&Responde"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Responde..."
@@ -5313,12 +5264,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Responde a a&utor..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Responde a &Omne..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Responde a &Lista de e-posta..."
@@ -5344,12 +5295,11 @@
 msgstr "Adde nota..."
 
 #: messageactions.cpp:132
-#, fuzzy, kde-format
-#| msgid "&Edit Message"
+#, kde-format
 msgid "&Edit As New"
-msgstr "&Edita message"
+msgstr "&Edita como nove"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5402,21 +5352,17 @@
 #: messageactions.cpp:410
 #, kde-format
 msgid "Filter on Mailing-List..."
-msgstr "Filtra sur lista de e-posta..."
+msgstr "Filtro sur lista de e-posta..."
 
 #: messageactions.cpp:446
-#, fuzzy, kde-format
-#| msgctxt "name used for a virgin filter"
-#| msgid "unknown"
+#, kde-format
 msgid "<unknown>"
-msgstr "incognite"
+msgstr "<incognite>"
 
 #: messageactions.cpp:446
-#, fuzzy, kde-format
-#| msgctxt "@title:tab Mailing list settings for a folder."
-#| msgid "Mailing List"
+#, kde-format
 msgid "Mailing List Name: %1"
-msgstr "Lista de E-Posta"
+msgstr "Nomine de Lista de E-Posta: %1"
 
 #: messageactions.cpp:449
 #, kde-format
@@ -5452,7 +5398,7 @@
 #: messageactions.cpp:476
 #, kde-format
 msgid "Filter on Mailing-List %1..."
-msgstr "Filtra sur lista de e-posta %1..."
+msgstr "Filtro sur lista de e-posta %1..."
 
 #: messageactions.cpp:649
 #, kde-format
@@ -5475,13 +5421,12 @@
 #: searchdialog/incompleteindexdialog.cpp:142
 #, kde-format
 msgid "Reindex"
-msgstr ""
+msgstr "Reindicisa"
 
 #: searchdialog/incompleteindexdialog.cpp:143
-#, fuzzy, kde-format
-#| msgid "Search tag"
+#, kde-format
 msgid "Search Anyway"
-msgstr "Cerca etiquetta"
+msgstr "Cerca de omne modo"
 
 #: searchdialog/incompleteindexdialog.cpp:222
 #, kde-format
@@ -5489,10 +5434,9 @@
 msgstr "Indicisante"
 
 #: searchdialog/incompleteindexdialog.cpp:225
-#, fuzzy, kde-format
-#| msgid "Configure Completion..."
+#, kde-format
 msgid "Indexing Collections..."
-msgstr "Configura completamento..."
+msgstr "Indicisante Collectiones..."
 
 #: searchdialog/kmsearchmessagemodel.cpp:105
 #: searchdialog/kmsearchmessagemodel.cpp:112
@@ -5542,87 +5486,86 @@
 msgstr "Dossier"
 
 #: searchdialog/searchpatternwarning.cpp:40
-#, fuzzy, kde-format
-#| msgid "Search failed. Errors found: <ul><li>%1</li></ul>"
+#, kde-format
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Il falleva cerca. On trovava errores: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Trova messages"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Cerca"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Incorpora..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Como &attachamento ..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Salveguarda attachamentos..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Netta selection"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Salta a dossier original"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 coincidentia"
 msgstr[1] "%1 coincidentias"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Ultime cerca"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Tu non seligeva un valide dossier."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Tu oblidava seliger collectiones"
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Tu oblidava definir condition."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Tote dossieres seligite es vacue o non esseva indicisate."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Tu oblidava adder conditiones."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5630,32 +5573,32 @@
 "Condition de continer non pote esser usate con un numero de characteres "
 "inferior a 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Cercante..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Non pote obtener exito de cerca. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Cerca falleva."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Cerca complete."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Cerca stoppate."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5666,25 +5609,24 @@
 "pro isto pote esser que un altere dossier de cerca con le mesme nomine ja "
 "existe. Le error retornate es \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copia message"
 msgstr[1] "Copia %1 messages"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Talia message"
 msgstr[1] "Talia %1 messages"
 
-#: searchdialog/searchwindow.cpp:913
-#, fuzzy, kde-format
-#| msgid "Check mail on startup"
+#: searchdialog/searchwindow.cpp:907
+#, kde-format
 msgid "Checking index status..."
-msgstr "Verifica posta quando on initia"
+msgstr "Verificante stato de indice..."
 
 #: secondarywindow.cpp:84
 #, kde-format
@@ -5737,10 +5679,9 @@
 
 #. i18n: ectx: label, entry (ShowUnreadInTaskbar), group (General)
 #: settings/kmail.kcfg.cmake:92
-#, fuzzy, kde-format
-#| msgid "Show unread mail in system tray"
+#, kde-format
 msgid "Show Unread Email in TaskBar"
-msgstr "Monstra message de e-posta non legite in tabuliero de systema"
+msgstr "Monstra message de e-posta non legite in barra de carga"
 
 #. i18n: ectx: label, entry (ExternalEditor), group (General)
 #: settings/kmail.kcfg.cmake:96
@@ -5782,10 +5723,9 @@
 
 #. i18n: ectx: label, entry (DeleteMessageWithoutConfirmation), group (General)
 #: settings/kmail.kcfg.cmake:115
-#, fuzzy, kde-format
-#| msgid "Delete Sieve Script Confirmation"
+#, kde-format
 msgid "Delete messages without confirmation"
-msgstr "Confirmation de Deler Script de Cribro"
+msgstr "Dele messages sin confirmation"
 
 #. i18n: ectx: label, entry (StartSpecificFolderAtStartup), group (General)
 #: settings/kmail.kcfg.cmake:119
@@ -5819,15 +5759,17 @@
 "executante (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
 "email accounts are detected. We only ever ask once."
 msgstr ""
+"Si demandar si usatores vole habilitar Unified MailBoxes si plus que un cont "
+"de e-posta es relevate.Nos demanda sol un vice."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5837,26 +5779,26 @@
 "monstrate. "
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Monstra modifica de linea de cerca rapide de dossier"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Reexpedi Incorporate (Inline) como predefinite. "
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Avisa si le numero de destinatarios es plus grande que:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5868,19 +5810,19 @@
 "dis-habilitate."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Verifica orthographia ante que inviar"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Require automaticamente notificationes de disposition de &message"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5897,13 +5839,13 @@
 "p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Intervallo de salvamento automatic:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5915,7 +5857,7 @@
 "pote dis-habilitar le salvar automatic per fixar lo al valor de 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5923,148 +5865,148 @@
 "compositor."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "Quando marcate, messages inviate essera immagazinate in le forma cryptate"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Un lista de tote le URL's usate recentemente"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Un lista de tote le codificationes usate recentemente"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Monstra indicator de crypto etiquetta"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Valida via breve predefinite de invio"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Le grandor del dialogo de identitate (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Le largessa de fenestra de cerca (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Le altessa de fenestra de cerca (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Le largessa del dialogo Configura KMail (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Le altessa del dialogo Configura KMail (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Vitro de vista preliminar de message"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Non monstra un vitro de vista preliminar de message"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
 "Monstra le vitro de vista preliminar de message sub le lista de message"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
 "Monstra le vitro de vista preliminar de message proxime al lista de message"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Lista de dossier"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Longe lista de dossier"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Breve lista de dossier"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Patrono de message pro nove message"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Patrono de message pro responsa"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Patrono de message pro responsa a omne"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Patrono de message pro reexpedir"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Characteres de citar"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Il specifica le politica usate quando on monstra politica"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6074,7 +6016,7 @@
 "Cerca (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6084,7 +6026,7 @@
 "Cerca (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6094,7 +6036,7 @@
 "Cerca (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6104,7 +6046,7 @@
 "Cerca (solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6114,7 +6056,7 @@
 "(solmente pro uso interne)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6141,7 +6083,7 @@
 #: tag/tagactionmanager.cpp:241
 #, kde-format
 msgid "Tag not Found"
-msgstr ""
+msgstr "Etiquetta non trovate"
 
 #: tag/tagactionmanager.cpp:256
 #, kde-format
@@ -6282,7 +6224,7 @@
 #: ui/composercryptoconfiguration.ui:64
 #, kde-format
 msgid "When sa&ving as draft, sign/encrypt as indicated"
-msgstr ""
+msgstr "Quando in sal&veguarda como minuta, signa/Crypta como indicate"
 
 #. i18n: ectx: property (text), widget (QCheckBox, mShowEncSignIndicator)
 #: ui/composercryptoconfiguration.ui:71
@@ -6347,13 +6289,17 @@
 "for priority reindexing. If you uncheck a folder it may still be indexed "
 "later, unless it was manually excluded from indexing."
 msgstr ""
+"Alcun del dossieres que tu vole cercar non es completemente indicisate "
+"ancora o ha essite excludite ab indicisation. Omne dossieres marcata a basso "
+"essera planificate per reindicisar con prioritate. Si tu leva le marca a un "
+"dossier illo ancora poterea esser indicisate plus tarde, a minus que illo "
+"esseva excludite manualmente ab indicisar. "
 
 #. i18n: ectx: property (text), widget (QPushButton, selectAllBtn)
 #: ui/incompleteindexdialog.ui:40
-#, fuzzy, kde-format
-#| msgid "Unselect All"
+#, kde-format
 msgid "&Select All"
-msgstr "De-Selectionar Omne"
+msgstr "&Selectiona omne"
 
 #. i18n: ectx: property (text), widget (QPushButton, unselectAllBtn)
 #: ui/incompleteindexdialog.ui:47
@@ -6369,11 +6315,7 @@
 
 #. i18n: ectx: property (text), widget (QLabel, mLoopLabel)
 #: ui/miscpagemaintab.ui:32
-#, fuzzy, kde-format
-#| msgctxt ""
-#| "to be continued with \"do not loop\", \"loop in current folder\", and "
-#| "\"loop in all folders\""
-#| msgid "&When trying to find unread messages:"
+#, kde-format
 msgctxt ""
 "to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
 "in all folders\""
@@ -6385,7 +6327,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6421,7 +6363,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6548,10 +6490,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mDeleteMessagesWithoutConfirmation)
 #: ui/miscpagemaintab.ui:180
-#, fuzzy, kde-format
-#| msgid "Sending Without Confirmation"
+#, kde-format
 msgid "Allow deleting messages without confirmation"
-msgstr "Invia sin confirmation"
+msgstr "Permitte deler messages sin confirmation"
 
 #. i18n: ectx: property (text), widget (QRadioButton, mChkbxAllFolders)
 #: ui/searchwindow.ui:17
@@ -6579,8 +6520,7 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, selectMultipleFolders)
 #: ui/searchwindow.ui:60
-#, fuzzy, kde-format
-#| msgid "Select folders..."
+#, kde-format
 msgid "Select Folders..."
 msgstr "Selige dossieres..."
 
@@ -6747,20 +6687,19 @@
 #: ui/securitypagegeneraltab.ui:154
 #, kde-format
 msgid "Safe Browsing"
-msgstr ""
+msgstr "Navigation secur"
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckUrl)
 #: ui/securitypagegeneraltab.ui:160
 #, kde-format
 msgid "Check URL With Phishing Google System"
-msgstr ""
+msgstr "Verifica URL con Phishing Google System"
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Verifica posta in ingresso"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr "Scande messages de eposta per traciar URLs"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -6903,10 +6842,9 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, CRLRB)
 #: ui/smimeconfiguration.ui:20
-#, fuzzy, kde-format
-#| msgid "Validate certificates using CRLs"
+#, kde-format
 msgid "&Validate certificates using CRLs"
-msgstr "Valida certificatos per usar CRLs"
+msgstr "&Valida certificatos per usar CRLs"
 
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, OCSPRB)
 #: ui/smimeconfiguration.ui:30
@@ -7064,17 +7002,15 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, honorHTTPProxyRB)
 #: ui/smimeconfiguration.ui:179
-#, fuzzy, kde-format
-#| msgid "Use system HTTP proxy:"
+#, kde-format
 msgid "Use s&ystem HTTP proxy:"
-msgstr "Usa proxy HTTP de systema:"
+msgstr "Usa proxy HTTP de s&ystema:"
 
 #. i18n: ectx: property (text), widget (QRadioButton, useCustomHTTPProxyRB)
 #: ui/smimeconfiguration.ui:196
-#, fuzzy, kde-format
-#| msgid "Use this proxy for HTTP requests: "
+#, kde-format
 msgid "Use &this proxy for HTTP requests: "
-msgstr "Usa iste proxy pro requestas HTTP:"
+msgstr "Usa is&te proxy pro requestas HTTP:"
 
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, customHTTPProxy)
 #: ui/smimeconfiguration.ui:203
@@ -7220,10 +7156,9 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, warnGroupBox)
 #: ui/warningconfiguration.ui:59
-#, fuzzy, kde-format
-#| msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+#, kde-format
 msgid "Warn if certificates/ke&ys expire soon (configure thresholds below)"
-msgstr "Avisa si certificatos/claves termina tosto (configurar limine a basso)"
+msgstr "&Avisa si certificatos/claves termina tosto (configura limine a basso)"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
 #: ui/warningconfiguration.ui:68
@@ -7353,10 +7288,9 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
 #: ui/warningconfiguration.ui:292
-#, fuzzy, kde-format
-#| msgid "For root certificates:"
+#, kde-format
 msgid "For &root certificates:"
-msgstr "Pro certificatos de radice (superusator):"
+msgstr "Pro certificatos de &radice (superusator):"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
 #: ui/warningconfiguration.ui:305
@@ -7366,10 +7300,9 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #: ui/warningconfiguration.ui:318
-#, fuzzy, kde-format
-#| msgid "For end-user certificates/keys:"
+#, kde-format
 msgid "For end-user certificates/&keys:"
-msgstr "Pro certificatos/claves de usator final:"
+msgstr "&Pro certificatos/claves de usator final:"
 
 #. i18n: ectx: property (text), widget (QPushButton, gnupgButton)
 #: ui/warningconfiguration.ui:365
@@ -7383,6 +7316,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Re-habilita omne avisos de \"Non demanda de nove\""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 secundas"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Annullar invio"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7406,11 +7349,10 @@
 msgstr "Non pote mover message. %1"
 
 #: util.cpp:187
-#, fuzzy, kde-format
-#| msgid "Delete"
+#, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "Delete"
-msgstr "Cancella"
+msgstr "Dele"
 
 #: widgets/displaymessageformatactionmenu.cpp:37
 #, kde-format
@@ -7435,10 +7377,17 @@
 msgstr[1] "Responsa de foras de officio active sur le servitores"
 
 #: widgets/zoomlabelwidget.cpp:35
-#, fuzzy, kde-format
-#| msgid "Zoom"
+#, kde-format
 msgid "Zoom: %1%"
-msgstr "Zoom"
+msgstr "Zoom: %1"
+
+#~ msgid "Text Snippets"
+#~ msgstr "Fragmentos de texto"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Verifica posta in ingresso"
 
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Nomine de dossier e dimension quando on claude un quota"
@@ -9023,9 +8972,6 @@
 #~ msgid "R&emove"
 #~ msgstr "R&emove"
 
-#~ msgid "Restart"
-#~ msgstr "Re-Initia"
-
 #~ msgid "Message Delayed..."
 #~ msgstr "Merssage retardate..."
 
@@ -10096,10 +10042,6 @@
 #~ "><warning>Il non ha alcun modo de annullar le elimination.</warning>"
 
 #~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Tu realmente vole remover gruppo \"%1\"?"
-
-#~ msgctxt "@info"
 #~ msgid ""
 #~ "Do you really want to remove snippet \"%1\"?<nl/><warning>There is no way "
 #~ "to undo the removal.</warning>"
diff -Nru kmail-19.04.3/po/ia/kmail-refresh-settings.po kmail-19.12.3/po/ia/kmail-refresh-settings.po
--- kmail-19.04.3/po/ia/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/ia/kmail-refresh-settings.po	2020-03-03 00:34:04.000000000 +0000
@@ -0,0 +1,103 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Giovanni Sora <g.sora@tiscali.it>, 2020.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2020-02-03 14:35+0100\n"
+"Last-Translator: giovanni <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
+"Language: ia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 18.12.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Giovanni Sora"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "g.sora@tiscali.it"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "KMail Assistant (Assistente de KMail)  per refrescar preferentias"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "KMail Refresh Settings (Refresca preferentias de KMail)"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Aviso"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Netta preferentias"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Termina"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Netta"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Remove preferentias de obsolete \"Condilios del die\":Facite"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Dele preferentias de Dialogo in file '%1': Facite"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Dele preferentias de filtros in file '%1':Facite"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Netta preferentias de dossier in file de preferentia '%1':Facite"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Netta grandor de dialogo in file de preferentia '%1':Facite"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Pro favor claude KMail/Kontact ante que usar lo."
diff -Nru kmail-19.04.3/po/ia/ktnef.po kmail-19.12.3/po/ia/ktnef.po
--- kmail-19.04.3/po/ia/ktnef.po	2019-07-09 00:20:22.000000000 +0000
+++ kmail-19.12.3/po/ia/ktnef.po	2020-03-03 00:34:04.000000000 +0000
@@ -1,21 +1,21 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Giovanni Sora <g.sora@tiscali.it>, 2012, 2013.
+# Giovanni Sora <g.sora@tiscali.it>, 2012, 2013, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2013-10-23 13:39+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
+"PO-Revision-Date: 2020-01-20 22:49+0100\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
-"Language-Team: Interlingua <kde-i18n-ia@kde.org>\n"
+"Language-Team: Interlingua <kde-i18n-doc@kde.org>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -194,33 +194,31 @@
 #: ktnefmain.cpp:561
 #, kde-format
 msgid "Open &with %1"
-msgstr ""
+msgstr "Aperi &con %1"
 
 #: ktnefmain.cpp:563
 #, kde-format
 msgctxt "@item:inmenu Open With, %1 is application name"
 msgid "%1"
-msgstr ""
+msgstr "%1"
 
 #: ktnefmain.cpp:589
 #, kde-format
 msgctxt "@title:menu"
 msgid "&Open With"
-msgstr ""
+msgstr "&Aperi con"
 
 #: ktnefmain.cpp:606
 #, kde-format
 msgctxt "@action:inmenu Open With"
 msgid "&Other..."
-msgstr ""
+msgstr "A&ltere..."
 
 #: ktnefmain.cpp:608 ktnefmain.cpp:616
-#, fuzzy, kde-format
-#| msgctxt "@action:inmenu"
-#| msgid "View With..."
+#, kde-format
 msgctxt "@title:menu"
 msgid "&Open With..."
-msgstr "Vista con..."
+msgstr "&Aperi con..."
 
 #. i18n: ectx: Menu (action)
 #: ktnefui.rc:4
@@ -345,10 +343,9 @@
 
 #. i18n: ectx: property (text), widget (QLabel, mMimeLabel)
 #: ui/attachpropertywidgetbase.ui:199
-#, fuzzy, kde-format
-#| msgid "Mime type:"
+#, kde-format
 msgid "MIME type:"
-msgstr "Typo Mime:"
+msgstr "Typo MIME:"
 
 #~ msgctxt "@info:status"
 #~ msgid "100 attachments found"
diff -Nru kmail-19.04.3/po/is/kmail.po kmail-19.12.3/po/is/kmail.po
--- kmail-19.04.3/po/is/kmail.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/is/kmail.po	2020-03-03 00:34:05.000000000 +0000
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2009-11-18 11:24+0000\n"
 "Last-Translator: Sveinn í Felli <sveinki@nett.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -214,8 +214,8 @@
 msgstr "Margir dulkóðunarlyklar á vistfang"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -333,28 +333,28 @@
 "KMail fann ekki póstlista í þessari möppu. Vinsamlega fylltu handvirkt inn "
 "vistfang hans."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, fuzzy, kde-format
 msgid "Quota"
 msgstr "Alls"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, fuzzy, kde-format
 msgid "Usage:"
 msgstr "Notkun:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, fuzzy, kde-format
 #| msgid "Status: "
 msgid "Status:"
 msgstr "Staða: "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr ""
@@ -378,7 +378,7 @@
 "qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, fuzzy, kde-format
 msgid "Templates"
 msgstr "Sniðmát"
@@ -389,12 +389,12 @@
 msgstr "Nota sérsniðna ending&u á kennistreng"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, fuzzy, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Skipta út"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, fuzzy, kde-format
 #| msgctxt "to view something"
 #| msgid "View"
@@ -402,105 +402,105 @@
 msgid "View"
 msgstr "Skoða"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Nota sérsniðnar &táknyndir"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, fuzzy, kde-format
 #| msgid "&Normal:"
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "Ven&julegt:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, fuzzy, kde-format
 #| msgid "&Unread:"
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "Ól&esið:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Sýna sendanda/móttakanda dálk í skilaboðalistanum"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Sýna dálk:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, fuzzy, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Setja sem sjálfgefið"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, fuzzy, kde-format
 #| msgid "Sender"
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Sendandi"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, fuzzy, kde-format
 #| msgid "Receiver"
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Móttakandi"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Bréfalisti"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default aggregation"
 msgstr "Eyða &þræði"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, fuzzy, kde-format
 #| msgid "Suggestions"
 msgid "Aggregation"
 msgstr "Ábendingar"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default theme"
 msgstr "Eyða &þræði"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, fuzzy, kde-format
 msgid "Theme"
 msgstr "Þema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "Óöruggt skeytasnið"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer H&TML to plain text"
 msgid "Prefer HTML to text"
 msgstr "&Frekar HTML en texta"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "&Frekar HTML en texta"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -512,14 +512,14 @@
 msgid "Retrieval Options"
 msgstr "Tek á móti umsögnum"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Auð&kenni"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, fuzzy, kde-format
 #| msgid "&Receiving"
 msgctxt ""
@@ -527,90 +527,95 @@
 msgid "Receiving"
 msgstr "&Móttaka"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, fuzzy, kde-format
 #| msgid "&Sending"
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "&Sending"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Flutningsleiðir (þú þarft minnst eina tengingu):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Almennar stillingar"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Sta&ðfesta áður en sent er"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Aldrei sjálfkrafa"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Við handvirka póstathugun"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Við allar póstathuganir"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Senda núna"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Senda síðar"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Senda &póst úr úthólfi:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Sjálfgefin sendiaðferð:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Bæta við tengingu"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Custom Account..."
 msgstr "Bæta við tengingu"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -618,33 +623,33 @@
 "properly installed."
 msgstr "Gat ekki ræst skírteinisstjóra.  Vinsamlega athugið uppsetningu."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start account wizard"
 msgstr "Gat ekki búið til tengingu"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, fuzzy, kde-format
 #| msgid "Include in manual mail chec&k"
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Innifela í handvir&kri athugun af pósti"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Check mail on startup"
 msgstr "Gá að pósti við &ræsingu"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -706,7 +711,7 @@
 msgid "Fixed Width Font"
 msgstr "Jafnbreitt letur"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Ritill"
@@ -1050,43 +1055,43 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Almennt"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, fuzzy, kde-format
 msgid "Standard Templates"
 msgstr "&Skipta út"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, fuzzy, kde-format
 msgid "Custom Templates"
 msgstr "&Skipta út"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, fuzzy, kde-format
 #| msgid "Subject"
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Viðfangsefni"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, fuzzy, kde-format
 #| msgid "Cha&rset"
 msgid "Charset"
 msgstr "Stafa&tafla"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, fuzzy, kde-format
 #| msgid "H&eaders"
 msgid "Headers"
 msgstr "H&ausar"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "A&ttachments"
@@ -1094,56 +1099,56 @@
 msgid "Attachments"
 msgstr "Við&hengi"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Undirskrift"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 #| msgid "Use smaller font for quoted text"
 msgid "Insert the signature above any quoted text"
 msgstr "Nota minna letur fyrir tilvitnaðan texta"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "&Normal:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Ven&julegt:"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1151,7 +1156,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1159,17 +1164,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1177,7 +1182,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1185,7 +1190,7 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, fuzzy, kde-format
 #| msgctxt "View->attachments->"
 #| msgid "&Inline"
@@ -1193,31 +1198,31 @@
 msgid "Inline"
 msgstr "&Innfelld"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "As Attachment"
 msgstr "Hefur viðhengi"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Default forwarding type:"
 msgstr "Sjálf&gefið lén:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "Additional Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Aðrir móttakendur"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1225,18 +1230,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Hámarksfjöldi af mótakandalínum."
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1247,52 +1252,52 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Engin sjálfvirk vistun"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "Nýleg vistföng"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order"
 msgid "Configure Completion..."
 msgstr "Stilla vinnsluröð"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Engin sjálfvirk vistun"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Engin sjálfvirk vistun"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1301,19 +1306,19 @@
 msgstr[0] " mín"
 msgstr[1] " mín"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "Biðja s&jálfkrafa um tilkynningar um afdrif bréfa"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Forske&yti á viðfangsefni svarbréfa"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1322,59 +1327,59 @@
 "Þekkja eftirfarandi forskeyti\n"
 "(forskeyti eru reglulegar segðir, óháðar há-/lág-stöfum):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Bæta við..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Fjarlægja"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Bre&yta..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Sláðu inn nýtt svar-forskeyti:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Fo&rskeyti á viðfangsefni áframsendra bréfa"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Bæta við..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "E&yða"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Breyta..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Sláðu inn nýtt áframsendi-forskeyti:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1384,93 +1389,93 @@
 "hvort stafatafla inniheldur alla nauðsynlega stafi."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Breyta..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Sláðu inn stafatöflu:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Halda upprunalegu stafatöflunni þegar svarað eða áframsent (ef mögulegt)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Það er ekki stuðningur við þessa stafatöflu."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Nota sérsniðna ending&u á kennistreng"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Sérsniðin ending á kenn&istreng:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Skilgreina sérsniðin MIME-tög:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, fuzzy, kde-format
 #| msgid "Name"
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Heiti"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, fuzzy, kde-format
 #| msgid "Value"
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Gildi"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, fuzzy, kde-format
 #| msgid "Ne&w"
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Nýtt"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, fuzzy, kde-format
 #| msgid "&Name:"
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nafn:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Gildi:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid header"
 msgstr "Setja &undirskrift"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nota samræmingu við Outlook í nöfnum viðhengja"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1479,41 +1484,41 @@
 "Veldu þetta til að Outlook(tm) skilji nöfn viðhengja sem innihalda ekki-"
 "enska stafi"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Sky&nja þegar viðhengi vantar"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Þekkja eftirtalin stikkorð sem innsetningu viðhengisskrár:encode"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Sláðu inn nýtt stikkorð:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Hefur viðhengi"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, fuzzy, kde-format
 #| msgid " MB"
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " Mb"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "Stærðartakmörk annáls:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1610,7 +1615,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Ritill"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1729,7 +1734,7 @@
 msgid "Archive Folder"
 msgstr "Ný mappa"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "List Archives"
 msgctxt "@action"
@@ -1804,7 +1809,7 @@
 msgid "Notification"
 msgstr "Tilkynning um nýjan póst"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "Attachment: %1"
 msgid "1 attachment (%2)"
@@ -1812,13 +1817,13 @@
 msgstr[0] "Viðhengi: %1"
 msgstr[1] "Viðhengi: %1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Hide attachment list"
 msgstr "Vista viðhengi sem"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "Save Attachment As"
 msgid "Show attachment list"
@@ -1837,398 +1842,398 @@
 msgid "Encoding"
 msgstr "Stafatafla"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 #| msgid "Set subject of message"
 msgid "Set a subject for this message"
 msgstr "Setja viðfangsefni bréfs"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Auðkenni:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Orðabók:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Mappa fyrir &sendan póst:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "F&lutningsleið:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Frá"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, fuzzy, kde-format
 #| msgid "S&ubject:"
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Efni:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Senda póst"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Senda póst með"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, fuzzy, kde-format
 msgid "Send"
 msgstr "&Senda"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "S&enda síðar"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "S&enda síðar með"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, fuzzy, kde-format
 #| msgid "Queued"
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Í biðröð"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, fuzzy, kde-format
 msgid "Save as &Draft"
 msgstr "&Vista sem uppkast"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "Leita í &öllum möppum á þesari vél"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, fuzzy, kde-format
 msgid "Save as &Template"
 msgstr "&Skipta út"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 msgid "Save email in Template folder"
 msgstr "&Skipta út"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "Vista í skrá"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgid "&Insert Text File..."
 msgstr "Setja &inn skrá..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, fuzzy, kde-format
 #| msgid "&Insert File Recent"
 msgid "&Insert Recent Text File"
 msgstr "Setja &inn nýlega skrá"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Vistfangaskrá"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "Open Address Book"
 msgstr "Opna í vistfangaskrá"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nýr ritill"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Veldu móttakendu&r..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Vista &póstlista..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Líma inn sem við&hengi"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Hreinsa &bil"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Nota &jafnbreitt letur"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, fuzzy, kde-format
 #| msgid "&Urgent"
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "Áríð&andi"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Fá tilkynningu um afdrif bréfs"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Fá tilkynningu um afdrif bréfs"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Skipta milli lína"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "At&huga stafsetningu sjálfkrafa"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Rich Text Editing"
 msgstr "Auðkenni"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Öll s&væði"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "Auð&kenni"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Orðabók"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Sendur póstur"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "F&lutningsleið"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Frá"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, fuzzy, kde-format
 #| msgid "S&ubject"
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Efni"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Setja &undirskrift"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, fuzzy, kde-format
 #| msgid "Append S&ignature"
 msgid "Pr&epend Signature"
 msgstr "Setja &undirskrift"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Stafsetningarráðgjafinn..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Stafsetningarráðgjafi"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Dulrita bréf"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Dulritun"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Undirrita bréf"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Undirritun"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Du&lritunarsnið"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Leita að bréfi..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, fuzzy, kde-format
 msgid "Configure KMail..."
 msgstr "Stilla &KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, fuzzy, kde-format
 #| msgid " Line: %1 "
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Lína: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Dálkur: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, fuzzy, kde-format
 msgid "Spellcheck: on"
 msgstr "Stafsetningarráðgjafi"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, fuzzy, kde-format
 msgid "Spellcheck: off"
 msgstr "Stafsetningarráðgjafi"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, fuzzy, kde-format
 msgid "Re&save as Template"
 msgstr "&Skipta út"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Vista sem uppkast"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, fuzzy, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2236,7 +2241,7 @@
 msgstr ""
 "Vista bréfið í uppkastsmöppunni. Það er þá hægt að breyta því og senda síðar."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2244,70 +2249,70 @@
 msgstr ""
 "Vista bréfið í uppkastsmöppunni. Það er þá hægt að breyta því og senda síðar."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Viltu vista bréfið til að ljúka því síðar eða viltu henda því?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Loka ritli"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Autosave Message Failed"
 msgstr "Sjálfvirk vistun mistókst"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Sending Message Failed"
 msgstr "Sjálfvirk vistun mistókst"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Setja &inn skrá..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add as &Attachment"
 msgstr "Setja sem viðhengi"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nafn viðhengis:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid Attachment Name"
 msgstr "Setja &undirskrift"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Bréfalisti"
 msgstr[1] "Bréfalisti"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, fuzzy, kde-format
 #| msgid "Add as Attachment"
 msgid "Add File as &Attachment"
@@ -2315,18 +2320,18 @@
 msgstr[0] "Setja sem viðhengi"
 msgstr[1] "Setja sem viðhengi"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, fuzzy, kde-format
 #| msgid "Paste as Attac&hment"
 msgid "Insert clipboard text as attachment"
 msgstr "Líma inn sem við&hengi"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "nafnlaust"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2339,12 +2344,12 @@
 "aðgang.</p> <p>Vinsamlega veldu lykilinn sem á að nota í "
 "auðkennisstillingunum.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Óskilgreindur dulritunarlykill"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2355,12 +2360,12 @@
 "eða S/MIME undirritunarlykilinn sem á að nota.</p><p>Vinsamlega veldu "
 "lykilinn sem á að nota í stillingum auðkenna.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Óskilgreindur undiritunarlykill"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2371,7 +2376,7 @@
 "þitt í öll auðkenni til að sleppa að þurfa að skrifa það inn í hvert sinn þú "
 "býrð til nýtt skeyti."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2383,37 +2388,37 @@
 "Þú verður að tilgreina a.m.k. einn móttakanda í Til: svæðið eða CC eða sem "
 "BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, fuzzy, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Þú tilgreindir ekki viðfangsefni. Senda bréfið samt?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, fuzzy, kde-format
 msgid "No To: specified"
 msgstr "Ekkert nafn tilgreint"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Þú tilgreindir ekki viðfangsefni. Senda bréfið samt?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Ekkert viðfangsefni tilgreint"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "S&enda óbreytt"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Setja inn viðfangsefni"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2425,91 +2430,91 @@
 "Þú verður að tilgreina a.m.k. einn móttakanda í Til: svæðið eða CC eða sem "
 "BCC."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Að fara að senda póst..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Staðfesting sendingar"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Senda &núna"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, fuzzy, kde-format
 #| msgid "No recipients"
 msgid "Too many recipients"
 msgstr "Engir móttakendur"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Senda óbreytt"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, fuzzy, kde-format
 #| msgid "Additional Recipients"
 msgid "&Edit Recipients"
 msgstr "Aðrir móttakendur"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Lose Formatting"
 msgstr "Auðkenni"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "Bréf sem einfaldur texti"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2517,7 +2522,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2604,25 +2609,25 @@
 msgid "External editor was started."
 msgstr "Ytri ritill"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2653,11 +2658,6 @@
 msgid "Message will not be encrypted"
 msgstr "Vista send bréf &dulrituð"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr ""
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2706,30 +2706,30 @@
 msgid "Cannot move messages."
 msgstr "Flytja bréf í möppu"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Get ekki búið til möppu"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No Folder Selected"
 msgid "No folder returned."
 msgstr "Engin mappa valin"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Get ekki búið til möppu"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 msgid "Unable to return list of folders."
 msgstr "Fjarlægði 1 gamalt bréf úr möppunni %2."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "OpenPGP Message - Bad Signature"
 msgid "Messages archived"
@@ -2774,51 +2774,51 @@
 msgid "&Existing identities:"
 msgstr "Núv&erandi auðkenni:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Villa við endurnefningu möppunnar %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Sláðu inn nýtt stikkorð:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Sýsla með auðkenni"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, fuzzy, kde-format
 #| msgid "General"
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Almennt"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Nafnið þitt:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2829,12 +2829,12 @@
 "vilt að það birtist í pósthaus allra senda bréfa.</p> <p>Ef þú hefur þetta "
 "svæði tómt mun nafnið þitt ekki birtast, heldur bara netfangið þitt.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Fyrirtæki/félag:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2849,12 +2849,12 @@
 "þíns eða félags ef þú vilt að það birtist í haus bréfa sem þú sendir.</"
 "p><p>Það er í lagi (og eðlilegt) að hafa þetta svæði autt.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "N&etfang:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Email address</h3><p>This field should have your full email "
@@ -2871,13 +2871,13 @@
 "þú hefur þetta svæði autt eða skrifar netfangið vitlaust mun fólk eiga "
 "erfitt með að svara póstinum þínum.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 #| msgid "&Email address:"
 msgid "Email a&liases:"
 msgstr "N&etfang:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2888,13 +2888,13 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, fuzzy, kde-format
 #| msgid "Cryptograph&y"
 msgid "Cryptography"
 msgstr "&Dulritun"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2915,12 +2915,12 @@
 "dulkóðun. Þetta hefur ekki áhrif á venjulega póstnotkun.</p> Þú getur fundið "
 "nánari upplýsingar um lykla á <a>http://www.gnupg.org</a></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP undirritunarlykill:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2944,12 +2944,12 @@
 "dulkóðun. Þetta hefur ekki áhrif á venjulega póstnotkun.</p> Þú getur fundið "
 "nánari upplýsingar um lykla á <a>http://www.gnupg.org</a></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP dulritunarlykill:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2962,12 +2962,12 @@
 "mun KMail ekki getað undirritað tölvupóstinn með S/MIME; þetta hefur engin "
 "áhrif á venjulegar póstaðgerðir.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME undirritunarskírteini:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2982,43 +2982,43 @@
 "afrit af skeytum með S/MIME; þetta hefur hinsvegar engin áhrif á venjulegar "
 "póstaðgerðir.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME dulritunarskírteini:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred crypto message format:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Sjálfgefin dulkóðunaraðferð:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "&Undirrita bréf sjálfkrafa"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "&Dulrita bréf sjálfkrafa þegar mögulegt er"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, fuzzy, kde-format
 #| msgid "Advanced"
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Ítarlegt"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "S&varnetfang:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -3035,13 +3035,13 @@
 "öll svör fari á netfang hópsins.</p> <p>Ef þú ert í vafa skaltu hafa svæðið "
 "autt.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "&Dulin netföng:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3066,12 +3066,12 @@
 "netfang skaltu nota kommur til að aðgreina lista dulinna móttakenda.</"
 "p><p>Ef þú ert í vafa skildu þá svæðið eftir autt.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Dulin netföng:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -3088,61 +3088,61 @@
 "netfang skaltu nota kommur til að aðgreina lista dulinna móttakenda.</"
 "p><p>Ef þú ert í vafa skildu þá svæðið eftir autt.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Orðabók:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Mappa &fyrir sendan póst:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Mappa fyrir &uppköst:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, fuzzy, kde-format
 msgid "&Templates folder:"
 msgstr "&Ruslmappa:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 #| msgid "Configure Account"
 msgid "Outgoing Account:"
 msgstr "Stilla tengingu"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "Bæta 'haus' við bréfið"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "Endurnefna..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr ""
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Sjálf&gefið lén:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Sjálf&gefið lén:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3151,35 +3151,35 @@
 "<qt> <p>Sjálfgefið lén er notað til að klára netföng sem innihalda aðeins "
 "notandanafn.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, fuzzy, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Nota sérsniðna ending&u á kennistreng"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Undirskrift"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, fuzzy, kde-format
 #| msgid "&Picture"
 msgid "Picture"
 msgstr "&Mynd"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Email Alias \"%1\""
 msgstr "Ógilt netfang"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Ógilt netfang"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3192,7 +3192,7 @@
 "Það gæti valdið því að móttakandi fær viðvörun þegar reynt er að staðfesta "
 "undirskriftina."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3201,7 +3201,7 @@
 "Einn af uppsettu OpenPGP undirritunarlyklunum inniheldur ekki "
 "notandaauðkenni með netfanginu sem er notað fyrir þessa tengingu (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3214,7 +3214,7 @@
 "Það gæti valdið því að móttakandi fær viðvörun þegar reynt er að staðfesta "
 "undirskriftina."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3223,22 +3223,22 @@
 "Eitt af uppsettu S/MIME undirritunarskírteinunum inniheldur ekki netfangið "
 "sem er notað fyrir þessa tengingu (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Netfang fannst ekki í lykli/skírteini"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Undirritunarskráin er ekki gild"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Sýsla með auðkenni \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3250,7 +3250,7 @@
 "Sérsniðna mappan \"Uppköst\" fyrir \"%1\" er ekki til (lengur). Því verður "
 "sjálfgefna mappan fyrir uppköst notuð."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Breyta..."
@@ -3286,6 +3286,20 @@
 msgid "We cannot delete vCard file."
 msgstr "Gat ekki samræmt 'maildir' möppu."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "<qt>Viltu örugglega keyra <b>%1</b>?</qt>"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Staðfesting sendingar"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3455,7 +3469,7 @@
 "Dæmi má finna á <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www."
 "xs4all.nl/~ace/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3489,7 +3503,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Setja í vistfangaskrána"
@@ -3500,24 +3514,24 @@
 msgid "Contact created successfully"
 msgstr "Tókst að eyða bréfum."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Name of the attachment:"
 msgid "Failed to store contact"
 msgstr "Nafn viðhengis:"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Viltu örugglega tæma ruslmöppuna?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "New Folder"
 msgid "Attach Folder"
@@ -3754,7 +3768,7 @@
 msgstr "&Mappa"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3762,7 +3776,7 @@
 msgstr "&Virkja allar síur"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3788,7 +3802,7 @@
 msgstr "Á&framsenda"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Vir&kja síu"
@@ -3813,7 +3827,7 @@
 msgstr "&Hljóðmerki"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, fuzzy, kde-format
 msgid "Main Toolbar"
 msgstr "HTML tækjaslá"
@@ -3869,44 +3883,44 @@
 msgid "The file does not contain a message."
 msgstr "Skráin inniheldur ekki bréf."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Skráin inniheldur mörg bréf. Aðeins það fyrsta er sýnt."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 msgid "Send As Digest"
 msgstr "Senda óundirritað?"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, fuzzy, kde-format
 msgid "Filtering messages"
 msgstr "Eyði bréfum"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, fuzzy, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Færi bréf %3 af %2 frá %1."
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Færi bréf"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Eyði bréfum"
@@ -3935,29 +3949,29 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail er í ótengdum ham. Öll nettengd verk eru í biðstöðu."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Að fara að senda póst..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail er í tengdum ham. Haldið verður áfram með nettengd verk."
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3965,52 +3979,52 @@
 "connection is detected"
 msgstr "KMail er í tengdum ham. Haldið verður áfram með nettengd verk."
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail er í augnablikinu í ótengdum ham. Hvað viltu gera?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Tengd/ótengd"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Vinna í tengdum ham"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Vinna í ótengdum ham"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
 msgstr "KMail er í tengdum ham. Haldið verður áfram með nettengd verk."
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "KMail er í ótengdum ham. Öll nettengd verk eru í biðstöðu."
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Opening Autosave File Failed"
 msgstr "Sjálfvirk vistun mistókst"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, fuzzy, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -4021,7 +4035,7 @@
 "Þessum %1 auðkennum hefur verið breytt til að nota sjálfgefnu "
 "flutningsleiðina:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, fuzzy, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -4032,44 +4046,46 @@
 "Þessum %1 auðkennum hefur verið breytt til að nota sjálfgefnu "
 "flutningsleiðina:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Sendi bréf"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, fuzzy, kde-format
 #| msgid "Initiating sender process..."
 msgid "Initiating sending process..."
 msgstr "Set póstflutning af stað..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -4077,12 +4093,12 @@
 "properly installed."
 msgstr "Gat ekki ræst skírteinisstjóra.  Vinsamlega athugið uppsetningu."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail villuboð"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4090,27 +4106,27 @@
 "properly installed."
 msgstr "Gat ekki ræst skírteinisstjóra.  Vinsamlega athugið uppsetningu."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start import wizard"
 msgstr "Gat ekki búið til tengingu"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "Gat ekki ræst skírteinisstjóra.  Vinsamlega athugið uppsetningu."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Gat ekki búið til tengingu"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4118,69 +4134,69 @@
 "properly installed."
 msgstr "Gat ekki ræst skírteinisstjóra.  Vinsamlega athugið uppsetningu."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start ImportWizard"
 msgstr "Gat ekki búið til tengingu"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Gat ekki ræst skírteinisstjóra.  Vinsamlega athugið uppsetningu."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Ekkert viðfangsefni"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, fuzzy, kde-format
 msgid "(no templates)"
 msgstr "Nota sérsniðna ending&u á kennistreng"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Þessi mappa hefur engar úreldingarskilgreiningar"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Viltu örugglega úrelda möppuna <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Úrelda möppu"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Úr&elda"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Tæma rusl"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Setja í ruslið"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Viltu örugglega tæma ruslmöppuna?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4188,27 +4204,27 @@
 msgstr ""
 "<qt>Viltu örugglega færa öll bréf úr möppu <b>%1</b> í ruslmöppuna?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Flutti öll bréf í ruslmöppuna"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Viltu örugglega úrelda öll gömul bréf?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Úrelda gömul bréf?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Eyða"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4219,17 +4235,17 @@
 "berskjaldaðri fyrir ruslpósti og eykur líkurnar á að mögulegar öryggisholur "
 "verði útnýttar."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Öryggisaðvörun"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Hlaða inn utanaðkomandi tilvísunum"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, fuzzy, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4244,431 +4260,431 @@
 "<qt>Viltu örugglega eyða %1 völdu bréfunum? <br>Þegar þeim hefur verið eytt "
 "er engin leið að endurheimta þau.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Eyða bréfum"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Eyða bréfi"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Moving messages..."
 msgstr "Færi bréf"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Deleting messages..."
 msgstr "Eyði bréfum"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, fuzzy, kde-format
 #| msgid "Messages deleted successfully."
 msgid "Messages deleted successfully."
 msgstr "Tókst að eyða bréfum."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved successfully."
 msgstr "Tókst að færa bréf"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Tókst ekki að eyða bréfum."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Hætt við að eyða bréfum."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Tókst ekki að færa bréf."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Hætt við að færa bréf."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Flytja bréf í möppu"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, fuzzy, kde-format
 #| msgid "Moving messages"
 msgid "Copying messages..."
 msgstr "Færi bréf"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages copied successfully."
 msgstr "Tókst að færa bréf"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Copying messages failed."
 msgstr "Tókst ekki að færa bréf."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Copying messages canceled."
 msgstr "Hætt við að færa bréf."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, fuzzy, kde-format
 #| msgid "Copy Message to Folder"
 msgid "Copy Messages to Folder"
 msgstr "Afrita bréf yfir í möppu"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Moving messages to trash..."
 msgstr "Setja bréf í ruslakörfuna"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Deleting and moving messages to trash..."
 msgstr "Setja bréf í ruslakörfuna"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash successfully."
 msgstr "Tókst að færa bréf"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Tókst að færa bréf"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Moving messages to trash failed."
 msgstr "Tókst ekki að færa bréf."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Tókst ekki að færa bréf."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Moving messages to trash canceled."
 msgstr "Hætt við að færa bréf."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Hætt við að færa bréf."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, fuzzy, kde-format
 msgid "Jump to Folder"
 msgstr "Afrita í möppu"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Vista &sem..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Úrelda allar möppur"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Gá að &pósti"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail In"
 msgstr "Gá að &pósti"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, fuzzy, kde-format
 #| msgid "Check &Mail"
 msgid "Check Mail"
 msgstr "Gá að &pósti"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Senda úr &biðröð"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, fuzzy, kde-format
 msgid "Online status (unknown)"
 msgstr "Staða tengingar (óþekkt)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Senda úr biðröð með"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, fuzzy, kde-format
 #| msgid "Certificate Manager..."
 msgid "Certificate Manager"
 msgstr "Skírteinisstjóri..."
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages..."
 msgid "&Import Messages..."
 msgstr "&Flytja inn bréf..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Aflúsa Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Síu&annálabirtir..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Breyta \"Ekki við\" svörum..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "Stilla &tilkynningar..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages"
 msgid "Delayed Messages..."
 msgstr "Eyði bréfum"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Leita að bréfi..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, fuzzy, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Eytt"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Fl&ytja þráð í ruslið"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Setja þráð í ruslakörfuna"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Eyða &þræði"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Leita að bréfi..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Velja &öll bréf"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, fuzzy, kde-format
 msgid "&Mailing List Management..."
 msgstr "U&msjón póstlista"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Velj&a flýtilykil..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Gildisloka stillingar"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "&Archive Folder..."
 msgstr "&Ný mappa..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Hlaða inn &utanaðkomandi tilvísunum"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Message To..."
 msgstr "Nýtt bréf til..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Move Message To..."
 msgstr "Nýtt bréf til..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nýtt bréf..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, fuzzy, kde-format
 #| msgid "New"
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Ný"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, fuzzy, kde-format
 msgid "Message From &Template"
 msgstr "Engin ný bréf frá miðlara"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nýtt bréf á póst&lista..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Búa til sí&u"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "&Sía eftir viðfangsefni..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Sía e&ftir sendanda..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Sía eftir mót&takanda..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Sía eftir mót&takanda..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Merkja &þráð"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Merkja þráð sem &lesin"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Merkja öll bréf í völdum þræði sem lesin"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Merkja þráð sem &ólesinn"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Merkja öll bréf í völdum þræði sem ólesin"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Merkja þráð sem &áríðandi"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Fjarlægja áríðandimerki af þræði"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, fuzzy, kde-format
 #| msgid "Mark Thread as &New"
 msgid "Mark Thread as &Action Item"
 msgstr "Merkja þráð sem &nýjan"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 #| msgid "Remove &Important Message Mark"
 msgid "Remove &Action Item Thread Mark"
 msgstr "Fjarlægja áríðandimerk&i af bréfi"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Fylgjast með þræði"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Hunsa þráð"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Vi&sta viðhengi..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Decrypted To..."
 msgstr "Nýtt bréf til..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "&Virkja allar síur"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4676,13 +4692,13 @@
 msgid "&Expand Thread / Group"
 msgstr "&Opna þráð"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "Opna valinn þráð"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4690,124 +4706,124 @@
 msgid "&Collapse Thread / Group"
 msgstr "&Fella saman þráð"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "Fella saman valinn þráð"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Opna &alla þræði"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Opna alla þræði í valinni möppu"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "&Fella saman alla þræði"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Fella saman alla þræði í valinni möppu"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Sýn&a bréf"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Næsta bréf"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Fara að næsta bréfi"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Næsta ó&lesna bréf"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, fuzzy, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Næsta"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Fara að næsta ólesna bréfi"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Fyrra bréf"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Fara að fyrra bréfi"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Fy&rra ólesið bréf"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, fuzzy, kde-format
 #| msgid "&Previous Card"
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "&Fyrra kort"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Fara að fyrra ólesna bréfi"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Næsta ólesna &mappa"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Fara í næstu möppu með ólesnum bréfum"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Fyrri ólesna m&appa"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Fara í fyrri möppu með ólesnum bréfum"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Fara að næsta ólesna &texta"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Fara að næsta ólesna texta"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4815,239 +4831,245 @@
 msgstr ""
 "Fletta niður núverandi bréf. Ef á enda bréfs, fara í næsta ólesna bréf."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Stilla síu&r..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Sýsla með &Sieve skriftur..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Bæta við tengingu"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail Kynn&ing"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Sýna inngangssíðu KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Stilla &tilkynningar..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Stilla &KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Úrelda..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, fuzzy, kde-format
 #| msgid "&New Folder..."
 msgid "Add Favorite Folder..."
 msgstr "&Ný mappa..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Serverside Subscription..."
 msgstr "Áskrift..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "&Virkja allar síur"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "Stilla &KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "New AddressBook Contact..."
 msgstr "Opna í vistfangaskrá"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Afrita bréf yfir í möppu"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, fuzzy, kde-format
 msgid "Jump to Folder..."
 msgstr "Afrita í möppu"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Hætta við núverandi aðgerð"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Beina athygli að næstu möppu"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Beina athygli að fyrri möppu"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Veldu virka möppu"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "Beina athygli að næstu möppu"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "Beina athygli að næstu möppu"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Beina athygli að næstu bréfi"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Beina athygli að fyrra bréfi"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "Velja &öll bréf"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "Velja &öll bréf"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Veldu virka bréfið"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, fuzzy, kde-format
 #| msgid "Reset Quick Search"
 msgid "Set Focus to Quick Search"
 msgstr "Frumstilla flýtileit"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, fuzzy, kde-format
 #| msgid "Focus on Previous Message"
 msgid "Extend Selection to Previous Message"
 msgstr "Beina athygli að fyrra bréfi"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, fuzzy, kde-format
 #| msgid "Focus on Next Message"
 msgid "Extend Selection to Next Message"
 msgstr "Beina athygli að næstu bréfi"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Færa bréf í möppu"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message W&indow"
 msgid "Use Less Bandwidth"
 msgstr "Bréfaglugg&i"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 msgid "Account &Settings"
 msgstr "&Sending"
 
 #: kmmainwidget.cpp:3590
 #, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "Heiti auðkennis"
+
+#: kmmainwidget.cpp:3601
+#, fuzzy, kde-format
 msgid "Add Favorite Folder"
 msgstr "Ný mappa"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Tæ&ma rusl"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Færa öll bréf í &ruslið"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Eyða leit"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Breyta skriftu..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "%1 sía"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Áskrift..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -5058,12 +5080,12 @@
 "misnotkun þeirra sem senda ruslpóst.  HTML er jafnframt ákaflega flókin "
 "tækni og gallar í útfærslu hennar gætu veikt öryggi tölvunnar þinnar."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Nota HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -5073,196 +5095,196 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "&Hætta við"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Starting..."
 msgstr "Áskrift..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Setja í ruslið"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, fuzzy, kde-format
 #| msgid "trash"
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Rusl"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Setja bréf í ruslakörfuna"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Move Messages to Folder"
 msgid "Cannot copy item. %1"
 msgstr "Flytja bréf í möppu"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nýtt bréf til..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Senda svar til..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Framsenda til..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Name of the attachment:"
 msgid "Add to Existing Contact"
 msgstr "Nafn viðhengis:"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Opna í vistfangaskrá"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Bókamerkja þennan tengil"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit contact..."
 msgstr "Breyta skriftu..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Vista tengil sem..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Leita í bréfi..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "Vista tengil sem..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Show HTML stat&us bar"
 msgid "Show HTML Format"
 msgstr "Sýna HTML stöð&uslá"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 #| msgid "Load external references from the Internet for this message."
 msgid "Load external reference when mail comes for this contact"
 msgstr "Hlaða inn utanaðkomandi tilvísunum frá Internetinu fyrir þetta bréf."
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "Vista tengil sem..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG stuðningur"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "Sta&ðfesta áður en sent er"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE póstforrit"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folderlist"
 msgid "Retrieving Folder Contents"
 msgstr "Tek á móti möppulista"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Augnablik..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "Vinna í ótengdum ham"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5276,7 +5298,7 @@
 "ótengdum ham. Smelltu <a href=\"kmail:goOnline\">hér</a> til að "
 "tengjast . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5290,24 +5312,24 @@
 "ótengdum ham. Smelltu <a href=\"kmail:goOnline\">hér</a> til að "
 "tengjast . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully"
 msgid "Contact modified successfully"
 msgstr "Tókst að færa bréf"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nýr póstur í"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, fuzzy, kde-format
 #| msgid "There are no unread messages"
 msgid "There are no unread messages"
 msgstr "Það eru engin ólesin bréf"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, fuzzy, kde-format
 #| msgid "Unread Message"
 msgid "1 unread message"
@@ -5331,8 +5353,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5425,18 +5447,18 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Netföng"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5485,28 +5507,28 @@
 msgid "All"
 msgstr "Allar"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2005, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2005, KMail teymið"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5535,7 +5557,7 @@
 msgid "&Reply"
 msgstr "&Svara"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Svara..."
@@ -5545,12 +5567,12 @@
 msgid "Reply to A&uthor..."
 msgstr "S&vara sendanda..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "S&vara öllum..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Svara til póst&lista..."
@@ -5582,7 +5604,7 @@
 msgid "&Edit As New"
 msgstr "&Breyta bréfi"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5796,119 +5818,119 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Finna bréf"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, fuzzy, kde-format
 #| msgid "&Search"
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Leita"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, fuzzy, kde-format
 #| msgid "&Inline..."
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "Setja &inn skrá..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Sem viðhen&gi..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Vista viðhengi..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Hreinsa val"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 msgid "Jump to original folder"
 msgstr "Afrita í möppu"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 passaði"
 msgstr[1] "%1 pössuðu"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Síðasta leit"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 #| msgid "Could not sync maildir folder."
 msgid "You did not selected a valid folder."
 msgstr "Gat ekki samræmt 'maildir' möppu."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Searching..."
 msgstr "Áskrift..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Move Messages to Folder"
 msgid "Cannot get search result. %1"
 msgstr "Flytja bréf í möppu"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 msgid "Search failed."
 msgstr "Hætt við leit"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid " completed"
 msgid "Search complete."
 msgstr " lauk"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 msgid "Search stopped."
 msgstr "&Leita"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5916,21 +5938,21 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, fuzzy, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Verkþáttur"
 msgstr[1] "Verkþáttur"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, fuzzy, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Eyða bréfum"
 msgstr[1] "Eyða bréfum"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Checking index status..."
@@ -6059,7 +6081,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -6067,7 +6089,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -6077,20 +6099,20 @@
 "ei."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 #| msgid "Show quick search line edit"
 msgid "Show folder quick search line edit"
 msgstr "Sýna flýtileitarlínu"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if root certificate expires in &less than:"
 msgid "Warn if the number of recipients is more than:"
@@ -6098,7 +6120,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -6107,20 +6129,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "Sta&ðfesta áður en sent er"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Biðja s&jálfkrafa um tilkynningar um afdrif bréfa"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -6136,13 +6158,13 @@
 "tilkynningu um afdrif bréfs</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Tími milli sjálf&virkrar vistunar:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -6154,156 +6176,156 @@
 "setur þú gildið til 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Bréfaskoðari"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, fuzzy, kde-format
 #| msgid "&Do not show a message preview pane"
 msgid "Do not show a message preview pane"
 msgstr "Ekki sýna bréfas&koðarann"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane belo&w the message list"
 msgid "Show the message preview pane below the message list"
 msgstr "Sýna bréfaskoðarann fyrir n&eðan bréfalistann"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, fuzzy, kde-format
 #| msgid "Show the message preview pane ne&xt to the message list"
 msgid "Show the message preview pane next to the message list"
 msgstr "Sýna bréfaskoðarann við &hliðina á bréfalistanum"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Möppulisti"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, fuzzy, kde-format
 #| msgid "Lon&g folder list"
 msgid "Long folder list"
 msgstr "Lan&gur möppulisti"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, fuzzy, kde-format
 #| msgid "Shor&t folder list"
 msgid "Short folder list"
 msgstr "St&uttur möppulisti"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, fuzzy, kde-format
 msgid "Message template for new message"
 msgstr "Bréfalisti - ný bréf"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, fuzzy, kde-format
 msgid "Message template for reply"
 msgstr "Merkja bréf sem ekki á&framsent"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, fuzzy, kde-format
 msgid "Message template for reply to all"
 msgstr "Merkja bréf sem ekki á&framsent"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, fuzzy, kde-format
 msgid "Message template for forward"
 msgstr "Merkja bréf sem ekki á&framsent"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, fuzzy, kde-format
 msgid "Quote characters"
 msgstr "Setja inn &gæsalappir"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6311,7 +6333,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6319,7 +6341,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6327,7 +6349,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6335,7 +6357,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6343,7 +6365,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6631,7 +6653,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -7002,10 +7024,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check &Mail"
-msgid "Check Mail Url Tracking"
-msgstr "Gá að &pósti"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7689,6 +7710,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Kveikja á öllum \"Ekki spyrja aftur\" viðvörunum"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7750,6 +7781,11 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Check &Mail"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Gá að &pósti"
+
 #~ msgid "&Reply to:"
 #~ msgstr "Senda sva&r til:"
 
@@ -11249,11 +11285,6 @@
 #~ msgstr "Fjarlægja auðkenni"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Heiti auðkennis"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "Miðlari &styður Sieve"
@@ -13216,12 +13247,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "Opna slóð..."
 
-#, fuzzy
-#~| msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "<qt>Viltu örugglega keyra <b>%1</b>?</qt>"
-
 #~ msgid "Execute"
 #~ msgstr "Keyra"
 
diff -Nru kmail-19.04.3/po/it/akonadi_archivemail_agent.po kmail-19.12.3/po/it/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/it/akonadi_archivemail_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/it/akonadi_archivemail_agent.po	2020-03-03 00:34:06.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the archivemailagent package.
-# Luigi Toscano <luigi.toscano@tiscali.it>, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: archivemailagent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-31 14:09+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.1\n"
 
 #: addarchivemaildialog.cpp:44
 #, kde-format
@@ -176,13 +176,13 @@
 "Impossibile aggiungere un secondo archivio per questa cartella. Modificare "
 "invece quello esistente."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "La cartella non esiste. Verifica le impostazioni; archiviazione rimandata."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Inizio archiviazione in %1"
diff -Nru kmail-19.04.3/po/it/akonadi_followupreminder_agent.po kmail-19.12.3/po/it/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/it/akonadi_followupreminder_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/it/akonadi_followupreminder_agent.po	2020-03-03 00:34:05.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Luigi Toscano <luigi.toscano@tiscali.it>, 2014, 2015, 2016, 2017, 2018.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-31 14:09+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -15,99 +15,99 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.1\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agente per gli avvisi delle azioni da seguire"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Avvisi delle azioni da seguire"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Responsabile"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Luigi Toscano"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "luigi.toscano@tiscali.it"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Oggetto"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Scadenza"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Risposta"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Ricevuto"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "In attesa"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Mostra messaggio"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Elimina"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Vuoi rimuovere questo elemento selezionato?"
 msgstr[1] "Vuoi rimuovere questi %1 elementi selezionati?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Ricevuta risposta da %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Aspetti ancora una risposta riguardo questo messaggio:"
diff -Nru kmail-19.04.3/po/it/akonadi_mailfilter_agent.po kmail-19.12.3/po/it/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/it/akonadi_mailfilter_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/it/akonadi_mailfilter_agent.po	2020-03-03 00:34:05.000000000 +0000
@@ -1,13 +1,13 @@
 # translation of mailfilteragent.po to Italian
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the mailfilteragent package.
-# Luigi Toscano <luigi.toscano@tiscali.it>, 2011, 2012, 2013, 2014, 2018.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2011, 2012, 2013, 2014, 2018, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mailfilteragent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-10-02 19:02+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -16,24 +16,24 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.1\n"
 
 #: filterlogdialog.cpp:67
 #, kde-format
 msgid "Filter Log Viewer"
 msgstr "Visualizzatore dei log dei filtri"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Condividi..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Registra attività dei fi&ltri"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -43,23 +43,23 @@
 "all'attività dei filtri. Naturalmente, questi dati vengono registrati e "
 "visualizzati solo quando la registrazione è attivata. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Dettagli registrazione"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Registra la descrizione dei pattern"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Registra l'esecuzione delle &regole di filtro"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -74,34 +74,34 @@
 "filtro; in alternativa, puoi avere il risultato dell'elaborazione di tutte "
 "le regole di un solo filtro."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Registra l'esecuzione dei pattern dei filtri"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Registra le azioni di filtro"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Dimensione massima log:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "illimitata"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -115,7 +115,7 @@
 "verranno cancellati fino a che la dimensione totale non raggiunga il limite "
 "impostato. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -124,63 +124,63 @@
 "Impossibile scrivere il file %1:\n"
 "«%2» è la descrizione dettagliata del messaggio di errore."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Errore KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtraggio messaggio %1 di %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Errore applicando uno filtro di spostamento"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Errore applicando uno filtro di eliminazione"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Errore applicando un filtro di modifica"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Esecuzione regole di filtro:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Regole di filtro corrispondenti.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Inizio del filtraggio del messaggio «%1» da «%2» a «%3»:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtraggio dei messaggi"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Log dei filtri di posta abilitato"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Pronto"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtraggio in %1"
diff -Nru kmail-19.04.3/po/it/akonadi_sendlater_agent.po kmail-19.12.3/po/it/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/it/akonadi_sendlater_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/it/akonadi_sendlater_agent.po	2020-03-03 00:34:06.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the akonadi_sendlater_agent package.
-# Luigi Toscano <luigi.toscano@tiscali.it>, 2013, 2014, 2015, 2016, 2017, 2018.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-12-31 14:15+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.1\n"
 
 #: sendlaterconfiguredialog.cpp:37
 #, kde-format
@@ -59,124 +59,124 @@
 msgid "Your emails"
 msgstr "luigi.toscano@tiscali.it"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "A"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Oggetto"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Orario spedizione"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Ricorrente"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID del messaggio"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Nessun messaggio in attesa..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Spedisci ora"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Elimina"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Sì"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "No"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Vuoi eliminare l'elemento selezionato?"
 msgstr[1] "Vuoi eliminare gli elementi selezionati?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Rimuovi elementi"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Vuoi rimuovere anche i messaggi?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Rimuovi messaggi"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Messaggio non trovato."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Nessun messaggio trovato."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Errore durante il recupero del messaggio."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Impossibile recuperare il messaggio. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Impossibile creare il trasporto"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Il messaggio non è un vero messaggio"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Impossibile inviare il messaggio."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "È stato trovato un errore. Vuoi rispedire il messaggio?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Rilevato un errore"
diff -Nru kmail-19.04.3/po/it/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/it/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/it/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/it/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:06.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the kmail package.
-# Luigi Toscano <luigi.toscano@tiscali.it>, 2018.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2018, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-18 23:05+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.1\n"
 
 #: settingsdialog.cpp:63
 #, kde-format
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Sincronizzazione casella di posta unificata %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Aggiungi una casella di posta unificata"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nome:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Scegli icona..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Icona:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Posta in arrivo"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Posta inviata"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Bozze"
diff -Nru kmail-19.04.3/po/it/docs/akonadi_archivemail_agent/index.docbook kmail-19.12.3/po/it/docs/akonadi_archivemail_agent/index.docbook
--- kmail-19.04.3/po/it/docs/akonadi_archivemail_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/it/docs/akonadi_archivemail_agent/index.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -55,9 +55,9 @@
 >&FDLNotice;</legalnotice>
 
 <date
->2013-08-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.11</releaseinfo>
+>Applications 19.12</releaseinfo>
 </articleinfo>
 
 <sect1 id="introduction">
@@ -75,7 +75,7 @@
 <para
 >Usa <menuchoice
 ><guimenu
->Strumenti</guimenu
+>Impostazioni</guimenu
 ><guimenuitem
 >Configura l'archiviazione automatica...</guimenuitem
 > </menuchoice
@@ -123,7 +123,7 @@
 >, il percorso della cartella selezionata nell'elenco delle cartelle di &kmail;, la data nel formato <userinput
 >anno-mese-giorno</userinput
 > e l'estensione selezionata, &eg; <filename
->Archivio_Cartelle locali_posta in arrivo_2013-09-03.tar.bz2</filename
+>Archivio_Cartelle locali_posta in arrivo_2019-09-03.tar.bz2</filename
 >. </para
 ></listitem>
 <listitem
@@ -178,6 +178,18 @@
 <para
 >Puoi usare la casella alla sinistra di ogni voce nell'elenco per abilitare o disabilitare la relativa operazione di archiviazione. </para>
 <para
+>È possibile accedere a questa finestra di configurazione successivamente tramite <menuchoice
+><guimenu
+>Impostazioni</guimenu
+> <guimenuitem
+>Configura &kmail;...</guimenuitem
+></menuchoice
+>, selezionando la pagina <guilabel
+>Estensioni</guilabel
+> nella finestra principale di &kmail; e premendo il pulsante di configurazione relativo all'elemento <guilabel
+>Agente di archiviazione della posta</guilabel
+>. </para>
+<para
 >Tramite il menu contestuale attivato dal clic del &RMB; su un'operazione di archiviazione puoi aprire la cartella contenente gli archivi o eseguire immediatamente l'operazione di archiviazione. Questa sovrascriverà senza notifica un eventuale archivio preesistente creato in precedenza nello stesso giorno. </para>
 
 </sect2>
@@ -190,16 +202,15 @@
 <para
 >&i18n-archivemailagent;</para>
 <para
->Copyright del programma 2013 Laurent Montel montel@kde.org </para>
+>Copyright del programma 2013-2019 Laurent Montel montel@kde.org </para>
 <para
->Copyright della documentazione &copy; 2013 Laurent Montel montel@kde.org </para>
+>Copyright della documentazione &copy; 2013-2019 Laurent Montel montel@kde.org </para>
 
 <para
 >Traduzione italiana di Luigi Toscano <email
 >luigi.toscano@tiscali.it</email
 ></para
-> 
-&underFDL; &underGPL; </sect2>
+> &underFDL; &underGPL; </sect2>
 
 </sect1>
 
diff -Nru kmail-19.04.3/po/it/docs/akonadi_followupreminder_agent/index.docbook kmail-19.12.3/po/it/docs/akonadi_followupreminder_agent/index.docbook
--- kmail-19.04.3/po/it/docs/akonadi_followupreminder_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/it/docs/akonadi_followupreminder_agent/index.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -47,9 +47,9 @@
 </copyright>
 
 <date
->2014-06-10</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.14</releaseinfo>
+>Applications 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -60,6 +60,78 @@
 <para
 >&i18n-followupreminderagent; è un agente Akonadi che segue i messaggi promemoria </para>
 
+<sect2 id="using-kapp">
+<title
+>Uso del &i18n-followupreminderagent;</title>
+
+<para
+>Usa <menuchoice
+><guimenu
+>Opzioni</guimenu
+><guimenuitem
+>Crea avviso per un'azione da seguire</guimenuitem
+></menuchoice
+> nella finestra di composizione di &kmail; per aprire una finestra di dialogo che ti permette di creare un promemoria per dare un seguito in una certa data alle azioni relativa al messaggio di posta attuale.</para>
+
+<screenshot>
+<screeninfo
+>Finestra di dialogo &i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="add-followup-reminder.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Finestra di dialogo &i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para
+>Finestra di dialogo &i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+<para
+>Premi il pulsante con la freccia in basso relativo al pulsante <guilabel
+>Data</guilabel
+> per selezionare la data dall'oggetto di calendario di &kde;. È anche possibile scegliere il calendario per il promemoria tramite l'elenco a discesa <guilabel
+>Salva cosa da fare in</guilabel
+>.</para>
+<para
+>Per rimuovere i promemoria programmati, usa <menuchoice
+><guimenu
+>Impostazioni</guimenu
+> <guimenuitem
+>Configura &kmail;</guimenuitem
+></menuchoice
+>, quindi seleziona la pagina <guilabel
+>Estensioni</guilabel
+> in &kmail; e premi il pulsante di configurazione relativo all'elemento <guilabel
+>Agente per gli avvisi delle azioni da seguire</guilabel
+>. Quindi usa il menu di contesto accessibile con un clic del &RMB; su un elemento di promemoria per selezionarne l'azione <guimenuitem
+>Elimina</guimenuitem
+>. </para>
+
+<screenshot>
+<screeninfo
+>Configura &i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="followupreminder-configure.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Configura &i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para
+>Configura &i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+</sect2>
+
 <sect2 id="credits">
 
 <title
@@ -68,16 +140,15 @@
 <para
 >&i18n-followupreminderagent;</para>
 <para
->Copyright del programma 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright del programma 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Documentation Copyright &copy; 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Documentation Copyright &copy; 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Traduzione italiana di Luigi Toscano <email
 >luigi.toscano@tiscali.it</email
 ></para
-> 
-&underFDL; &underGPL; </sect2>
+> &underFDL; &underGPL; </sect2>
 
 </sect1>
 
diff -Nru kmail-19.04.3/po/it/docs/akonadi_sendlater_agent/index.docbook kmail-19.12.3/po/it/docs/akonadi_sendlater_agent/index.docbook
--- kmail-19.04.3/po/it/docs/akonadi_sendlater_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/it/docs/akonadi_sendlater_agent/index.docbook	2020-03-03 00:34:20.000000000 +0000
@@ -57,9 +57,9 @@
 </copyright>
 
 <date
->2013-11-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.12</releaseinfo>
+>Applications 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -126,9 +126,13 @@
 ><guimenu
 >Impostazioni</guimenu
 > <guimenuitem
->Configura l'agente per l'invio posticipato...</guimenuitem
+>Configura &kmail;</guimenuitem
 ></menuchoice
-> in &kmail;. </para>
+>, quindi seleziona la pagina <guilabel
+>Estensioni</guilabel
+> in &kmail; e premi il pulsante di configurazione relativo all'elemento <guilabel
+>Configura l'agente per l'invio posticipato</guilabel
+>. </para>
 
 <screenshot>
 <screeninfo
@@ -164,16 +168,15 @@
 <para
 >&i18n-sendlateragent;</para>
 <para
->Copyright del programma 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright del programma 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Copyright della documentazione &copy; 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Copyright della documentazione &copy; 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Traduzione italiana di Luigi Toscano <email
 >luigi.toscano@tiscali.it</email
 ></para
-> 
-&underFDL; &underGPL; </sect2>
+> &underFDL; &underGPL; </sect2>
 
 </sect1>
 
diff -Nru kmail-19.04.3/po/it/docs/ktnef/index.docbook kmail-19.12.3/po/it/docs/ktnef/index.docbook
--- kmail-19.04.3/po/it/docs/ktnef/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/it/docs/ktnef/index.docbook	2020-03-03 00:34:21.000000000 +0000
@@ -168,7 +168,6 @@
 >Traduzione di Luigi Toscano<email
 >luigi.toscano@tiscali.it</email
 ></para
-> 
-&underFDL; &underGPL; </sect1>
+> &underFDL; &underGPL; </sect1>
 
 </article>
diff -Nru kmail-19.04.3/po/it/kmail.po kmail-19.12.3/po/it/kmail.po
--- kmail-19.04.3/po/it/kmail.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/it/kmail.po	2020-03-03 00:34:05.000000000 +0000
@@ -6,13 +6,13 @@
 # Alessandro Pasotti <ale.pas@tiscalinet.it>, 2006.
 # Vincenzo Reale <smart2128@baslug.org>, 2007, 2008, 2010.
 # Nicola Ruggero <nicola@nxnt.org>, 2007.
-# Luigi Toscano <luigi.toscano@tiscali.it>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-03-21 00:28+0100\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-11-16 16:40+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
 "Language: it\n"
@@ -20,7 +20,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.12.0\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -187,8 +187,8 @@
 msgstr "Chiavi di cifratura multiple per indirizzo"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -295,27 +295,27 @@
 "KMail non è riuscito a identificare con precisione una mailing list in "
 "questa cartella. Riempi gli indirizzi a mano."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Utilizzo:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Stato:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "piena al %p%"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 su %2 usati"
@@ -338,7 +338,7 @@
 "associare a questa cartella.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Modelli"
@@ -349,106 +349,106 @@
 msgstr "&Usa modelli personalizzati di messaggio in questa cartella"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copia modelli globali"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vista"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "&Utilizza icone personalizzate"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normale:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Non letti:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Mostra la colonna mittente/destinatario nella lista dei messaggi"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "M&ostra colonna:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Predefinito"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Mittente"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatario"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Elenco dei messaggi"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Usa l'aggregazione predefinita"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Aggregazione"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Usa il tema predefinito"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Formato predefinito del messaggio"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Preferisci l'HTML al testo"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Preferisci il testo all'HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Usa le impostazioni globali"
@@ -458,100 +458,105 @@
 msgid "Retrieval Options"
 msgstr "Opzioni di recupero"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identità"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Ricezione"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Spedizione"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Server LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Account di uscita (aggiungine almeno uno):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opzioni comuni"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Conferma &prima di spedire"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Controlla l'ortografia prima di spedire"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Mai automaticamente"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "In caso di controllo manuale della posta"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "In caso di controllo di tutte le caselle"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Spedisci ora"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Spedisci più tardi"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Spedisci i &messaggi della «Posta in uscita»:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Meto&do di spedizione predefinito:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Abilita annullamento invio"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Aggiungi account di posta..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Account personalizzato..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -560,30 +565,30 @@
 "Impossibile avviare la procedura guidata per la creazione di account. "
 "Assicurati che Account\tWizard sia correttamente installato."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Impossibile eseguire la procedura guidata per la creazione di account"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Includi nel controllo manuale della posta"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Passa in modalità non in linea alla chiusura di KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Controlla la posta all'avvio"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -641,7 +646,7 @@
 msgid "Fixed Width Font"
 msgstr "Carattere a dimensione fissa"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Compositore"
@@ -950,61 +955,61 @@
 msgstr ""
 "Impossibile creare l'etichetta. Esiste già un'etichetta con lo stesso nome."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Generale"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Modelli standard"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Modelli personalizzati"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Oggetto"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Insieme di caratteri"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Intestazioni"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Allegati"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Correzione automatica"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Ridimensionamento automatico immagine"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Firma"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1013,12 +1018,12 @@
 "Inserisci automaticamente la firma configurata\n"
 "quando si inizia a scrivere un messaggio"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Inserisci la firma sopra ogni testo citato"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1027,18 +1032,18 @@
 "Inserisce il separatore di firma conforme al RFC\n"
 "(due trattini ed uno spazio su una riga) prima della firma"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Quando rispondi, non citare alcuna firma esistente"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formato"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1049,7 +1054,7 @@
 "(invece del messaggio completo), quando è \n"
 "selezionato del testo nella finestra del messaggio."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1062,17 +1067,17 @@
 "ritorno a capo su\n"
 "del testo andato a capo automaticamente."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Imposta il ritorno a capo automatico alla larghezza specificata"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Imposta la larghezza del testo per il ritorno a capo automatico"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1083,7 +1088,7 @@
 "solo nel formato originale in cui è stato ricevuto;\n"
 "altrimenti, se non marcata, la risposta sarà inviata come testo semplice."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1095,34 +1100,34 @@
 "riferimenti\n"
 "esterni sono supportati."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "In linea"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Come allegato"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Imposta il formato predefinito per i messaggi inoltrati"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tipo di inoltro predefinito:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1134,17 +1139,17 @@
 "Puoi abilitare questa opzione sui singoli messaggi usando «Opzioni - "
 "Richiedi notifica delle disposizioni»"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Avvisa se sono stati specificati troppi destinatari"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Imposta il numero massimo di destinatari per l'avviso"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1161,7 +1166,7 @@
 "persone. Nota che, tuttavia, questo limite non considera le liste di\n"
 "distribuzione o le mailing list."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1170,18 +1175,18 @@
 "Ricorda gli indirizzi recentemente inseriti,\n"
 "e li suggerisce per il completamento dei destinatari"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Non salvare"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Numero massimo di indirizzi recenti ricordati:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1190,23 +1195,23 @@
 "Il numero massimo di indirizzi inseriti recentemente che saranno\n"
 "ricordati e usati per il complemento"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configura completamento..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Salvataggio automatico"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Disattiva salvataggio automatico"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1214,18 +1219,18 @@
 msgstr[0] " minuto"
 msgstr[1] " min"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Salva automaticamente il messaggio dopo questo intervallo di tempo"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefissi nell'oggetto della r&isposta"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1235,59 +1240,59 @@
 "(le voci sono espressioni regolari senza distinzione tra maiuscole e "
 "minuscole):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Aggiungi..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Ri&muovi"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mod&ifica..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Inserisci nuovo prefisso per la risposta:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefissi nell'oggetto dell'i&noltro"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Aggiungi..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Rimuo&vi"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Inserisci nuovo prefisso per l'inoltro:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1297,73 +1302,73 @@
 "basso per un insieme di caratteri che contenga tutti i caratteri richiesti."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modifica..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Inserisci un insieme di caratteri:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Mantieni l'insieme di caratteri originale nella risposta o nell'inoltro (se "
 "possibile)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Questo insieme di caratteri non è supportato."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Utilizza suffisso message-id personalizzato"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Suffisso personalizzato message-&id:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definisci intestazioni MIME personalizzate:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nome"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valore"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "N&uovo"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valore:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
@@ -1371,17 +1376,17 @@
 "«Content-Type» non è una stringa autorizzata. Questa intestazione non sarà "
 "salvata."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Intestazione non valida"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomi degli allegati compatibili con Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1390,40 +1395,40 @@
 "Abilita questa opzione per rendere i nomi dei tuoi allegati che contengono "
 "caratteri non standard, compatibili con Outlook(tm)"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "A&bilita rilevamento di allegati mancanti"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Riconosci una delle seguenti parole chiave come intenzione di allegare un "
 "file:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Inserisci una nuova parola chiave:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Dimensione massima degli allegati:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Nessun limite"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1507,10 +1512,9 @@
 msgstr "Estensioni per lo stile dell'intestazione"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
-#, fuzzy, kde-format
-#| msgid "Composer Plugins"
-msgid "Convertor Text Plugins"
-msgstr "Estensioni di tipo compositore"
+#, kde-format
+msgid "Text Conversion Plugins"
+msgstr "Estensioni di conversione del testo"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1624,7 +1628,7 @@
 msgid "Archive Folder"
 msgstr "Archivia cartella"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1690,19 +1694,19 @@
 msgid "Notification"
 msgstr "Notifica"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "un allegato (%2)"
 msgstr[1] "%1 allegati (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Nascondi la lista degli allegati"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Mostra la lista degli allegati"
@@ -1719,333 +1723,333 @@
 msgid "Encoding"
 msgstr "Codifica"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Seleziona il dizionario da usare quando effettui il controllo ortografico di "
 "questo messaggio"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Seleziona la cartella posta inviata dove sarà salvata una copia di questo "
 "messaggio"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Seleziona l'account in uscita da usare per inviare questo messaggio"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Seleziona l'indirizzo di posta elettronica «Da:» per questo messaggio"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Imposta l'oggetto del messaggio"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identità:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Dizionario:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Cartella della posta &inviata:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Trasporto &posta:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Da:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Oggetto:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Spedisci messaggio"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Spedisci messaggio attraverso"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Invia"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Spedisci &più tardi"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Spedisci &più tardi attraverso"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Accoda"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Salva come &bozza"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Salva messaggio nelle cartella delle bozze"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Salva come &modello"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Salva messaggio nelle cartella dei modelli"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Salva come &file"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Salva messaggio di posta come file di testo o HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Inserisci file di testo..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Inserisci file recente di testo"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Rubrica indirizzi"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Apri la rubrica degli indirizzi"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nuovo compositore"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Seleziona &destinatari..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Salva lista di &distribuzione..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Incolla come all&egato"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Pulisci spa&zi"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Utilizza caratteri a dimensione &fissa"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgente"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Richiedi notifica delle disposizioni"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "&Richiedi conferma della consegna"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "A &capo automatico"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Frammenti"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Controllo ortografico &automatico"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Modifica del testo formattato"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Testo formattato"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Passa/esci dalla modalità di modifica del testo formattato"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Tutti i campi"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identità"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Dizionario"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Cartella della po&sta inviata"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Trasporto posta"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Da"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Oggetto"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Inserisci la &firma in fondo"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Inserisci la firma prima del m&essaggio"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Inserisci la firma alla posizione del c&ursore"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Controllo &ortografico..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Controllo ortografico"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Cifra il messaggio"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Cifra"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Firma il messaggio"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Firma"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Formato &crittografico del messaggio"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Seleziona un formato crittografico per questo messaggio"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Crea avviso per un'azione da seguire..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configura KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2054,53 +2058,53 @@
 "<qt>Questo nasconderà completamente la barra dei menu. Potrai mostrarla "
 "nuovamente digitando %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Nascondi la barra dei menu"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Riga: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Colonna: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "SSC"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Controllo ortografico: attivo"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Controllo ortografico: inattivo"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "&Salva di nuovo come modello"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Salva come bozza"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2109,7 +2113,7 @@
 "Salva di nuovo il messaggio nella cartella Modelli. Potrà essere utilizzato "
 "in un secondo momento."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2118,84 +2122,84 @@
 "Salva il messaggio nella cartella bozze. In questo modo potrà essere "
 "modificato e inviato in un secondo momento."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
 "Vuoi salvare il messaggio per utilizzarlo più tardi, oppure vuoi "
 "abbandonarlo?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Chiudi compositore"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Salvataggio automatico del messaggio non riuscito"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Spedizione del messaggio non riuscita"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Inserisci file"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Aggiungi come immagine &in linea"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Aggiungi come &allegato"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nome dell'allegato:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Il nome dell'allegato non può essere vuoto"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Nome di allegato non valido"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Aggiungi l'URL nel messaggio"
 msgstr[1] "Aggiungi gli URL nel messaggio"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Aggiungi file come &allegato"
 msgstr[1] "Aggiungi file come &allegati"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Inserisci testo degli appunti come allegato"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "senza nome"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2208,12 +2212,12 @@
 "(OpenPGP o S/MIME) da usare.</p> <p>Scegli una chiave da utilizzare nel "
 "pannello di configurazione Identità.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Chiave di cifratura non definita"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2224,12 +2228,12 @@
 "la chiave di firma (OpenPGP o S/MIME) da utilizzare.</p> <p>Scegli la chiave "
 "da utilizzare nella finestra di configurazione identità.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Chiave di firma non definita"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2240,7 +2244,7 @@
 "inoltre, impostare il tuo indirizzo per tutte le identità, in modo da non "
 "inserirlo per ogni messaggio."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2248,59 +2252,59 @@
 msgstr ""
 "Devi specificare almeno un destinatario nel campo «A:», «CC» oppure «CCN»."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Il campo A: è vuoto. Spedire comunque il messaggio?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Nessun campo A: specificato"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Non hai specificato l'oggetto. Spedire comunque il messaggio?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nessun oggetto specificato"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Sp&edisci così com'è"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Specifica l'oggetto"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Devi specificare almeno un destinatario per poter cifrare una bozza."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Spedizione messaggio..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Invia conferma"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Spedisci &ora"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2309,22 +2313,22 @@
 "Stai cercando di inviare un messaggio di posta a più di %1 destinatari. "
 "Inviare comunque il messaggio?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Troppi destinatari"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Spedisci così com'è"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Modifica destinatari"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2332,22 +2336,22 @@
 msgstr ""
 "Disattivando la modalità HTML, il testo perderà la formattazione. Sei sicuro?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Perdere la formattazione?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perdi la formattazione"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Aggiungi testo semplice con marcatori"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2357,7 +2361,7 @@
 "destinatario (la chiave di cifratura è completamente affidabile). Fai clic "
 "sull'icona per maggiori informazioni."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2367,7 +2371,7 @@
 "destinatario (la chiave di cifratura è marginalmente affidabile). Fai clic "
 "sull'icona per maggiori informazioni."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2377,7 +2381,7 @@
 "destinatario (la chiave di cifratura non è affidabile). Fai clic sull'icona "
 "per maggiori informazioni."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2388,7 +2392,7 @@
 "sicurezza della cifratura è sconosciuto (non è stato possibile verificare la "
 "chiave di cifratura). Fai clic sull'icona per maggiori informazioni."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Informazioni sull'estensione editor"
@@ -2465,7 +2469,7 @@
 msgid "External editor was started."
 msgstr "È stato eseguito un editor esterno."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2474,21 +2478,21 @@
 "Il sistema di trasporto non è stato trovato. Verifica che userai un "
 "trasporto per la posta corretto."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Cartella di posta inviata non definita. Deve essere impostata prima di "
 "spedire posta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 "L'identità non è stata trovata. Verifica che userai un'identità corretta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2517,11 +2521,6 @@
 msgid "Message will not be encrypted"
 msgstr "Il messaggio non sarà cifrato"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Frammenti di testo"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2568,27 +2567,27 @@
 msgid "Cannot move messages."
 msgstr "Impossibile spostare il messaggio."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Impossibile prelevare la cartella. Errore restituito: %1."
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Nessuna cartella restituita."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Impossibile prelevare la cartella genitore. Errore restituito: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Impossibile restituire l'elenco delle cartelle."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Messaggi archiviato"
@@ -2629,48 +2628,48 @@
 msgid "&Existing identities:"
 msgstr "Identità &esistenti:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Errore durante la generazione di una nuova coppia di chiavi: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Errore nella generazione di chiavi"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Nessuna chiave"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Genera una nuova coppia di chiavi"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Generazione di una nuova coppia di chiavi..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Modifica identità"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Generale"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Il tuo nome:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2681,12 +2680,12 @@
 "così come vuoi venga visualizzato nell'intestazione del messaggio;</p> <p>Se "
 "lo lasci vuoto, apparirà solo il tuo indirizzo di posta.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zzazione:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2697,12 +2696,12 @@
 "tua organizzazione se vuoi che venga visualizzato nell'intestazione del "
 "messaggio.</p><p>È sicuro (e normale) lasciarlo vuoto.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Indirizzo di posta &elettronica:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2719,12 +2718,12 @@
 "inserisci in maniera errata, i destinatari avranno dei problemi a "
 "risponderti.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "A&lias di posta elettronica:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2742,12 +2741,12 @@
 "th><td>nome@dominiodiesempio.org<br>cognome@dominiodiesempio.org</td></tr></"
 "table><p>Digita un indirizzo alias in ogni riga.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Crittografia"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2763,12 +2762,12 @@
 "elettronica non verranno influenzate.</p><p>Puoi saperne di più sulle chiavi "
 "a <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Chiave di firma OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2787,12 +2786,12 @@
 "influenzate.</p><p>Puoi saperne di più sulle chiavi presso <a>https://www."
 "gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Chiave di cifratura OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2806,12 +2805,12 @@
 "messaggi utilizzando S/MIME; le funzionalità normali di posta elettronica "
 "non verranno influenzate.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificato di firma S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2827,39 +2826,39 @@
 "tuoi messaggi in uscita utilizzando S/MIME; le funzionalità normali di posta "
 "elettronica non verranno influenzate.</p> </qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificato di cifratura S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Formato preferito:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Firma automaticamente i messaggi"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Cifra automaticamente i messaggi quando possibile"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Indirizzo a cui &rispondere:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2878,12 +2877,12 @@
 "indirizzo di gruppo.</p><p>Se sei un dubbio, lascia questo campo vuoto.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Indirizzi &CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2900,12 +2899,12 @@
 "p><p>Per specificare più di un indirizzo, utilizza le virgole per separare i "
 "destinatari.</p><p>Se sei un dubbio, lascia il campo vuoto.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Indirizzi CC&N:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2923,57 +2922,57 @@
 "un indirizzo, utilizza le virgole per separare i destinatari.</p><p>Se sei "
 "un dubbio, lascia il campo vuoto.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&izionario:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Cartella della posta inviata:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Cartella delle &bozze:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Car&tella dei modelli:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Account di uscita:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Allega la mia vCard al messaggio"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Crea..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Lingua della correzione automatica:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Reimposta il nome di dominio predefinito"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Dominio predefini&to:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2982,33 +2981,33 @@
 "<qt> <p>Il dominio predefinito è utilizzato per il completamento degli "
 "indirizzi di posta elettronica costituiti solo dal nome utente.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Usa modelli personalizzati di messaggio per questa identità"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Firma"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Immagine"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Alias di posta elettronica «%1» non valido"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Indirizzo di posta elettronica non valido"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3022,7 +3021,7 @@
 "Ciò può causare dei problemi da parte di chi riceve al momento della "
 "verifica delle firme create con questa configurazione."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3032,7 +3031,7 @@
 "identificativo utente con un indirizzo di posta elettronica per questa "
 "identità (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3045,7 +3044,7 @@
 "Ciò può causare dei problemi da parte di chi riceve al momento della "
 "verifica delle firme create con questa configurazione."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3054,22 +3053,22 @@
 "Uno dei certificati di cifratura S/MIME configurati non contiene un "
 "indirizzo di posta elettronica per questa identità (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Indirizzo di posta non trovato nella chiave/certificati"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Il file della firma non è valido"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Modifica identità «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3078,7 +3077,7 @@
 "Una delle cartelle personalizzate per l'identità non esiste (più); pertanto "
 "verrà utilizzata la relativa cartella predefinita."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Modifica..."
@@ -3109,6 +3108,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Impossibile eliminare il file della vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Vuoi davvero annullare l'operazione?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Conferma"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3272,7 +3283,7 @@
 "Esempi sono disponibili all'indirizzo <a href=\"https://ace.home.xs4all.nl/X-"
 "Faces/\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Immagine"
@@ -3305,7 +3316,7 @@
 msgstr[0] "La lista di distribuzione %2 è vuota, non può essere usata."
 msgstr[1] "Le liste di distribuzione %2 sono vuote, non possono essere usate."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Aggiungi alla rubrica"
@@ -3315,22 +3326,22 @@
 msgid "Contact created successfully"
 msgstr "Contatto creato con successo"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Il contatto non può essere memorizzato:  %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Impossibile memorizzare il contatto"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Vuoi davvero allegare la cartella «%1»?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Allega cartella"
@@ -3545,14 +3556,14 @@
 msgstr "&Cartella"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Applica filtri ad una cartella"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3578,7 +3589,7 @@
 msgstr "&Inoltra"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&pplica filtro"
@@ -3603,7 +3614,7 @@
 msgstr "&Aiuto"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barra degli strumenti principale"
@@ -3656,12 +3667,12 @@
 msgid "The file does not contain a message."
 msgstr "Il file non contiene nessun messaggio."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Il file contiene più di un messaggio. Verrà mostrato solo il primo."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3670,32 +3681,32 @@
 "Vuoi inoltrare i messaggi selezionati come allegati in un messaggio (come un "
 "digest MIME) o come messaggi separati?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Spedisci come digest"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Spedisci singolarmente"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtraggio dei messaggi"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtraggio messaggio %1 di %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Spostamento messaggi"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Eliminazione messaggi"
@@ -3724,31 +3735,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Barra degli strumenti direzione del testo"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail è impostato per essere non in linea; tutte le operazioni di rete sono "
 "sospese"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Invia messaggio di posta"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Impossibile inviare il messaggio di posta"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail è impostato per essere in linea; tutte le operazioni di rete sono "
 "riprese"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3757,40 +3768,40 @@
 "KMail è impostato per essere in linea; tutte le operazioni di rete saranno "
 "riprese quando verrà trovata una connessione di rete"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail attualmente è in modalità non in linea. Come vuoi procedere?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "In linea/Non in linea"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Lavora in modalità in linea"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Lavora in modalità non in linea"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "Rilevata una connessione di rete, tutte le operazioni di rete sono riprese"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Nessuna connessione di rete rilevata, tutte le operazioni di rete sono "
 "sospese"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3799,12 +3810,12 @@
 "Apertura del file di salvataggio automatico in %1 non riuscita.\n"
 "Motivo: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Apertura del file di salvataggio automatico non riuscita"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3815,7 +3826,7 @@
 "Queste %1 identità sono state modificate per utilizzare il trasporto "
 "predefinito:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3826,43 +3837,47 @@
 "Queste %1 identità sono state modificate per utilizzare il trasporto "
 "modificato:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Spedizione messaggi"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Inizializzazione procedura di spedizione..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "La risorsa %1 è danneggiata."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"La risorsa %1 è danneggiata.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "L'agente di archiviazione della posta non era registrato."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "L'agente per l'invio posticipato non era registrato."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "L'agente per gli avvisi delle azioni da seguire non era registrato."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3871,12 +3886,12 @@
 "Impossibile avviare il gestore dei certificati; assicurati che Kleopatra sia "
 "correttamente installato."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Errore KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3885,28 +3900,28 @@
 "Impossibile avviare la procedura guidata per l'importazione. Assicurati che "
 "ImportWizard sia correttamente installato."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Impossibile eseguire la procedura guidata per l'importazione"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Impossibile avviare il programma «PIM Setting Exporter» (Esportatore delle "
-"impostazioni di PIM). Controlla l'installazione."
+"Impossibile avviare il programma «PIM Data Exporter» (Esportatore dai dati "
+"di PIM). Controlla l'installazione."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr ""
-"Impossibile avviare il programma «PIM Setting Exporter» (Esportatore delle "
-"impostazioni di PIM)"
+"Impossibile avviare il programma «PIM Data Exporter» (Esportatore dei dati "
+"di PIM)"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3915,72 +3930,72 @@
 "Impossibile avviare la procedura guidata per l'importazione. Assicurati che "
 "ImportWizard sia correttamente installato."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Impossibile eseguire la procedura guidata per l'importazione"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Un altro programma di posta elettronica è stato trovato nel sistema. Vuoi "
 "importarne i dati?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Impossibile avviare la procedura guidata per l'importazione. Controlla "
 "l'installazione."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Senza oggetto"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(nessun modello)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Questa cartella non ha nessuna scadenza impostata"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Sei sicuro di voler effettuare la scadenza della cartella <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Effettua scadenza della cartella"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Effettua &scadenza"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Svuota il cestino"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Cestina"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Vuoi davvero svuotare il cestino?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3989,27 +4004,27 @@
 "<qt>Sei sicuro di voler cestinare tutti i messaggi della cartella <b>%1</b>?"
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Tutti i messaggi sono stati cestinati"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Vuoi davvero effettuare la scadenza di tutti i vecchi messaggi?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Effettua scadenza dei vecchi messaggi?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Effettua scadenza"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4020,17 +4035,17 @@
 "\"spam\" e può aumentare la probabilità che il tuo sistema venga compromesso "
 "da attacchi presenti o futuri."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Avvertimento di sicurezza"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Carica riferimenti esterni"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4045,532 +4060,532 @@
 "<qt>Vuoi davvero eliminare i %1 messaggi selezionati?<br />Una volta "
 "eliminati, non potranno essere ripristinati.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Elimina messaggi"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Elimina messaggio"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Spostamento messaggi..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Eliminazione messaggi..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Messaggi eliminati correttamente."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Messaggi spostati correttamente."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Eliminazione messaggi non riuscita."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Eliminazione messaggi annullata."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Spostamento messaggi non riuscito."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Spostamento messaggi annullato."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Sposta messaggi nella cartella"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Copia messaggi..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Messaggi copiati correttamente."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Copia messaggi non riuscita."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Copia messaggi annullata."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copia messaggi nella cartella"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Cestinamento messaggi..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Eliminazione e cestinamento messaggi..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Messaggi cestinati correttamente."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Messaggi cestinati o eliminati correttamente"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Cestinamento messaggi non riuscito."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Eliminazione o cestinamento messaggi non riuscito."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Annullato cestinamento messaggi."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Annullata operazione di eliminazione o cestinamento dei messaggi."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Passa alla cartella"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Salva co&me..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Effettua &scadenza di tutte le cartelle"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Controlla p&osta"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Controlla posta in"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Controlla posta"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Spedisci messaggi in &attesa"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Stato in linea (sconosciuto)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Spedisci messaggi in attesa attraverso"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gestore certificati"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importa messaggi..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Sieve &debug..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visualizzatore dei &log di filtro..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importa da un altro programma di posta elettronica..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Modifica risposte «fuori ufficio»..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configura l'archiviazione automatica..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Messaggi differiti..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Avvisi delle azioni da seguire..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Elimina"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Cestina c&onversazione"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Cestina conversazione"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Elimina &conversazione"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Trova &messaggi..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Seleziona &tutti i messaggi"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Gestione &mailing list..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Assegna scorciatoia..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Impostazioni &scadenza"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Archivia cartella..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Carica riferimenti e&sterni"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copia messaggio in..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Sposta messaggio in..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nuovo messaggio..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nuovo"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Messaggio da mo&dello"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nuovo messaggio &a mailing list..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Crea filtro"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtro su «&Oggetto»..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtro su «&Da:»..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtro su «&A:»..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtro su «&CC:»..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Segna &conversazione"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Segna la conversazione come &letta"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Segna tutti i messaggi della conversazione selezionata come «letti»"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Segna la conversazione come &non letta"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr ""
 "Segna tutti i messaggi della conversazione selezionata come «non letti»"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Segna la conversazione come &importante"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Rimuovi il segno «&importante» dalla conversazione"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Segna la conversazione come &compito"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Rimuovi il segno «&compito» dalla conversazione"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Sorveglia conversazione"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignora conversazione"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Salva allegati..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copia dati decifrati in..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Appl&ica tutti i filtri"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Espandi conversazione / gruppo"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Espandi l'attuale conversazione o gruppo"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Riduci conversazione / gruppo"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Riduci l'attuale conversazione o gruppo"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Es&pandi tutte le conversazioni"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Espandi tutte le conversazioni nella cartella attuale"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "R&iduci tutte le conversazioni"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Riduci tutte le conversazioni nella cartella attuale"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Visualizza il messaggio"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Messaggio &successivo"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Vai al messaggio successivo"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Messaggio successivo &non letto"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Successivo"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Vai al messaggio successivo non letto"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Messaggio &precedente"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Vai al messaggio precedente"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Messaggio precedente non letto"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Precedente"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Vai al messaggio precedente non letto"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "&Cartella successiva non letta"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Vai alla cartella successiva con messaggi non letti"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "C&artella precedente non letta"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Vai alla cartella precedente con messaggi non letti"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "&Testo successivo non letto"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Vai al testo successivo non letto"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4579,224 +4594,229 @@
 "Fai scorrere in basso il messaggio attuale. Se sei già alla fine del "
 "messaggio attuale, vai al messaggio successivo non letto."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configura &filtri..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Gestisci script &sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Aggiungi account..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introduzione a KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Mostra la pagina di benvenuto di KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configura &notifiche..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configura KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Effettua scadenza..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Aggiungi cartella preferita..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Sottoscrizione lato server..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Applica tutti i filtri"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importa/esporta dati di KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nuovo contatto nella rubrica..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copia messaggio nella cartella"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Passa alla cartella..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Annulla l'operazione attuale"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Evidenzia la cartella successiva"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Evidenzia la cartella precedente"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Seleziona cartella evidenziata"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Evidenzia la prima cartella"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Evidenzia l'ultima cartella"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Evidenzia il messaggio successivo"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Evidenzia il messaggio precedente"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Seleziona il primo messaggio"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Seleziona l'ultimo messaggio"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Seleziona il messaggio evidenziato"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Evidenzia la ricerca veloce"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Estendi seleziona al messaggio precedente"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Estendi selezione al messaggio successivo"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Sposta messaggio nella cartella"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Usa banda ridotta"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 "Segna come letti tutti i messaggi di questa cartella e relative sottocartelle"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Rimuovi i duplicati in questa cartella e relative sottocartelle"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Impo&stazioni account"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Riavvia account"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Aggiungi cartella preferita"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "S&vuota il cestino"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Cestina tutti i messaggi"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Elimina ricerca"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Modifica ricerca..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Annulla"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Annulla: «%1»"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtro %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Cerca... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4807,12 +4827,12 @@
 "vulnerabile allo \"spam\" e può aumentare la probabilità che il tuo sistema "
 "venga compromesso da attacchi presenti o futuri."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Utilizza HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4829,119 +4849,119 @@
 " disabilitare totalmente questa funzione nelle impostazioni delle estensioni "
 "di KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Abilita caselle di posta unificate?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Abilita caselle di posta unificate"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Avvio in corso..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Cestin&a"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Cestino"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Cestina il messaggio"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Impossibile copiare l'elemento. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nuovo messaggio per..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Rispondi a..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Inoltra a..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Aggiungi ad un contatto esistente"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Apri nella rubrica"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Salva questo collegamento nei segnalibri"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Modifica contatto..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Salva collegamento come..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Trova nel messaggio..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Salva immagine sul disco..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Mostra in formato HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Mostra in formato HTML quando il messaggio arriva da questo contatto"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Carica i riferimenti esterni quando il messaggio arriva da questo contatto"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Condividi immagine..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4950,64 +4970,64 @@
 "KMail adesso è basato sull'infrastruttura per la gestione delle informazioni "
 "personali Akonadi, che porta con sé molti cambiamenti."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Tecnologia \"push email\" (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Ricerche migliorate"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Supporto per l'aggiunta di note (annotazioni) ai messaggi di posta"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Meno blocchi dell'interfaccia utente, il controllo dei messaggi di posta "
 "viene effettuato in sottofondo."
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Supporto per le estensioni"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Nuovo motore HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Aggiunta verifica del phishing per l'URL"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Il programma di posta per KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Recupero dei contenuti della cartella"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Attendere prego . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Non in linea"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5016,7 +5036,7 @@
 "KMail attualmente è in modalità non in linea. Fai clic <a href=\"kmail:"
 "goOnline\">qui</a> per andare in linea . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5025,22 +5045,22 @@
 "L'account attualmente è in modalità non in linea. Fai clic <a href=\"kmail:"
 "goResourceOnline\">qui</a> per andare in linea . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Contatto modificato con successo"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nuovi messaggi in"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Non ci sono messaggi non letti"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5063,8 +5083,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5161,17 +5181,17 @@
 "Seleziona le estensioni delle viste sommario da mostrare sulla pagina del "
 "Sommario."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Sommario KDE Kontact"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "©, 2004 Tobias Koenig"
@@ -5218,27 +5238,27 @@
 msgid "All"
 msgstr "Tutto"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Sommario di Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Visualizza sommario di Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2019 Gli sviluppatori di Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5267,7 +5287,7 @@
 msgid "&Reply"
 msgstr "&Rispondi"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Rispondi..."
@@ -5277,12 +5297,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Rispondi all'a&utore..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Rispondi a &tutti..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Rispondi a mailing &list..."
@@ -5312,7 +5332,7 @@
 msgid "&Edit As New"
 msgstr "Modifica com&e nuovo"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5504,82 +5524,82 @@
 msgstr ""
 "Ricerca non riuscita, sono stati trovati alcuni errori: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Trova messaggi"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "Ce&rca"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&In linea..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Come &allegato..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Salva allegati..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Pulisci selezione"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Passa alla cartella originale"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 corrispondenza"
 msgstr[1] "%1 corrispondenze"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Ultima ricerca"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Non hai selezionato una cartella valida."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Non hai selezionato delle collezioni."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Non hai definito una condizione."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Tutte le cartelle selezionate sono vuote o non state indicizzate."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Hai dimenticato di aggiungere una condizione."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5587,32 +5607,32 @@
 "Una condizione di tipo «contiene» non può essere usata con meno di quattro "
 "caratteri."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Ricerca in corso..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Impossibile ottenere il risultato della ricerca. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Ricerca non riuscita."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Ricerca completata."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Ricerca interrotta."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5623,21 +5643,21 @@
 "questo si verifica perché esiste giù un'altra cartella di ricerca con lo "
 "stesso nome. L'errore restituito è «%1»."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copia messaggio"
 msgstr[1] "Copia %1 messaggi"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Taglia messaggio"
 msgstr[1] "Taglia %1 messaggi"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Verifica stato dell'indice..."
@@ -5774,7 +5794,7 @@
 "uso interno)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5785,7 +5805,7 @@
 "chiesto una volta sola."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5795,26 +5815,26 @@
 "l'introduzione a KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Mostra casella di testo per la ricerca veloce delle cartelle"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Inoltra in linea in modo predefinito."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Avvisa se il numero di destinatari è maggiore di:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5826,20 +5846,20 @@
 "disattivato."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Controlla l'ortografia prima di spedire"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr ""
 "Richiedi automaticamente le notifiche delle disposizioni sul &messaggio"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5856,13 +5876,13 @@
 "notifica delle disposizioni</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Intervallo del salvataggio automatico:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5874,7 +5894,7 @@
 "qui. Puoi disabilitare il salvataggio automatico impostandolo al valore 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5882,149 +5902,149 @@
 "compositore."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "Quando è abilitata, i messaggi inviati saranno memorizzati in forma cifrata"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Un eleenco di tutti gli URL usati recentemente"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Un elenco di tutte le codifiche usate recentemente"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Mostra indicatore della crittografia"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Valida la scorciatoia predefinita per l'invio"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 "La dimensione della finestra di dialogo dell'identità (solo per uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "La larghezza della finestra di ricerca (solo per uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "L'altezza della finestra di ricerca (solo per uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "La larghezza della finestra di dialogo Configura KMail (solo per uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "L'altezza della finestra di dialogo Configura KMail (solo per uso interno)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Pannello di anteprima messaggio"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Non mostrare il pannello di anteprima messaggio"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Mostra il pannello di anteprima messaggio sotto l'elenco dei messaggi"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Mostra il pannello di anteprima messaggio dopo l'elenco dei messaggi"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Elenco delle cartelle"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Elenco delle cartelle esteso"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Elenco delle cartelle breve"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Modello di messaggio per i nuovi messaggi"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Modello di messaggio per le risposte"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Modello di messaggio per le risposte a tutti"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Modello di messaggio per gli inoltri"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Caratteri di citazione"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Specifica la politica usata quando viene mostrata la politica"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6034,7 +6054,7 @@
 "ricerca (solo per uso interno)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6044,7 +6064,7 @@
 "ricerca (solo per uso interno)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6054,7 +6074,7 @@
 "ricerca (solo per uso interno)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6064,7 +6084,7 @@
 "ricerca (solo per uso interno)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6074,7 +6094,7 @@
 "(solo per uso interno)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6347,7 +6367,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6383,7 +6403,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6718,10 +6738,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Controlla posta in"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr "Cerca URL di localizzazione nei messaggi di posta"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7344,6 +7363,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Riabilita tutti gli avvertimenti «Non chiedere più»"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 secondi"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Annulla invio"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7399,6 +7428,14 @@
 msgid "Zoom: %1%"
 msgstr "Ingrandimento: %1%"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Frammenti di testo"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Controlla posta in"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Nome cartella e dimensione se prossima alla quota"
 
@@ -10879,9 +10916,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Definisce se l'account usa l'identità predefinita"
 
-#~ msgid "Identity account"
-#~ msgstr "Account identità"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr ""
 #~ "Percorso identificativo (RID) della casella di posta per controllare le "
@@ -12713,10 +12747,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "Apertura URL..."
 
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "Vuoi davvero eseguire <filename>%1</filename>?"
-
 #~ msgid "Execute"
 #~ msgstr "Esegui"
 
diff -Nru kmail-19.04.3/po/it/kmail-refresh-settings.po kmail-19.12.3/po/it/kmail-refresh-settings.po
--- kmail-19.04.3/po/it/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/it/kmail-refresh-settings.po	2020-03-03 00:34:05.000000000 +0000
@@ -0,0 +1,109 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2019, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-07 23:28+0200\n"
+"Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
+"Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 19.08.1\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Luigi Toscano"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "luigi.toscano@tiscali.it"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Assistente di KMail per aggiornare le impostazioni"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Author"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Rinnovo delle impostazioni di KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Avviso"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Pulisci le impostazioni"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Termina"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Pulisci"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr ""
+"Rimozione delle impostazioni dell'obsoleto suggerimento del giorno: "
+"completata"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Rimozione delle impostazioni delle finestre nel file «%1»: completata"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Rimozione delle impostazioni dei filtri nel file «%1»: completata"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+"Pulizia delle impostazioni delle cartelle nel file di configurazione «%1»: "
+"completata"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr ""
+"Pulizia delle dimensioni della finestra nel file di configurazione «%1»: "
+"completata"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Chiudere KMail/Kontact prima di usarlo."
diff -Nru kmail-19.04.3/po/it/ktnef.po kmail-19.12.3/po/it/ktnef.po
--- kmail-19.04.3/po/it/ktnef.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/it/ktnef.po	2020-03-03 00:34:05.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the ktnef package.
-# Luigi Toscano <luigi.toscano@tiscali.it>, 2012, 2013, 2015, 2016.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2012, 2013, 2015, 2016, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-24 23:08+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.1\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
diff -Nru kmail-19.04.3/po/ja/akonadi_archivemail_agent.po kmail-19.12.3/po/ja/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ja/akonadi_archivemail_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/ja/akonadi_archivemail_agent.po	2020-03-03 00:34:06.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: archivemailagent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2012-04-12 22:43-0700\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -171,12 +171,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr ""
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/ja/akonadi_followupreminder_agent.po kmail-19.12.3/po/ja/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/ja/akonadi_followupreminder_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/ja/akonadi_followupreminder_agent.po	2020-03-03 00:34:06.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_followupreminder_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2014-06-07 02:34-0700\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -14,97 +14,97 @@
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr ""
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr ""
diff -Nru kmail-19.04.3/po/ja/akonadi_mailfilter_agent.po kmail-19.12.3/po/ja/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ja/akonadi_mailfilter_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/ja/akonadi_mailfilter_agent.po	2020-03-03 00:34:06.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: mailfilteragent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2011-09-17 13:45-0700\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -19,40 +19,40 @@
 msgid "Filter Log Viewer"
 msgstr ""
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr ""
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
 "data is collected and shown only when logging is turned on. "
 msgstr ""
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr ""
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr ""
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -62,34 +62,34 @@
 "given."
 msgstr ""
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr ""
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr ""
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr ""
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr ""
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -98,70 +98,70 @@
 "until the limit is no longer exceeded. "
 msgstr ""
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr ""
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr ""
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr ""
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr ""
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr ""
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr ""
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr ""
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr ""
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr ""
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr ""
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr ""
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/ja/akonadi_sendlater_agent.po kmail-19.12.3/po/ja/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ja/akonadi_sendlater_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/ja/akonadi_sendlater_agent.po	2020-03-03 00:34:06.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2013-05-10 21:38-0700\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -56,124 +56,124 @@
 msgid "Your emails"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr ""
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr ""
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr ""
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr ""
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr ""
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr ""
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr ""
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr ""
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr ""
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr ""
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr ""
diff -Nru kmail-19.04.3/po/ja/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/ja/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/ja/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/ja/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:06.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-09-14 20:38-0700\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -49,37 +49,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr ""
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr ""
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr ""
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr ""
diff -Nru kmail-19.04.3/po/ja/kmail.po kmail-19.12.3/po/ja/kmail.po
--- kmail-19.04.3/po/ja/kmail.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/ja/kmail.po	2020-03-03 00:34:06.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2011-08-14 14:16-0700\n"
 "Last-Translator: Fumiaki Okushi <okushi@kde.gr.jp>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -204,8 +204,8 @@
 msgstr "一つのアドレスに複数の暗号化鍵"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -324,27 +324,27 @@
 "KMail はこのフォルダにメーリングリストを自動検出できませんでした。アドレスを"
 "入力してください。"
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "クォータ"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "使用:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr ""
@@ -367,7 +367,7 @@
 "のボタンを押して、このフォルダと関連付けるキーを押してください。</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "テンプレート"
@@ -379,109 +379,109 @@
 
 # ACCELERATOR changed by translator
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "全体のテンプレートをコピー(&G)"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "表示"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "アイコンを指定する(&I)"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "通常(&N):"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "未読あり(&U):"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "メッセージ一覧に送信者/受信者のカラムを表示"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "表示するカラム(&W):"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "標準"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "送信者"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "受信者"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "メッセージ一覧"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "デフォルトの集約方法を使う"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "集約方法"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "デフォルトのテーマを使う"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "テーマ"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Message Default Format"
 msgstr "新しいメッセージ..."
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "プレーンテキストより HTML を優先する"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "プレーンテキストより HTML を優先(&H)"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Use Global Settings"
@@ -492,104 +492,109 @@
 msgid "Retrieval Options"
 msgstr "取得オプション"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "個人情報(&I)"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "受信"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "送信"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "送信アカウント (最低一つ作成してください):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "共通オプション"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "送信する前に確認する(&B)"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "自動的に行わない"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "手動メールチェックで送信"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "すべてのメールチェックで送信"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "今すぐ送信"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "後で送信"
 
 # ACCELERATOR changed by translator
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "送信待ちフォルダ内のメッセージの送信(&N):"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "デフォルトの送信方法(&U):"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "Add Mail Account..."
 msgstr "ノートを追加..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "Custom Account..."
 msgstr "ノートを追加..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -599,30 +604,30 @@
 "アカウントウィザードを起動できませんでした。正しくインストールされているか確"
 "認してください。"
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "アカウントウィザードを起動できません"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "手動メールチェックに含める"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "KMail 終了時にオフラインに切り替える"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "起動時に新着メールをチェックする"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -678,7 +683,7 @@
 msgid "Fixed Width Font"
 msgstr "固定幅フォント"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "メール作成"
@@ -986,94 +991,94 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "全般"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "標準テンプレート"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "カスタムテンプレート"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "件名"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "文字セット"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "ヘッダ"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "添付ファイル"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "署名"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
 # ACCELERATOR changed by translator
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "フォーマット(&R):"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, only quote the selected text instead of the complete "
@@ -1086,7 +1091,7 @@
 "返信時に、メッセージウィンドウに選択したテキストがある場合、それのみを引用し"
 "ます。"
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1094,17 +1099,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1112,7 +1117,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1120,36 +1125,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "本文に引用"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "添付ファイルとして"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Default Forwarding Type:"
 msgid "Default forwarding type:"
 msgstr "デフォルトの転送方法:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "&Edit Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "受信者を編集(&E)"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1157,18 +1162,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "指定された受信者が多すぎる場合に警告します"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Set the maximum number of recipients for the warning"
 msgstr "受信者の数がこれより多い場合に警告する"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1179,51 +1184,51 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "自動保存なし"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "補完順序を設定..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "自動保存なし"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "自動保存なし"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1232,19 +1237,19 @@
 msgstr[0] " 分"
 msgstr[1] " 分"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "自動的に開封通知を要求する(&M)"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "返信の件名の接頭句(&Y)"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1253,59 +1258,59 @@
 "下記の接頭句を認識します\n"
 "(大文字と小文字を区別しない正規表現で):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "追加(&D)..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "削除(&M)"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "編集(&I)..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "新しい返信用接頭句を入力:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "転送の件名の接頭句(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "追加..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "削除(&V)"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "編集..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "新しい転送用接頭句を入力:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1315,89 +1320,89 @@
 "文字セットをこのリストの上から順に検索します。"
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "編集(&M)..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "文字セットを入力:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "可能なら返信および転送時に元のメッセージの文字セットを使う(&K)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "この文字セットはサポートされていません。"
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "カスタム message-Id サフィックスを使う(&U)"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "カスタム message-Id サフィックス(&I):"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "カスタム MIME ヘッダフィールドを定義:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "名前"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "値"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "新規(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "名前(&N):"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "値(&V):"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Only headers"
 msgid "Invalid header"
 msgstr "ヘッダのみ"
 
 # ACCELERATOR added by translator
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook 互換の添付ファイル名(&K)"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1407,39 +1412,39 @@
 "を理解できるようになります。"
 
 # skip-rule: attachment
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "ファイルの添付漏れをチェックする(&N)"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "以下のキーワードが本文に含まれている場合に添付ファイルをチェックします:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "新しいキーワードを入力:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1532,7 +1537,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "メール作成"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1647,7 +1652,7 @@
 msgid "Archive Folder"
 msgstr "フォルダをアーカイブ"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgctxt "Start of the filename for a mail archive file"
 #| msgid "Archive"
@@ -1718,7 +1723,7 @@
 msgid "Notification"
 msgstr "通知"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "As Attachment"
 msgid "1 attachment (%2)"
@@ -1726,14 +1731,14 @@
 msgstr[0] "添付ファイルとして"
 msgstr[1] "添付ファイルとして"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "Attachments"
 msgid "Hide attachment list"
 msgstr "添付ファイル"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "Name of the attachment:"
 msgid "Show attachment list"
@@ -1751,394 +1756,394 @@
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "このメッセージのスペルチェックをするときに使用する辞書を選択"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "このメッセージのコピーを保存する送信済みフォルダを選択"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "このメッセージを送信するのに使う送信用アカウントを選択"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "このメッセージの差し出しメールアドレス(From:)を設定"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "メッセージの件名を設定"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "個人情報(&I):"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "辞書(&D):"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "送信済みフォルダ(&S):"
 
 # ACCELERATOR changed by translator
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "メール送信手段(&I):"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "差出人(&F):"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "件名(&U):"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "送信(&S)"
 
 # ACCELERATOR changed by translator
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "送信(&M)"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "送信"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "後で送信(&L)"
 
 # ACCELERATOR changed by translator
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "後で送信(&V)"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "後で送信"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "下書きとして保存(&D)"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "すべてのローカルフォルダを検索(&A)"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "テンプレートとして保存(&T)"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 #| msgid "Save as &Template"
 msgid "Save email in Template folder"
 msgstr "テンプレートとして保存(&T)"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "ファイルに保存"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "テキストファイルを挿入(&I)..."
 
 # ACCELERATOR changed by translator
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "最近のテキストファイルを挿入(&F)"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "アドレス帳(&A)"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "アドレス帳を開く"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "新しいメール作成ウィンドウ(&N)"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "受信者を選択(&R)..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "配布リストを保存(&D)..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "添付ファイルとして貼り付け(&H)"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "スペースをクリア(&E)"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "固定幅フォントを使う(&X)"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "至急(&U)"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "開封通知を要求(&R)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "開封通知を要求(&R)"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "行を折り返す(&W)"
 
 # ACCELERATOR changed by translator
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "定型表現(&N)"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "自動スペルチェック(&A)"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Rich Text Editing"
 msgstr "書式を失う"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "すべてのフィールド(&A)"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "個人情報(&I)"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "辞書(&D)"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "送信済みフォルダ(&S)"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "メール送信手段(&M)"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "差出人(&F)"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "件名(&U)"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "先頭に署名を挿入(&I)"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "末尾に署名を挿入(&E)"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "カーソル位置に署名を挿入(&U)"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "スペルチェッカー(&S)..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "スペルチェッカー"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "メッセージを暗号化(&E)"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "暗号化"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "メッセージに署名(&S)"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "署名"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "メッセージの暗号化法形式(&C)"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "このメッセージの暗号化フォーマットを選択"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "メッセージを検索(&F)..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMail を設定..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " 行: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " 列: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "スペルチェック: オン"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "スペルチェック: オフ"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "テンプレートとして再保存(&S)"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "下書きとして保存(&S)"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2147,68 +2152,68 @@
 "このメッセージをテンプレートフォルダに再保存します。そうすると後で利用できま"
 "す。"
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr "このメッセージを下書きフォルダに保存します。編集して後で送信できます。"
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "このメッセージを破棄しますか？それとも保存しますか？"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "メール作成ウィンドウを閉じる"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Sending Message Failed"
 msgid "Autosave Message Failed"
 msgstr "メッセージの送信に失敗しました"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "メッセージの送信に失敗しました"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert Text File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "テキストファイルを挿入(&I)..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "画像を本文に埋め込む(&I)"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "添付ファイルとして追加(&A)"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "添付ファイル名:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Only headers"
 msgid "Invalid Attachment Name"
 msgstr "ヘッダのみ"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Add URL into Message &Text"
 #| msgid_plural "Add URLs into Message &Text"
@@ -2217,24 +2222,24 @@
 msgstr[0] "引用されたメッセージテキスト(&T)"
 msgstr[1] "引用されたメッセージテキスト(&T)"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "添付ファイルとして追加(&A)"
 msgstr[1] "添付ファイルとして追加(&A)"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "クリップボードのテキストを添付ファイルとして挿入"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "名前なし"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2246,12 +2251,12 @@
 "の個人情報には、それに使用する (OpenPGP または S/MIME) 暗号化鍵が設定されてい"
 "ません。</p><p>個人情報の設定で使用する鍵を選択してください。</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "暗号化鍵が設定されていません"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2262,12 +2267,12 @@
 "MIME) を設定する必要があります。</p><p>個人情報の設定で使用する鍵を選択してく"
 "ださい。</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "署名鍵が設定されていません"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2278,7 +2283,7 @@
 "力する必要がないように、すべての個人情報にもメールアドレスを設定してくださ"
 "い。"
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2287,37 +2292,37 @@
 "少なくとも一人の受信者を To: フィールドまたは CC や BCC として指定する必要が"
 "あります。"
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "To: フィールドが設定されていません。このまま送信しますか？"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "To: が指定されていません"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "件名が設定されていません。このまま送信しますか？"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "件名が指定されていません"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "このまま送信(&E)"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "件名を指定(&S)"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2325,22 +2330,22 @@
 msgstr ""
 "下書きを暗号化するには、少なくとも一人の受信者を指定しなければなりません。"
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "メールを送信します..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "送信の確認"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "今すぐ送信(&S)"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2348,22 +2353,22 @@
 msgstr ""
 "メールを %1 人を超える受信者に送信しようとしています。本当に送信しますか？"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "受信者が多すぎます"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "このまま送信(&S)"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "受信者を編集(&E)"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2371,43 +2376,43 @@
 msgstr ""
 "HTML モードを無効にするとテキストの書式が失われます。本当によろしいですか？"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "書式が失われます"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "書式を失う"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2415,7 +2420,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Send Confirmation"
 msgid "Plugin Editor Information"
@@ -2493,25 +2498,25 @@
 msgid "External editor was started."
 msgstr "外部エディタ"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2538,11 +2543,6 @@
 msgid "Message will not be encrypted"
 msgstr "メッセージは暗号化されません"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "テキスト定型表現"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2589,28 +2589,28 @@
 msgid "Cannot move messages."
 msgstr "メッセージを移動できません。%1"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "フォルダが選択されていません"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Open Message in List Archive"
 msgid "Messages archived"
@@ -2655,49 +2655,49 @@
 msgid "&Existing identities:"
 msgstr "既存の個人情報(&E):"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "新しいキーワードを入力:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "個人情報の編集"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "全般"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "あなたの名前(&Y):"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2708,12 +2708,12 @@
 "メールのヘッダに表示されます。</p><p>ここを空欄にしておくと、メールアドレスだ"
 "けで名前は表示されません。</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "組織(&Z):"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2724,12 +2724,12 @@
 "メールのヘッダに表示されます。</p><p>ここは空欄にしておいても問題はありませ"
 "ん (通常はそうしておきます)。</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "メールアドレス(&E):"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2744,12 +2744,12 @@
 "てくださ。</p><p>ここが空欄だったり、間違っていると、受け取った人は返信できま"
 "せん。</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "メールエイリアス(&L):"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2765,12 +2765,12 @@
 "tr><tr><th>エイリアス:</th><td>first@example.org<br>last@example.org</td></"
 "tr></table><p>一行にエイリアスを一つ記してください。</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "暗号法"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2791,12 +2791,12 @@
 "は影響ありません。</p><p>詳しくは <a>http://www.gnupg.org</a> をご覧くださ"
 "い。</p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP 署名鍵:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2819,12 +2819,12 @@
 "メールのコピーを暗号化できません。通常のメール機能には影響ありません。</p><p>"
 "詳しくは <a>http://www.gnupg.org</a> をご覧ください。</p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP 暗号化鍵:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2837,12 +2837,12 @@
 "MIME を使ってメールに電子署名できません。通常のメール機能には影響ありません。"
 "</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME 署名用証明書:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2856,12 +2856,12 @@
 "もかまいませんが、その場合は KMail は S/MIME を使って送信メッセージのコピーを"
 "暗号化できません。通常のメール機能には影響ありません。</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME 暗号化用証明書:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred handler:"
 msgctxt "preferred format of encrypted messages"
@@ -2869,30 +2869,30 @@
 msgstr "優先するハンドラ:"
 
 # ACCELERATOR changed by translator
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "自動的にメッセージに署名する(&U)"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "可能なら自動的にメッセージを暗号化する(&M)"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "詳細"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "返信アドレス(&R):"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2909,13 +2909,13 @@
 "する場合に利用できます。</p><p>よく分からなければ、ここは空欄にしておいてくだ"
 "さい。</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "&BCC アドレス:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2940,12 +2940,12 @@
 "をコンマで区切ります。</p><p>よく分からなければ、ここは空欄にしておいてくださ"
 "い。</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC アドレス:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2962,61 +2962,61 @@
 "をコンマで区切ります。</p><p>よく分からなければ、ここは空欄にしておいてくださ"
 "い。</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "辞書(&I):"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "送信済みフォルダ(&F):"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "下書きフォルダ(&D):"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "テンプレートフォルダ(&T):"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr ""
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "<placeholder>ヘッダ</placeholder> をメッセージに追加"
 
 # ACCELERATOR removed by translator
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Chang&e..."
 msgid "Create..."
 msgstr "変更..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr ""
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "デフォルトのドメイン(&T):"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "デフォルトのドメイン(&T):"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3025,33 +3025,33 @@
 "<qt><p>デフォルトのドメインは、ユーザ名だけのメールアドレスを補完するために使"
 "用します。</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "この個人情報にカスタムメッセージテンプレートを使う(&U)"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "署名"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "画像"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "不正なメールエイリアス「%1」"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "不正なメールアドレス"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3064,7 +3064,7 @@
 "による署名を検証しようとすると、警告メッセージが出る可能性があります。</p></"
 "html>"
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3073,7 +3073,7 @@
 "設定された OpenPGP 暗号化鍵の一つに、個人情報 (%1) のために設定されたメールア"
 "ドレスを持つユーザ ID が含まれていません。"
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3085,7 +3085,7 @@
 "定されたメールアドレスが含まれていません。</p><p>受信者がこの設定による署名を"
 "検証しようとすると、警告メッセージが出る可能性があります。</p></html>"
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3094,22 +3094,22 @@
 "設定された S/MIME 暗号化用証明書の一つに、この個人情報 (%1) のために設定され"
 "たメールアドレスが含まれていません。"
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "メールアドレスが鍵/証明書の中に見つかりません"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "署名ファイルは無効です"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "個人情報 “%1” を編集"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3121,7 +3121,7 @@
 "個人情報 <resource>%1</resource> に対応する下書きフォルダが存在しません。標準"
 "の下書きフォルダを使用します。"
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "編集..."
@@ -3156,6 +3156,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "送信の確認"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3320,7 +3333,7 @@
 "サンプルは <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all."
 "nl/~ace/X-Faces/</a> から取得できます。"
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3355,7 +3368,7 @@
 msgstr[0] "配布リスト <resource>%1</resource> は空なので使用できません。"
 msgstr[1] "配布リスト <resource>%1</resource> は空なので使用できません。"
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "アドレス帳に追加"
@@ -3366,24 +3379,24 @@
 msgid "Contact created successfully"
 msgstr "メッセージを削除しました。"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Failed to store contact"
 msgstr "アカウントウィザードを起動できません"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "本当にごみ箱フォルダを空にしますか？"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Archive Folder"
 msgid "Attach Folder"
@@ -3598,7 +3611,7 @@
 msgstr "フォルダ(&O)"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3606,7 +3619,7 @@
 msgstr "すべてのフィルタを適用(&Y)"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3634,7 +3647,7 @@
 
 # ACCELERATOR changed by translator
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "フィルタを適用(&L)"
@@ -3659,7 +3672,7 @@
 msgstr "ヘルプ(&H)"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "メインツールバー"
@@ -3715,13 +3728,13 @@
 msgid "The file does not contain a message."
 msgstr "ファイルはメッセージを含んでいません。"
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "ファイルは複数のメッセージを含んでいます。最初のメッセージのみ表示します。"
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3730,33 +3743,33 @@
 "選択したメッセージを一つにまとめて添付ファイルとして (MIME ダイジェストとし"
 "て) 転送しますか？それとも個別のメッセージとして転送しますか？"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "ダイジェストとして送信"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "個別に送信"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "メッセージをフィルタ中"
 
 # @info:status
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "メッセージをフィルタ中 (%1/%2)"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "メッセージを移動中"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "メッセージを削除中"
@@ -3785,33 +3798,33 @@
 msgid "Text Direction Toolbar"
 msgstr "テキスト方向ツールバー"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail がオフラインモードになりました。すべてのネットワークジョブを中断しまし"
 "た。"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "送信(&S)"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "メールを送信します..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail がオンラインモードになりました。すべてのネットワークジョブを再開しまし"
 "た。"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3821,27 +3834,27 @@
 "KMail がオンラインモードになりました。すべてのネットワークジョブを再開しまし"
 "た。"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail は現在オフラインモードです。どうしますか？"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "オンライン/オフライン"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "オンライン作業"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "オフライン作業"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
@@ -3849,7 +3862,7 @@
 "KMail がオンラインモードになりました。すべてのネットワークジョブを再開しまし"
 "た。"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
@@ -3857,7 +3870,7 @@
 "KMail がオフラインモードになりました。すべてのネットワークジョブを中断しまし"
 "た。"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3866,12 +3879,12 @@
 "自動保存ファイル (%1) を開くのに失敗しました。\n"
 "理由: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "自動保存ファイルを開くのに失敗しました"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3880,7 +3893,7 @@
 msgstr[1] ""
 "これら %1 個の個人情報はデフォルトの送信手段を使うように変更されました:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3889,43 +3902,45 @@
 msgstr[1] ""
 "これら %1 個の個人情報は指定された送信手段を使うように変更されました:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "メッセージ送信"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "送信プロセスを初期化します..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3934,12 +3949,12 @@
 msgstr ""
 "証明書マネージャを起動できませんでした。インストールを確認してください。"
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail エラー"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -3949,29 +3964,29 @@
 "アカウントウィザードを起動できませんでした。正しくインストールされているか確"
 "認してください。"
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start import wizard"
 msgstr "アカウントウィザードを起動できません"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "アカウントウィザードを起動できませんでした。正しくインストールされているか確"
 "認してください。"
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "アカウントウィザードを起動できません"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -3981,18 +3996,18 @@
 "アカウントウィザードを起動できませんでした。正しくインストールされているか確"
 "認してください。"
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start ImportWizard"
 msgstr "アカウントウィザードを起動できません"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
@@ -4000,52 +4015,52 @@
 "アカウントウィザードを起動できませんでした。正しくインストールされているか確"
 "認してください。"
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "件名なし"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(テンプレートなし)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "このフォルダには古いメッセージを整理するオプションが設定されていません"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>本当にフォルダ “%1” の古いメッセージを整理しますか？</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "フォルダの古いメッセージの整理"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "古いメッセージを整理(&E)"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "ごみ箱を空にする"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "ごみ箱に移動"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "本当にごみ箱フォルダを空にしますか？"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4053,27 +4068,27 @@
 msgstr ""
 "<qt>本当にフォルダ “%1” のすべてのメッセージをごみ箱に移動しますか？</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "メッセージをすべてごみ箱に移動しました"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "本当にすべての古いメッセージを整理しますか？"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "古いメッセージを整理しますか？"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "整理する"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4084,17 +4099,17 @@
 "既知または今後予想されるその他のセキュリティ上の問題によって、あなたのシステ"
 "ムが危険にさらされる可能性が増します。"
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "セキュリティ警告"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "外部参照をロードする"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4109,551 +4124,551 @@
 "<qt>本当に選択した %1 件のメッセージを削除しますか？<br />削除すると元には戻"
 "せません。</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "メッセージを削除"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "メッセージを削除"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "メッセージを移動中..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "メッセージを削除中..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "メッセージを削除しました。"
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "メッセージを移動しました。"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "メッセージの削除に失敗しました。"
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "メッセージの削除がキャンセルされました。"
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "メッセージの移動に失敗しました。"
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "メッセージの移動がキャンセルされました。"
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "メッセージをフォルダに移動"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "メッセージをコピー中..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "メッセージをコピーしました。"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "メッセージのコピーに失敗しました。"
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "メッセージのコピーがキャンセルされました。"
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "メッセージをフォルダにコピー"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "メッセージをごみ箱に移動中..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "メッセージをごみ箱に移動中..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "メッセージをごみ箱に移動しました。"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "メッセージをごみ箱に移動しました。"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "メッセージをごみ箱に移動できませんでした。"
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "メッセージをごみ箱に移動できませんでした。"
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "メッセージのごみ箱への移動がキャンセルされました。"
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "メッセージのごみ箱への移動がキャンセルされました。"
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "フォルダへジャンプ"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "名前を付けて保存(&A)..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "すべてのフォルダの古いメッセージを整理(&E)"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "すべてのメールをチェック(&M)|/|$[~setProps ~label '受信']"
 
 # ACCELERATOR added by translator
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "メールをチェック(&C)|/|$[~setProps ~label '受信']"
 
 # ACCELERATOR added by translator
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "すべてのメールをチェック(&M)|/|$[~setProps ~label '受信']"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "すべての送信待ちメールを送信(&S)|/|$[~setProps ~label '送信']"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "オンライン状態 (不明)"
 
 # ACCELERATOR added by translator
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "送信待ちメールを送信(&V)|/|$[~setProps ~label '送信']"
 
 # ACCELERATOR added by translator
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "証明書の管理(&C)"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages"
 msgid "&Import Messages..."
 msgstr "メッセージをインポート(&I)"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Sieve のデバッグ(&D)..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "フィルタログビューア(&L)..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
 # ACCELERATOR added by translator
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "不在返信を編集(&E)..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "通知を設定(&N)..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "メッセージを削除中..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "メッセージを検索(&F)..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "メッセージを完全に削除(&D)"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "スレッドをごみ箱に移動(&O)"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "スレッドをごみ箱に移動"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "スレッドを削除(&H)"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "メッセージを検索(&F)..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "すべてのメッセージを選択(&A)"
 
 # ACCELERATOR changed by translator
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "メーリングリストの管理(&L)..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "ショートカットを割り当て(&A)..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "古いメッセージ整理の設定(&E)"
 
 # ACCELERATOR changed by translator
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "フォルダをアーカイブ(&V)..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "外部参照をロードする(&X)"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "メッセージをコピー..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "メッセージを移動..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "新しいメッセージ(&N)..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "新規"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "テンプレートから新しいメッセージを作成(&T)"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "メーリングリストに投稿(&O)..."
 
 # ACCELERATOR changed by translator
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "フィルタを作成(&I)"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "件名でのフィルタ(&S)..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "送信元でのフィルタ(&F)..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "送信先でのフィルタ(&T)..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "送信先でのフィルタ(&T)..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "スレッドをマーク(&T)"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "スレッドを既読としてマーク(&R)"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "選択したスレッドのすべてのメッセージを既読としてマーク"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "スレッドを未読としてマーク(&U)"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "選択したスレッドのすべてのメッセージ未読としてマーク"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "スレッドを重要としてマーク(&I)"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "スレッドの重要マークを削除(&I)"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "スレッドを要アクションとしてマーク(&A)"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "メッセージの要アクションマークを削除(&A)"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "スレッドを監視(&W)"
 
 # ACCELERATOR changed by translator
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "スレッドを無視(&G)"
 
 # ACCELERATOR changed by translator
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "添付ファイルを保存(&S)..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Message To..."
 msgid "Copy Decrypted To..."
 msgstr "メッセージをコピー..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "すべてのフィルタを適用(&Y)"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "スレッド/グループを展開(&E)"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "現在のスレッド/グループを展開"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "スレッド/グループをたたむ(&C)"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "現在のスレッド/グループをたたむ"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "すべてのスレッドを展開(&P)"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "現在のフォルダのすべてのスレッドを展開"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "すべてのスレッドをたたむ(&O)"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "現在のフォルダのすべてのスレッドをたたむ"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "メッセージを表示(&D)"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "次のメッセージ(&N)"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "次のメッセージへ移動"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "次の未読メッセージ(&U)"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "次へ"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "次の未読メッセージへ移動"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "前のメッセージ(&P)"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "前のメッセージへ移動"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "前の未読メッセージ(&M)"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "前へ"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "前の未読メッセージへ移動"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "次の未読フォルダ(&F)"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "未読メッセージを含む次のフォルダへ移動"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "前の未読フォルダ(&O)"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "未読メッセージを含む前のフォルダへ移動"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "次の未読テキスト(&T)"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "次の未読テキストに移動"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4662,236 +4677,242 @@
 "メッセージを下にスクロールしていって、メッセージの最後に到達すると、次のメッ"
 "セージに移動します。"
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "フィルタの設定(&F)..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Sieve スクリプトの管理(&S)..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "&Add Account..."
 msgstr "ノートを追加..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail はじめに(&I)"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "「KMail はじめに」のページを表示"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "通知を設定(&N)..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "KMail を設定(&C)..."
 
 # ACCELERATOR added by translator
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "古いメッセージを整理(&E)..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "お気に入りフォルダを追加..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "サーバ側の購読..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "すべてのフィルタを適用(&Y)"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "KMail を設定(&C)..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "New AddressBook Contact..."
 msgstr "アドレス帳で開く"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "メッセージをフォルダにコピー"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "フォルダへジャンプ..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "現在の操作を中断"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "次のフォルダにフォーカス"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "前のフォルダにフォーカス"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "フォルダをフォーカスで選択"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "次のフォルダにフォーカス"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "次のフォルダにフォーカス"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "次のメッセージにフォーカス"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "前のメッセージにフォーカス"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "すべてのメッセージを選択(&A)"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "すべてのメッセージを選択(&A)"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "メッセージをフォーカスで選択"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "クイック検索をフォーカス"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "前のメッセージまで選択"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "次のメッセージまで選択"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "メッセージをフォルダに移動"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "設定(&S)"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Add Note..."
+msgid "Restart Account"
+msgstr "ノートを追加..."
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "お気に入りフォルダを追加"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "ごみ箱を空にする(&M)"
 
 # ACCELERATOR changed by translator
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "すべてのメッセージをごみ箱に移動(&G)"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "検索を削除(&D)"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Edit Search..."
 msgstr "開始..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "フィルタ %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "開始..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4902,12 +4923,12 @@
 "今後予想されるその他のセキュリティ上の問題によって、あなたのシステムが危険に"
 "さらされる可能性が増します。"
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML を使う"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4917,193 +4938,193 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "開始..."
 
 # ACCELERATOR changed by translator
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "ごみ箱に移動(&H)"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "削除"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "メッセージをごみ箱に移動"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Can not move message. %1"
 msgid "Cannot copy item. %1"
 msgstr "メッセージを移動できません。%1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "新しいメッセージ..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "返信..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "転送..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Add to Existing Contact"
 msgstr "アカウントウィザードを起動できません"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "アドレス帳で開く"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "このリンクをブックマークに追加"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit Note..."
 msgid "Edit contact..."
 msgstr "ノートを編集..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "名前を付けてリンクを保存..."
 
 # ACCELERATOR changed by translator
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "メッセージ内を検索(&I)..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "名前を付けてリンクを保存..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr ""
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "名前を付けてリンクを保存..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG サポート"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "送信する前に確認する(&B)"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE メールクライアント"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Mailinglist Folder Properties"
 msgid "Retrieving Folder Contents"
 msgstr "メーリングリストフォルダのプロパティ"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "お待ちください"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "オフライン作業"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5117,7 +5138,7 @@
 "す。オンラインにするには、<a href=\"kmail:goOnline\">ここ</a> をクリックして"
 "ください。</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5131,23 +5152,23 @@
 "す。オンラインにするには、<a href=\"kmail:goOnline\">ここ</a> をクリックして"
 "ください。</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully."
 msgid "Contact modified successfully"
 msgstr "メッセージを移動しました。"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "新着メッセージ"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "未読メッセージはありません"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5170,8 +5191,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5265,17 +5286,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5322,27 +5343,27 @@
 msgid "All"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5370,7 +5391,7 @@
 msgid "&Reply"
 msgstr "返信(&R)"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "返信(&R)..."
@@ -5380,12 +5401,12 @@
 msgid "Reply to A&uthor..."
 msgstr "送信者に返信(&U)..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "全員に返信(&A)..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "メーリングリストに返信(&L)..."
@@ -5415,7 +5436,7 @@
 msgid "&Edit As New"
 msgstr ""
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5612,122 +5633,122 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "メッセージを検索"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "検索(&S)"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "本文に引用(&I)..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "添付ファイルとして(&A)..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "添付ファイルを保存..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "選択をクリア"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "フォルダへジャンプ"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 件マッチ"
 msgstr[1] "%1 件マッチ"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "前回の検索"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "開始..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Can not move message. %1"
 msgid "Cannot get search result. %1"
 msgstr "メッセージを移動できません。%1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgctxt "@action:button Search for messages"
 #| msgid "&Search"
 msgid "Search failed."
 msgstr "検索(&S)"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgctxt "@action:button Search for messages"
 #| msgid "&Search"
 msgid "Search complete."
 msgstr "検索(&S)"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgctxt "@action:button Search for messages"
 #| msgid "&Search"
 msgid "Search stopped."
 msgstr "検索(&S)"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, fuzzy, kde-format
 #| msgid ""
 #| "There was a problem renaming your search folder. A common reason for this "
@@ -5740,21 +5761,21 @@
 "検索フォルダの名前変更に失敗しました。よくある理由は、別の検索フォルダが既に"
 "同じ名前を使っていることです。"
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "メッセージをコピー"
 msgstr[1] "%1 個のメッセージをコピー"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "メッセージを切り取り"
 msgstr[1] "%1 個のメッセージを切り取り"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5884,7 +5905,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5892,7 +5913,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5900,19 +5921,19 @@
 msgstr "この値は「KMail はじめに」を表示するかどうかを決定します。"
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "フォルダのクイック検索フィールドを表示する"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "デフォルトで本文に引用して転送する"
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Warn if the number of recipients is more than:"
@@ -5920,7 +5941,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5931,20 +5952,20 @@
 "告メッセージは無効にすることができます。"
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "送信する前に確認する(&B)"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "自動的に開封通知を要求する(&M)"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5961,13 +5982,13 @@
 
 # ACCELERATOR added by translator
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "自動保存の間隔(&I):"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5979,152 +6000,152 @@
 "存を無効にできます。"
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "メール作成ウィンドウに定型表現の管理と挿入を行うためのパネルを表示します。"
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "メッセージプレビュー"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "プレビューを表示しない"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "メッセージ一覧の下に表示"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "メッセージ一覧の横に表示"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "フォルダ一覧"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "長いフォルダ一覧"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "短いフォルダ一覧"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "新しいメッセージ用のメッセージテンプレート"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "返信用のメッセージテンプレート"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "全員に返信用のメッセージテンプレート"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "転送用のメッセージテンプレート"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "引用記号"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6132,7 +6153,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6140,7 +6161,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6148,7 +6169,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6156,7 +6177,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6164,7 +6185,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6446,10 +6467,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6794,13 +6852,11 @@
 msgid "Check URL With Phishing Google System"
 msgstr ""
 
-# ACCELERATOR added by translator
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "メールをチェック(&C)|/|$[~setProps ~label '受信']"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7471,6 +7527,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "「次回から確認しない」を選択した警告をすべて再有効化する"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7533,3 +7599,12 @@
 #, kde-format
 msgid "Zoom: %1%"
 msgstr ""
+
+#~ msgid "Text Snippets"
+#~ msgstr "テキスト定型表現"
+
+# ACCELERATOR added by translator
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "メールをチェック(&C)|/|$[~setProps ~label '受信']"
diff -Nru kmail-19.04.3/po/ja/kmail-refresh-settings.po kmail-19.12.3/po/ja/kmail-refresh-settings.po
--- kmail-19.04.3/po/ja/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/ja/kmail-refresh-settings.po	2020-03-03 00:34:06.000000000 +0000
@@ -0,0 +1,100 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-06-30 16:17-0700\n"
+"Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
+"Language-Team: Japanese <kde-jp@kde.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr ""
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr ""
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr ""
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr ""
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr ""
diff -Nru kmail-19.04.3/po/ja/ktnef.po kmail-19.12.3/po/ja/ktnef.po
--- kmail-19.04.3/po/ja/ktnef.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/ja/ktnef.po	2020-03-03 00:34:06.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2012-04-12 22:43-0700\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
diff -Nru kmail-19.04.3/po/kk/akonadi_archivemail_agent.po kmail-19.12.3/po/kk/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/kk/akonadi_archivemail_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/kk/akonadi_archivemail_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2013-09-10 03:52+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -176,12 +176,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr "Бұл қапшық үшін екінші архив қосылмады. Оның орына барын өзгертіңіз."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "%1 архивтеуі басталды"
diff -Nru kmail-19.04.3/po/kk/akonadi_mailfilter_agent.po kmail-19.12.3/po/kk/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/kk/akonadi_mailfilter_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/kk/akonadi_mailfilter_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2013-07-10 02:35+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -22,17 +22,17 @@
 msgid "Filter Log Viewer"
 msgstr "Сүзгі журналы"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Сүзгі журналы жүргізілсін"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -41,23 +41,23 @@
 "Мұнда сүзгі журналының жүргізуін қосып-ажырата аласыз. Әрине, оған деректер "
 "тек қосылған кезде жазылады. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Журналды жүргізу тәртібі"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Үлгі сипаттамасын жазу"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Сүзгілеу &ережесінің жұмысын жазу"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -70,34 +70,34 @@
 "параметр таңдалса, журналда әрбір сүзгінің әрбір ережесінің жұмыс нәтижесі "
 "жазылады, әйтпесе сүзгінің барлық ережелелінің нәтижесі бірден жазылады."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Сүзгілеу үлгінің жұмысын жазу"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Сүзгі амалдарының журналы жүргізілсін"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Журнал өлшемінің шегі:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " КБ"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "шектелмеген"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -110,7 +110,7 @@
 "өлшемі келтірілген шегіне жетсе, онда орынды босату үшін ескі деректер "
 "журналдан жойылады. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -119,64 +119,64 @@
 "%1 файлы жазылмады.\n"
 "Қатенің сипаттамасы: \"%2\"."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail қатесі"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "%1 / %2 хатты сүзгілеу"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, fuzzy, kde-format
 #| msgid "Error applying mail filter delete"
 msgid "Error applying mail filter move"
 msgstr "Пошта сүзгісін өшіру кезде қате орын алды"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Пошта сүзгісін өшіру кезде қате орын алды"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Пошта сүзгісін өзгерткен кезде қате орын алды"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Сүзгі ережелерін қортындысы:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Хат сүзгі ережелеріне сәйкес келеді.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>\"%3\", \"%2\" дегендегі \"%1\" хаты сүзгілеу басталды :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Хаттарды сүзгілеу"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Хат сүзгілеу журналы рұқсат етілген"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Дайын"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "%1 дегенде сүзгілеу"
diff -Nru kmail-19.04.3/po/kk/akonadi_sendlater_agent.po kmail-19.12.3/po/kk/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/kk/akonadi_sendlater_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/kk/akonadi_sendlater_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2013-10-16 03:33+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -60,127 +60,127 @@
 msgid "Your emails"
 msgstr "sairan@computer.org"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Кімге: "
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Тақырыбы"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Қай мағайында жіберу:"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Қайталануы"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Хат идентификаторы"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Күтіп тұрған хат жоқ."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Қазір жіберу"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Өшіру"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Иә"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Жоқ"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected items? Do you want to continue?"
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Таңдалғаның өшірмексіз бе? Жалғастыру керек пе?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Аталымдарды өшіру"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Хаттарды да өшірмексіз бе?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Хаттарды өшіру"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, fuzzy, kde-format
 #| msgid "Not message found."
 msgid "Not message found."
 msgstr "Хат табылмады."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, fuzzy, kde-format
 #| msgid "Not message found."
 msgid "No message found."
 msgstr "Хат табылмады."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Хатты алу кездегі қате."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Хат алынбады. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Тасымалдау жасамады"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Хат шын хат емес"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Хат жіберілмеді."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Хат жіберілді"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Қате табылды. Қайта жібермексіз бе?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Қате табылды."
diff -Nru kmail-19.04.3/po/kk/kmail.po kmail-19.12.3/po/kk/kmail.po
--- kmail-19.04.3/po/kk/kmail.po	2019-07-09 00:20:23.000000000 +0000
+++ kmail-19.12.3/po/kk/kmail.po	2020-03-03 00:34:07.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2013-11-01 04:27+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -198,8 +198,8 @@
 msgstr "Бір адреске бірнеше шифрлау кілтті қолдану"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -306,27 +306,27 @@
 "KMail бұл қапшықта хабарлау тізімін таба алмады. Адрестерді қолмен "
 "толтырыңыз."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Квота"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Қолдануы:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Күй-жайы: "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% толған"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 KiB used"
 msgid "%1 of %2 used"
@@ -350,7 +350,7 @@
 "басыңыз.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Үлгілері"
@@ -361,109 +361,109 @@
 msgstr "Бұл қапшықта өзінің хат үлгілері қ&олданылсын"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Жалпы үлгілерін көшірмелеу"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Көрініс"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Өзгеше &таңбашалар болсын"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Қалыпты:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Оқылмаған:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Хаттар тізімінде Жіберуші/Алушы бағаны көрсетілсін"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Көрс&етілетін бағандар:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Әдетті"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Жіберуші"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Алушы"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Хаттар тізімі"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Әдетті шоғырлану"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Шоғырлану"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Әдетті нақышы"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Нақышы"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "Қауіпсіз емес хат пішімі"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "HTML-ді жай мәтіннен артық көру"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "&HTML-ді жай мәтіннен артық көру"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -474,104 +474,109 @@
 msgid "Retrieval Options"
 msgstr "Кіріс параметрлері"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Іс-әлпеті"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Қабылдау"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Жіберу"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, fuzzy, kde-format
 #| msgid "IMAP server"
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "IMAP сервері"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Жіберетін тіркелгілер (кемінде біреуі):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Жалпы параметрлері"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Жіберу &алдында құптау сұралсын"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Жіберер алдына емлесін тексеру"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Автоматты түрде жіберілмесін"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Поштаны қолмен тексергенде"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Бүкіл поштаны тексергенде"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Қазір жіберу"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Кейінірек жіберу"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Шығыс қапшықтағы &хаттарды жіберу:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Әд&етті жіберу әдісі:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Тіркелгіні қосу"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "Тіркелгілер ретін ыңғайлау..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -579,30 +584,30 @@
 "properly installed."
 msgstr "Тіркелгі шебері жегілмеді. Орнатылғанын тексеріңіз."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Тіркелгі шебері жегілмеді."
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Қ&олмен тексерілетіндеріне қосылсын"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "KMail доғарғанда желіден шығу"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Бастау кезінде поштаны тексеру"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -659,7 +664,7 @@
 msgid "Fixed Width Font"
 msgstr "Бірқадамды қаріп"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Құрастырғыш"
@@ -966,61 +971,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Тег-белгісі қойылмады. Осылай аталған белгі бар екен."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Жалпы"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Стандартты үлгілер"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Өзінің үлгілері"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Тақырыбы"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Кодтамасы"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Айдарлар"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Тіркемелер"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Автотүзету"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Кескін өлшемін автоөзгерту"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Қолтаңба"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1029,12 +1034,12 @@
 "Хатты жаза бастағанда, автоматты түрде\n"
 "бапталған қолтаңбаны енгізу"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Қолтаңба барлық дәйексөзден жоғары болсын"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1043,18 +1048,18 @@
 "Қолтаңбаның алдында RFC-үйлесімді бөлгішті (қатар, қос сызықпен бос орын) "
 "енгізу"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Жауап бергенде, дәйексөзде ешбір қолтаңба келтірілмесін"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Пішімі"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1065,7 +1070,7 @@
 "таңдалса, онда дәйексөз ретінде толық хатты\n"
 "келтірмей, тек сол үзінді келтіріледі."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1076,18 +1081,18 @@
 "белгісі қойылады, бұндай жол дәйексөздер бір жолға сыймай, қосымша\n"
 "жолға тасымалдаудан пайда болса да."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 "Келтірілген жол ұзындығында автоматты түрде жол тасымалы рұқсат етілсін"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Автоматты түрде жолды тасымалдау жасайтын мәтін енін орнату"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1098,7 +1103,7 @@
 "алыңған хат келген пішімімен келтіріледі, ал белгісін алып тастаса, жауап "
 "әдетте жәй мәтінімен жазылады."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1109,34 +1114,34 @@
 "Қалын, көлбеу, асты сызық мәтін, тізім,\n"
 "сыртқы сілтемелер қолдауы бар."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Хат бетінде"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Хат тіркемесінде"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Басқаға жіберілетін хатың пішімін орнату"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Басқаға жіберудің әдетті түрі:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Алушылары"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1147,17 +1152,17 @@
 "Бөлек хат үшін ондайды \"Параметрлер - Не істелген туралы\n"
 "хабарламаны сұрау\" мәзірі арқылы істеуге болады."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Тым көп қабылдаушыларды келтіргенде - ескерту"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Алушылар саны қаншадан артық болса ескерту керегін орнату"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1174,7 +1179,7 @@
 "тосқауыл қояды. Бірақ бұл хабарлау тізімге жібергенде әсер\n"
 "етпейді."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1183,18 +1188,18 @@
 "Жуырда келтірілген адрестерін жаттап алып,\n"
 "оларды алушы ретінде ұсыну"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Сақтамау"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Жуырдағы адрестер шегі:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1203,43 +1208,43 @@
 "Автотолықтыруға жаттап алынатын жуырда келтірілген\n"
 "адрестер санның жоғарғы шегі"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Автотолтыру тәртібін баптау..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Автосақтамау"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Автосақтамау"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
 msgid_plural " minutes"
 msgstr[0] " минут"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Хат, келтірілген аралықта, автоматты түрде сақталсын"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Жа&уап тақырыбының префикстері"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1248,59 +1253,59 @@
 "Келесі префикстердің тізбегін біліп тану\n"
 "(әріптің үлкен-кішісін ескермейтін үлгі өрнегі):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Қ&осу..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Ө&шіру"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Өзгерту..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Жауаптың жаңа префиксін келтіріңіз:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Ба&сқаға жіберілетінін тақырып префикстері"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Қосу..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Өші&ру"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Өзгерту..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Басқаға жіберілетін жаңа префиксі:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1310,89 +1315,89 @@
 "таңбаларының барлығы түгел екенін тексеріп шығарады."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Ө&згерту..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Кодтауын келтіріңіз:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Жауап бергенде немесе басқаға жібергенде кодтамасы (мейілінше) &сақталсын"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Бұл кодтаманың қолдауы жоқ."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Басқа message-id жұрнағы қолданылсын"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "message-&id жұрнағы:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Қалаған mime айдар өрісін анықтау:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Атауы"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Мәні"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Жаңа"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Атауы:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Мәні:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid header"
 msgstr "Қолтаңбалау рұқсат &етілсін"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Тіркеме атауы Outlook-пен үйлесімді болсын"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1401,40 +1406,40 @@
 "Outlook(tm) түсінетіндей тіркеме атауларында латын әліппеге жатпайтын "
 "таңбаларын колдану үшін осы белгіні қойыңыз"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Жолғалған тіркемелерін байқау рұқсат &етілсін"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Тіркеменің болу мүмкін екендігін келесі сөздердің әрқайсы айғақ бола алады:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Жаңа кілт сөзді келтіріңіз:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Тіркемесі бар"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " кБ"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Шегі жоқ"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1526,7 +1531,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Құрастырғыш"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1646,7 +1651,7 @@
 msgid "Archive Folder"
 msgstr "Архив қапшығы"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "Archive"
 msgctxt "@action"
@@ -1713,18 +1718,18 @@
 msgid "Notification"
 msgstr "Құлақтандыру"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "%1 тіркеме: (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Тіркемелер тізімін жасыру"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Тіркемелер тізімін көрсету"
@@ -1741,333 +1746,333 @@
 msgid "Encoding"
 msgstr "Кодтамасы"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Хаттың емлесін тексеруде қолданатын сөздігін таңдаңыз."
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Хаттың көшірмесі жібелігеннен кейін қай қапшығында сақталатынын таңдаңыз"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Хатты жіберу үшін қолданатын шығыс тіркелгіні таңдаңыз"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Хаттың \"Кімден:\" өрісіне эл.пошта адресін келтіріңіз"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Хаттың тақырыбын өрісіне келтіріңіз"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Іс-әлпеті:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Сөздік:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "&Жіберілген пошта қапшығы:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Жіберу ә&дісі:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Кімден:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Тақырыбы:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Хатты жіберу"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Эл.поштаны жіберу жолы"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Жіберу"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "&Кейінірек жіберу"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "&Кейінірек жіберу жолы"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Кезекке қою"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Жоба жазу ретінде &сақтау"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Эл.поштаны Жоба қапшығында сақтау"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "&Үлгі ретінде сақтау"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Эл.поштаны Үлгі қапшығында сақтау"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "&Файлға сақтау"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Эл.поштаны мәтін не html файлына сақтау"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Мәтін файлын &енгізу..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Жуырдағы мәтін файлын &енгізу"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Адрес кітапшасы"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Адрестік кітапшаны ашу"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "Ж&аңа құрастығыш"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "&Алушыларды таңдау..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "&Тарату тізімін сақтау..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "&Тіркеме қылып орналастыру"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Бос орындарын к&етіру"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Қаріп ені б&ірыңғай болсын"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Жедел"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Не істелген туралы хабарламаны &сұрау"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "Не істелген туралы хабарламаны &сұрау"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Сөздерді тасымалдау"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Үзінділер"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Емлені &автоматты түрде тексеру"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Пішімдеуін өзгерту"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Пішімделген мәтін"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Пішімдеуін өзгерту режімін ауыстыру"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Барлық өрістер"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Іс-әлпеті"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Сөздік"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Жіберілген пошта қапшығы"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Жіберу әдісі"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Кімден"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Тақырыбы"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Қ&олтаңбамен жалғау"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Қ&олтаңбамен бастау"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Қолтаңбаны меңзеген орнына е&нгізу"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Емлені тексеру..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Емлесін тексеру"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Хатты &шифрлау"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Шифрлау"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Хатты қ&олтаңбалау"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Қолтаңба"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Криптография пішімі"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Хатқа криптографиялық пішімін таңдау"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Хаттарды іздеу..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMail-ді &баптау"
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2075,60 +2080,60 @@
 msgstr ""
 "<qt>Мәзірін мүлдем жасыру. Оны пернетақтадан %1 деп қайтара аласызы.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Мәзір панелін жасыру"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " %1-жол "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " %1-баған  "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ҮСТ"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "ЕНД"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Емлесі тексерілісін"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Емлесі тексерілмеісін"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Үлгі ретінде &сақтау"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Жоба жазу ретінде &сақтау"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "Үлгілер қапшығында сақтау. Бұны кейін пайдалануға болады."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2137,59 +2142,59 @@
 "Жоба жазу қапшығында сақтау. Бұл хатты кез келгенде бітіріп, жіберуіңізге "
 "болады."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Хатты әзірше сақтап қояйық па, әлде ысырып тастайық па?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Құрастырғышын жабу"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Хатты автосақтау жаңылысы"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Хат жіберу жаңылысы"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Жуырдағы файлды &енгізу"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Хат б&етіндегі кескін қылып қосу"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "&Тіркеме ретінде қосу"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Тіркеме атауы:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid Attachment Name"
 msgstr "Қолтаңбалау рұқсат &етілсін"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Add URL into Message as &Text"
 #| msgid_plural "Add URLs into Message as &Text"
@@ -2197,23 +2202,23 @@
 msgid_plural "Add URLs into Message"
 msgstr[0] "Хат &мәтін ретінде URL-(лер)ді қосу"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Файл(дар)ды &тіркеме ретінде қосу"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Алмасу буферіндегі мәтінді &тіркеме қылу"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "аталмаған "
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2225,12 +2230,12 @@
 "таңдалған (OpenPGP не S/MIME) кілттер жоқ.</p><p>Іс-әлпетін баптау "
 "диалогында кілтті таңдаңыз.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Шифрлау кілті анықталмаған"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2240,12 +2245,12 @@
 "<qt> <p>Хатты қолтаңбалау үшін, OpenPGP немесе S/MIME қолтаңбалау кілтін "
 "анықтау керек.</p><p>Іс-әлпетін баптау диалогында кілтті таңдаңыз.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Қолтаңбалау кілті анықталмаған"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2256,7 +2261,7 @@
 "эл.пошта адресіңізді, әрбір хатты жіберген сайын оны теріп отырмау үшін, "
 "барлық іс-әлпеттерінде келтіріңіз."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2265,37 +2270,37 @@
 "\"Кімге\" деген өрісте немесе \"Көшірме кімге\", әлде \"Жасырып кімге:\" "
 "өрістеріне, кемінде бір алушының адресін келтіруіңіз қажет."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "'Кімге:' өрісі бос ғой. Хат сонда да жіберіле берсін бе?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "'Кімге:' дегені келтірілмеген"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Тақырыбын келтірмедіңіз. Хат жіберіле берсін бе?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Тақырыбы келтірілмеген"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Ж&ібере беру"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Тақырыпты келтіру"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2303,87 +2308,87 @@
 msgstr ""
 "Жоба жазуын шифрлау үшін кемінде бір алушының адресін келтіруіңіз қажет."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Хат жіберілуге дайын..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Растауын жіберу"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Қазір жіберу"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr "Хатты %1 алушылардан артығына жібермексіз. Жіберле берсін бе?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Алушылар тым көп"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Бар түрінде жіберу"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Алушыларды өзгерту"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "HTML күйінен қайту мәтіннің пішімдеуін жоғалтады. Бола берісн бе?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Пішімдеуі жоғалсын бе?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Пішімдеуі жоғалсын"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Жай мәтін белгісін қосу"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2391,7 +2396,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2471,27 +2476,27 @@
 msgid "External editor was started."
 msgstr "Сыртқы өңдегіш жұмысын бастады."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Архив қапшығы анықталмаған. Тіркелгінің параметрлерін тексеріңіз"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Архив қапшығы анықталмаған. Тіркелгінің параметрлерін тексеріңіз"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid ""
@@ -2519,11 +2524,6 @@
 msgid "Message will not be encrypted"
 msgstr "Хат шифрланбайды"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Мәтін үзінділері"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2575,31 +2575,31 @@
 msgid "Cannot move messages."
 msgstr "Хат жылжытылмады. %1"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Қапшықты құру жаңылысы"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "Қапшық таңдалмаған"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Қапшықты құру жаңылысы"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Unable to retrieve folder list."
 msgid "Unable to return list of folders."
 msgstr "Қапшықтар тізімі алынбады."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Message was signed by %1."
 msgid "Messages archived"
@@ -2642,50 +2642,50 @@
 msgid "&Existing identities:"
 msgstr "Бар &іс-әлпеттері:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "%1 қапшығын қайта атау кезінде қате пайда болды"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Жаңа кілт сөзді келтіріңіз:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Іс-әлпетін өңдеу"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Жалпы"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Есіміңіз:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2697,12 +2697,12 @@
 "p><p>Егер өріс бос қалса, хат айдарында тек эл.пошта адресіңіз ғана "
 "көрсетіледі.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Ұйымыңыз:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2713,12 +2713,12 @@
 "көрсетілетін Сіз істейтін ұйымыңызды келтіруге болады.</p><p>Бұны бос "
 "қалдыру да ерсі емес.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Эл.пошта адресі:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2733,12 +2733,12 @@
 "ретінде келтіріңіз.</p><p>Егер бұны бос қалдырсаңыз не қате толтырсаңыз, "
 "хатыңызға жауап беруге мүмкін болмайды.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Бүркеншік эл.пошта адрестері:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2755,12 +2755,12 @@
 "org<br>last@example.org</td></tr></table><p>Бір жолда бір адресті келтіріңіз."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Шифрлау"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2782,12 +2782,12 @@
 "p><p>Кілттер туралы толығырақ мынадан оқыңыз: <a>http://www.gnupg.org</a></"
 "p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP қолтаңбалау кілті:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2812,12 +2812,12 @@
 "<p>Кілттер туралы толығырақ мынадан оқыңыз: <a>http://www.gnupg.org</a> </"
 "p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP шифрлау кілті:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2830,12 +2830,12 @@
 "қолданып хатты цифрлық қолтанбалай алмайды, ал кәдімгі пошта айналымына "
 "бұның әсері жоқ.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME қолтаңбалау куәлігі:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2850,40 +2850,40 @@
 "жіберетін хаттың көшірмесін өзіңізге шифрлай алмайды, ал кәдімгі пошта "
 "айналымына бұның әсері жоқ.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME шифрлау куәлігі:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Артық көретін пішімі:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Хаттар автоматты түрде қолтаңбалансын"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Мейлінше, хаттар &автоматты түрде шифрлансын"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "&Қосымша"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Жауап беру адресі:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2901,12 +2901,12 @@
 "жеке адресті келтіруге болады.</p><p>Күмәндансаңыз бұл өрісті бос қалдырыңыз."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "'&Жасырып кімге' адрестері:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2922,12 +2922,12 @@
 "p><p>Бірнеше адресті келтіруге (үтірмен бөліп) келтіруге болады.</"
 "p><p>Күмәндансаңыз бұл өрісті бос қалдырыңыз.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Жасырып кімге адрестері:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2943,58 +2943,58 @@
 "тіркелгіңізге жіберу үшін қолданады.</p><p>Күмәндансаңыз бұл өрісті бос "
 "қалдырыңыз.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Сөзд&ік:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Жіберілген хаттар қап&шығы:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Жоба жазба қапшығы:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Үлгілер қапшығы:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "IШығыс тіркелгісі"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Хатқа vCard-ты қосу"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Құру..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Автотүзету тілі:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Әде&тті домені:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Әде&тті домені:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3003,33 +3003,33 @@
 "<qt><p>Әдетті домен тек пайдаланушының атауынан тұратын эл.пошта адресін "
 "толықтыру үшін қолданылады.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Бұл іс-әлпеті үшін өзінің үлгілері қол&данылсын"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Қолтаңба"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Сурет"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Жарамсыз эл.пошта бүркеншігі: \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Жарамсыз эл.пошта адресі"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3042,7 +3042,7 @@
 "Бұл алушы жағында қолтаңбаны тексеру кезінде ескерту хабарларының пайда "
 "болуға себеп болуы мүмкін."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3051,7 +3051,7 @@
 "Бапталған OpenPGP шифрлау кілттерінің біреуінде, осы іс-әлпеті (%1) үшін, эл."
 "пошта адресі көрсетілген пайдаланушының идентификаторы жоқ."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3064,7 +3064,7 @@
 "Бұл алушы жағында қолтаңбаны тексеру кезінде ескерту хабарларының пайда "
 "болуға себеп болуы мүмкін."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3073,22 +3073,22 @@
 "Бапталған S/MIME шифрлау куәлігінің біреуінде, осы іс-әлпеті (%1) үшін, эл."
 "пошта адресі көрсетілген пайдаланушының идентификаторы жоқ."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Кілтте/куәлікте эл.пошта адресі табылмады"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Қолтаңба файлы жарамсыз"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "\"%1\" іс-әлпетін өңдеу"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3100,7 +3100,7 @@
 "\"%1\" іс-әлпетінде жоба жазбаға арнап қойған қапшығы (енді) жоқ; сондықтан "
 "әдеттегі қапшық қолданылады."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Өзгерту..."
@@ -3135,6 +3135,20 @@
 msgid "We cannot delete vCard file."
 msgstr "vCard файлды өшіре алмайсыз."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "Do you want to remove account: %1"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Келесі тіркелгіні өшірмексіз бе: %1"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Растауын жіберу"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3297,7 +3311,7 @@
 "Мысалдарды <a href=\"http://ace.home.xs4all.nl/X-Faces/\">http://ace.home."
 "xs4all.nl/X-Faces/</a> сайтында көруге болады."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Кескін"
@@ -3330,7 +3344,7 @@
 msgid_plural "Distribution lists %2 are empty, they cannot be used."
 msgstr[0] "\"%2\" тарату тізімі бос, пайдалануға жарамайды."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Адрестік кітапшасына қосу"
@@ -3340,22 +3354,22 @@
 msgid "Contact created successfully"
 msgstr "Контакт сәтті құрылды"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Контакт сақталмайды: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Контактты сақтау жаңылысы"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "\"%1\" қапшығын шын тіркемелексіз бе?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Қапшықты тіркемлеу"
@@ -3568,7 +3582,7 @@
 msgstr "Қ&апшық"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3576,7 +3590,7 @@
 msgstr "Қапшықа барлық сүзгілерді қ&олдану"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3602,7 +3616,7 @@
 msgstr "&Басқаға жолдау"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Сүзгіні қо&лдану"
@@ -3627,7 +3641,7 @@
 msgstr "&Анықтама"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Негізгі құралдары"
@@ -3681,12 +3695,12 @@
 msgid "The file does not contain a message."
 msgstr "Файлдың құрамында хат жоқ."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Бұл файлдың құрамында бірнеше хат бар. Тек бірінші хат көрсетілген."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3695,32 +3709,32 @@
 "Таңдалған хаттарды бір хаттың тіркемесі (MIME жинағы) ретінде, әлде бөлек "
 "хаттар ретінде басқаға жолдамақсыз ба?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Жинағын жіберу"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Бөлек жіберу"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Хаттарды сүзгілеу"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "%1 / %2 хатты сүзгілеу"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Хаттарды жылжыту"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Хаттарды өшіру"
@@ -3749,30 +3763,30 @@
 msgid "Text Direction Toolbar"
 msgstr "Мәтін бағытының құралдары"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail желіден тыс режімге ауысты. Барлық желілік тапсырмалар аялдатылды"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Хат жіберілуге дайын..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail желіге қосылды. Барлық желілік тапсырмалар жалғастырылды"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3781,38 +3795,38 @@
 "KMail желіде істемек. Желіге қосылғаны байқалғанда барлық желілік "
 "тапсырмалар жалғастырылды"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail желіден тыс режімде істеп тұр. Нені қалайсыз?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Желіде/Желіден тыс"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Желіде істеу"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Желіден тыс істеу"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "KMail желіге қосығаны байқалды, барлық желілік тапсырмалар жалғастырылды"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "KMail желіден тыс екенін байқады, барлық желілік тапсырмалар аялдады"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3821,64 +3835,66 @@
 "%1 дегендегі автоматты түрінде сақтайтын файлды ашу жаңылысы.\n"
 "Себебі: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Автосақтау файлды ашу жаңылысы"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the default transport:"
 msgstr[0] "Мынау %1 іс-әлпеті әдетті жіберу әдісіне ауыстырылған:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the modified transport:"
 msgstr[0] "Бұл %1 іс-әлпеті өзгертілген жіберу әдісіне ауыстырылған:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Хаттары жіберу"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Жіберу әрекетін бастау..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, fuzzy, kde-format
 #| msgid "Resource %1 is broken. This resource is now %2"
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "%1 деректер көзі істемейді. Бұл ресурс енді %2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Поштаны архивтеу агенті тіркелмеген."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Кейінірек жіберетін агенті тіркелмеген."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Send Later Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr "Кейінірек жіберетін агенті тіркелмеген."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3886,12 +3902,12 @@
 "properly installed."
 msgstr "Куәліктер менеджері жегілмеді, орнатудың дұрыстығын тексеріңіз."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail қатесі"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3899,25 +3915,29 @@
 "properly installed."
 msgstr "Импорттау шебері жегілмеді. Орнатылғанын тексеріңіз."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Импорттау шебері жегілмеді."
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "\"PIM баптауын экспорты\" бағдарламасы жегілмеді. Орнатылғанын тексеріңіз."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "\"PIM баптауын экспорты\" бағдарламасы жегілмеді"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3925,69 +3945,69 @@
 "properly installed."
 msgstr "Импорттау шебері жегілмеді. Орнатылғанын тексеріңіз."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Импорттау шебері жегілмеді."
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Жүйеңізде басқа пошта бағдарламасы табылды. Одан деректі импортамақсыз ба?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Импорттау шебері жегілмеді. Орнатылғанын тексеріңіз."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Тақырыбы жоқ"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(үлгілер жоқ)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Бұл қапшықтың ескіру мерзімі орнатылмаған"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt><b>%1</b> қапшығын ескі хаттардан тазаламақсыз ба?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Қапшықты ескіргендерден тазалау"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Ескілерден тазалау"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Өшірілгендерді тазалау"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Өшірілгендерге жылжыту"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Өшірілгендер қапшығын тазаламақсыз ба?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3996,27 +4016,27 @@
 "<qt><b>%1</b> қапшығынан барлық хаттарды өшірілгендер қапшығына жылжытпақсыз "
 "ба?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Барлық хаттар өшірілгендер қапшығына жылжытылды"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Барлық ескі хаттарды өшірмексіз бе?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Ескі хаттардан тазалау керек пе?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Ескілерден тазалау"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4027,17 +4047,17 @@
 "қарсылығыңызды осалдатады да, жүйеңізді қазір мәлім немесе болашақтағы "
 "шабулдау әдістермен бұзу ықтималдығын ұлғайтады."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Қауіпсіздік ескерту"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Сыртқы сілтемелерді жүктеу"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4049,539 +4069,539 @@
 "<qt>Таңдалған %1 хатты жоюды қалайсыз ба?<br />Жойылған хатты қайтаруға "
 "болмайды.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Хаттарды жою"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Хатты жою"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Хаттарды жылжыту"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Хаттарды өшіру"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Хаттарды жою сәтті орындалды."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Хаттарды жылжыту сәтті орындалды"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Хаттар жою жаңылысы."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Хаттарды жою тоқтатылды."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Хаттарды жылжыту жаңылды."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Хаттарды жылжыту тоқтатылды."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Қапшыққа жылжыту"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Хаттарды көшірмелеу..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Хаттарды көшірмелеу сәтті орындалды."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Хаттарды көшірмелеу жаңылды."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Хаттарды көшірмелеу тоқтатылды."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Хатты қапшыққа көшірмелеу"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Хатты өшірілгендерге тастау"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Хатты өшірілгендерге тастау"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Хаттарды өшірілгендерге жылжыту сәтті орындалды"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Хаттарды өшірілгендерге жылжыту сәтті орындалды"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Хаттарды өшірілгендерге жылжыту жаңылды."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Хаттарды өшірілгендерге жылжыту жаңылды."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Хаттарды Шелекке тастау тоқтатылды."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Хаттарды Шелекке тастау тоқтатылды."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Қапшыққа ауысу"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "&Былай сақтау..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Бүкіл қапшықтарды ескілерден тазалау"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Поштаны тексеру"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Келесідегі поштаны тексеру"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Поштаны тексеру"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Кезектегі хаттарды жіберу"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Желідегі күй-жайы (беймәлім)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Кезектегі хаттарды жіберу жолы"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Куәлік менеджері..."
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "Хаттарды &импорттау..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Sieve жө&ндеуі..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Сүзгі ж&урналы..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "\"Кеңседе жоқ\" жауаптарын өңдеу..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Автоматы архивтеуді &баптау..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "Хаттарды өшіру"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Хаттарды іздеу..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Өшіру"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Ілеспе хаттарды өшірілгендерге та&стау"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Ілеспе хаттарды өшірілгендерге тастау"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "І&леспеледі өшіру"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Хаттарды іздеу..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "&Барлық хаттарды таңдау"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Хабарлау тізімін басқару..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Тіркесімді орнату..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Ескіру параметрлері"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "Қапшықты &архивтеу..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "С&ыртқы сілтемелерді жүктеу"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Хатты мынаған көшірмелеу..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Хатты мынаған жылжыту..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Жаңа хат..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Жаңа"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "&Үлгіден хатқа"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Тарату тізімін&е жаңа хат..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Сүзгіні құ&ру"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Тақ&ырыбы бойынша сүзгі..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "&Кімден өрісі бойынша сүзгі..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Кімг&е өрісі бойынша сүзгі..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Кімг&е өрісі бойынша сүзгі..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "&Ілеспе деп белгілеу"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Ілеспелерді оқы&лған деп белгілеу"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Таңдалған ілеспе топтағы барлық хаттарды оқылған деп белгілеу"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Ілеспелерді оқыл&маған деп белгілеу"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Таңдалған ілеспе топтағы барлық хабарды оқылмаған деп белгілеу"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Ілеспелерді &маңызды деп белгілеу"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Ілеспелердің &маңызды белгісін өшіру"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Ілеспелерді &амал күтетін деп белгілеу"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "&Амал күтетін деген белгісін өшіру"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Ілеспелерді қа&дағалау"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Ілеспелерді &елемеу"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Ті&ркемелерді сақтау..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Аталымды мынаған көшірмелеу..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Барлық сүзгілерді қ&олдану"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Ілеспелерді/Топты та&рқату"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Назардағы ілеспелерді не топты тарқату"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Ілеспелерді/Топты &бүктеу"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Назардағы ілеспелерді не топты бүктеу"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Бүкіл ілеспелерін &тарқату"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Назардағы қапшықтағы барлық ілеспе топтарды жаю"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Барлық ілеспелерін &бүктеу"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Назардағы қапшықтағы барлық ілеспе топтарды бүктеу"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Хатты &көрсету"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Келесі хат"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Келесі хатқа өту"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Келесі оқыл&маған хат"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Келесі"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Келесі оқылмаған хатқа өту"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Алдыңғы хат"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Алдыңғы хатқа өту"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Алдыңғы оқылмаған &хат"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Алдыңғы"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Алдыңғы оқылмаған хатқа өту"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Келесі оқылмаған қа&пшық"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Оқылмаған хаты бар келесі қапшыққа өту"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Алдыңғы оқылмаған қ&апшық"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Оқылмаған хаты бар алдыңғы қапшыққа өту"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Келесі оқылмаған &мәтін"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Келесі оқылмаған мәтінге өту"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4590,230 +4610,236 @@
 "Назардағы хатты төменге жүгірту. Хаттың соңына жеткен соң келесі оқылмаған "
 "хатқа өту."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "&Сүзгілерді баптау..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "&Sieve скрипттерін басқару..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Тіркелгіні қосу"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail &кіріспесі"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "KMail кіріспе бетін көрсету"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Құ&лақтандыруларды баптау..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "KMail &баптаулары..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Ескіргеннен тазалау..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Таңдаулыларға қапшықты қосу..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Сервер жақ жазылуы..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Барлық сүзгілерді қ&олдану"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "KMail дерегін &импорттау..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Жаңа Адрестік кітапша контакты..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Хатты көшірмелейтін қапшық"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Ауысатын қапшық..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Орындалып жатқан әрекетті доғару"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Келесі қапшыққа ауысу"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Алдыңғы қапшыққа ауысу"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Назардағы қапшықты таңдау"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Бірінші қапшыққа ауысу"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Соңғы қапшыққа ауысу"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Келесі хатқа ауысу"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Алдыңғы хатқа ауысу"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Бірінші хатты таңдау"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Соңғы хатты таңдау"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Назардағы хатты таңдау"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Жедел іздеуге ауысу"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Алдыңғы хатқа таңдауды кеңейту"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Келесі хатқа таңдауды кеңейту"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Хатты жылжытатын қапшық"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message W&indow"
 msgid "Use Less Bandwidth"
 msgstr "Хат т&ерезесі"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Баптау"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity account"
+msgid "Restart Account"
+msgstr "Іс-әлпетінің тіркелгісі"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Таңдаулыларға қапшықты қосу"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Шелегін б&осату"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Барлық хаттарды Шелекке тастау"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Іздеуді ө&шіру"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Cкриптті өңдеу..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "%1 сүзгісі"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Searching..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Іздеп жатыр..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4824,12 +4850,12 @@
 "қазір мәлім немесе болашақтағы шабуылдау әдістермен бұзу ықтималдығын "
 "ұлғайтады."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML-ды қолдану"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4839,120 +4865,120 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "Қ&айту"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Бастау..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Өшірілгендерге &тастау"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Өшірілгендер"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Хатты өшірілгендерге тастау"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Аталым көшірілмеді. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Мынаған жаңа хат..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Мынаған жауап беру..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Басқаға жіберу..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Failed to store contact"
 msgid "Add to Existing Contact"
 msgstr "Контактты сақтау жаңылысы"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Адрестік кітапшасында ашу"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Сілтемені бетбелгіеу"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Контактты өңдеу..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Сілтемені былай сақтау..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Хаттарда іздеу..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Кескінді дискіге сақтау..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "HTML пішімін көрсету"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Осы контакттан пошта келгенде HTML пішімін көрсету"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Осы контакттан пошта келгенде сыртқы  сілтемелерін жүктеу"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Кескінді ортақтастыру..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4961,68 +4987,68 @@
 "KMail is көп өзгеістерге дұшар болып, енді Akonadi дербес мәліметті басқару "
 "құрылымын негіздейді."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Хатты жіберу (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Жетілдірілген іздеу"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Хаттарға андатпаларды қосуды қолдау "
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Итерфейсінің жұмысын тежемеу үшін поштаны тексеруді қатар істеу"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG шифрлауын қолдау"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "Жіберер алдына емлесін тексеру"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE эл.пошта клиенті"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "Қапшық қасиетерін алу"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Күте тұрыңыз"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "желіден тыс"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5036,7 +5062,7 @@
 "істеп тұр. Желіге қосылу үшін <a href=\"kmail:goOnline\">мұнда</a> "
 "түртіңіз . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5050,22 +5076,22 @@
 "істеп тұр. Желіге қосылу үшін <a href=\"kmail:goResourceOnline\">мұнда</a> "
 "түртіңіз . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Контакт сәтті өзгертілді"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Жаңа хаттары бар "
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Оқылмаған хаттар жоқ"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5087,8 +5113,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5181,19 +5207,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Контакттар"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5242,28 +5268,28 @@
 msgid "All"
 msgstr "Бүкіл"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2005, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2005, KMail жасаушысылары"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5290,7 +5316,7 @@
 msgid "&Reply"
 msgstr "&Жауап беру"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Жауап беру..."
@@ -5300,12 +5326,12 @@
 msgid "Reply to A&uthor..."
 msgstr "А&вторға жауап беру..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Б&үкіліне жауап беру..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Тарату &тізіміне жауап беру..."
@@ -5336,7 +5362,7 @@
 msgid "&Edit As New"
 msgstr "Хатты өңд&еу"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5534,117 +5560,117 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Nepomuk іздеуді жасай алмады. Қателері: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Хаттарды іздеу"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Іздеу"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "Хаттың &бетінде..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Тіркеме ретінде..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Тіркемелерді сақтау..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Таңдаудан айну"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "Қапшыққа ауысу"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 сәйкестік"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Соңғы іздеу"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Дұрыс қапшықты таңдамадыңыз."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Жиындарды таңдауды ұмыттыңыз."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Шарты анықталмаған."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Бүкіл таңдалған қапшықтар бос не индекстелмеген."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, fuzzy, kde-format
 #| msgid "You forgot to define condition."
 msgid "You forgot to add conditions."
 msgstr "Шарты анықталмаған."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Бұнда таңбалар саны төрттен кем болмайтын шарты бар."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Іздеп жатыр..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Іздеу нәтижесіз болды. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "Іздеу доғарылды"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid " completed"
 msgid "Search complete."
 msgstr " аяқталды"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid "Search tag"
 msgid "Search stopped."
 msgstr "Іздейтін тег-белгісі"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5654,19 +5680,19 @@
 "Іздеу қапшықтың атауын өзгерту мәселесі. Бұның ең ықтимал себебі - дәл "
 "осылай аталған іздеу қапшықтың болғаны. Қайтарылған қате: \"%1\""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "%1 хатты көшшірмелеу"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "%1 хатты кесіп алу"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5799,7 +5825,7 @@
 "Қолданба ең бірінші рет жегіліп жатқанын көрсетді (тек ішкі колданысы үшін)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5807,7 +5833,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5815,26 +5841,26 @@
 msgstr "KMail кіріспе бетін көрсету қажетілігін білдіретін мән."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Жедел іздеу өрісі көрсетілсін"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Басқаға жолдайтыны әдетте хат бетінде жіберілсін."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Алушылар саны келесіден артық болса ескерту:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5845,19 +5871,19 @@
 "өшіріп қоюға болады."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Жіберер алдына емлесін тексеру"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "&Хатпен не істеген туралы хабарлауы автоматты түрде сұралсын"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5873,13 +5899,13 @@
 "құлақтандыруды сұрау</em> деген жол арқылы өзгертуге болады.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Автосақтау аралығы:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5891,153 +5917,153 @@
 "жасалмайды."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "Құрастырғышында мәтін үзінділерін басқару және енгізу панелі көрсетілсін"
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Белгіленсе, жіберілген хаттар шифрланған түрде сақталады"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Жуырда қолданған URL-адрестер тізімі"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Жуырда қолданған кодтамалар тізімі"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 #| msgid "Show crypto &icons"
 msgid "Show crypto label indicator"
 msgstr "&Шифрлау таңбашасы көрсетілсін"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Іс-әлпеті диалогының өлшемі (тек ішкі қолданысы үшін)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Іздеу терезесінің ені (тек ішкі қолданысы үшін)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Іздеу терезесінің биіктігі (тек ішкі қолданысы үшін)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "KMail баптау диалог терезесінің ені (тек ішкі қолданысы үшін)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "KMail баптау диалог терезесінің биіктігі (тек ішкі қолданысы үшін)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Хаттың көрніс терезесі"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Хат көрнісінің терезесі көрсетілмесін"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Хат көрнісі хаттар тізімінен төмен көрсетілсін"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Хат көрнісі хаттар тізімінен кейін көрсетілсін"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Қапшықтар тізімі"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Ұзын қапшық тізімі"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Қысқа қапшық тізімі"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Жаңа хат үшін хат үлгісі"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Жауап үшін хат үлгісі"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Барлығына жауап үшін хат үлгісі"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Басқаға жолдау үшін хат үлгісі"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Дәйексөз белгілері"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Ережелер көрсету саясатын келтіру"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6047,7 +6073,7 @@
 "үшін)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6057,7 +6083,7 @@
 "үшін)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6067,7 +6093,7 @@
 "үшін)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6077,7 +6103,7 @@
 "үшін)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6086,7 +6112,7 @@
 "Іздеу диалог терезесіндегі күннің өріс енің көрсету (тек ішкі қолданысы үшін)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6353,10 +6379,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6718,10 +6781,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Келесідегі поштаны тексеру"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7336,6 +7398,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Барлық \"Ендігәрі сұралмасын\" деген ескертулер қайта болсын"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7396,6 +7468,14 @@
 msgid "Zoom: %1%"
 msgstr "Масштаб"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Мәтін үзінділері"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Келесідегі поштаны тексеру"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Квотасына жақын қапшықтың атауы мен өлшемі"
 
@@ -10069,12 +10149,6 @@
 #~ msgid "Add Group"
 #~ msgstr "Топты қосу"
 
-#, fuzzy
-#~| msgid "Do you want to remove account: %1"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Келесі тіркелгіні өшірмексіз бе: %1"
-
 #~ msgid "&Apply"
 #~ msgstr "&Іске асыру"
 
@@ -11099,9 +11173,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Тіркелгі әдетті Іс-әлпетін пайдаланатынын анықтау"
 
-#~ msgid "Identity account"
-#~ msgstr "Іс-әлпетінің тіркелгісі"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "Өзгерістерін қадағалайтын пошта жәшігінің мәліметін алатын жолы"
 
diff -Nru kmail-19.04.3/po/kk/ktnef.po kmail-19.12.3/po/kk/ktnef.po
--- kmail-19.04.3/po/kk/ktnef.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/kk/ktnef.po	2020-03-03 00:34:06.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2013-09-30 02:24+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
diff -Nru kmail-19.04.3/po/km/akonadi_archivemail_agent.po kmail-19.12.3/po/km/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/km/akonadi_archivemail_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/km/akonadi_archivemail_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: archivemailagent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2012-12-25 10:57+0700\n"
 "Last-Translator: sutha <sutha@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros>\n"
@@ -179,12 +179,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr "មិន​អាច​បន្ថែម​ប័ណ្ណសារ​ទី​ពីរ​សម្រាប់​ថត​នេះ​បាន​ទេ ។ កែសម្រួល​ប័ណ្ណសារ​ដែល​មាន​រួចហើយ​ជំនួស​វិញ ។"
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "ចាប់ផ្ដើម​ទុក​ក្នុង​ប័ណ្ណសារ %1"
diff -Nru kmail-19.04.3/po/km/akonadi_mailfilter_agent.po kmail-19.12.3/po/km/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/km/akonadi_mailfilter_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/km/akonadi_mailfilter_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mailfilteragent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2012-12-25 11:13+0700\n"
 "Last-Translator: sutha <sutha@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros>\n"
@@ -25,17 +25,17 @@
 msgid "Filter Log Viewer"
 msgstr "កម្មវិធី​​មើល​កំណត់ហេតុ​តម្រង"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "ចុះ​កំណត់ហេតុ​អំពី​សកម្មភាព​របស់​តម្រង"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -44,23 +44,23 @@
 "អ្នក​អាច​បើក​/បិទ​​ការ​ចុះ​កំណត់ហេតុ​អំពី​សកម្មភាព​តម្រង​នៅ​ទីនេះ​បាន ។ ពិតមែន​ហើយ ទិន្នន័យ​កំណត់ហេតុ​ត្រូវ​បាន​"
 "ប្រមូល និង​បង្ហាញ​តែ​នៅ​ពេល​ការ​ចុះ​កំណត់ហេតុ​ត្រូវ​បាន​បើក​តែប៉ុណ្ណោះ ។"
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "សេចក្ដី​លម្អិត​អំពី​ការ​ចុះ​កំណត់ហេតុ"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "ចុះ​កំណត់ហេតុ​ការ​ពិពណ៌នា​អំពី​លំនាំ"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "ចុះ​កំណត់ហេតុ​ការ​វាយតម្លៃ​អំពី​ច្បាប់​តម្រង"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -73,34 +73,34 @@
 "៖ ការ​គូស​ធីក​ជម្រើស​នេះ​នឹង​ផ្ដល់​នូវ​មតិ​អ្នកប្រើ​ដ៏​លម្អិត​សម្រាប់​ច្បាប់​តម្រង​ទោល​នីមួយ​ៗ​បាន ហើយ​មាន​តែ​មតិ​អ្នកប្រើ​"
 "អំពី​លទ្ធផល​នៃ​ការ​វាយតម្លៃ​ទាក់ទង​នឹង​ច្បាប់​ទាំងអស់​របស់​តម្រង​ទោល​ប៉ុណ្ណោះ​នឹង​ត្រូវ​បាន​ផ្ដល់ ។"
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "ចុះ​កំណត់ហេតុ​ការ​វាយតម្លៃ​អំពី​លំនាំតម្រង"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "ចុះ​កំណត់ហេតុ​អំពី​សកម្មភាព​តម្រង"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "កំណត់​ទំហំ​ក្នុង​ការ​ចុះ​កំណត់ហេតុ ៖"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr ""
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "មិនកំណត់"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -112,7 +112,7 @@
 "អាច​កំណត់​ចំនួន​អង្គ​ចងចាំ​ដែល​ត្រូវ​ប្រើ​ជា​អតិបរមាបាន ៖ ប្រសិនបើ ទំហំ​ទិន្នន័យ​កំណត់ហេតុ​ដែល​បាន​ប្រមូល​លើស​ពី​ការ​"
 "កំណត់​នេះ​ ពេល​នោះ​ទិន្នន័យ​ដែល​ចាស់​បំផុត​នឹង​ត្រូវ​បាន​បោះបង់​ រហូត​ទាល់តែ​​​លែង​មាន​ការ​លើស​កំណត់​ទៀត ។"
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -121,64 +121,64 @@
 "មិន​អាច​សរសេរ​ឯកសារ %1 ៖\n"
 "\"%2\" គឺជា​សេចក្ដី​ពិពណ៌នា​អំពី​កំហុស​ដែល​លម្អិត ។"
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "កំហុស KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "ការ​ត្រង​សារ %1 នៃ %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, fuzzy, kde-format
 #| msgid "Error applying mail filter delete"
 msgid "Error applying mail filter move"
 msgstr "មាន​កំហុស​ក្នុង​ការ​អនុវត្ត​ការ​លុប​តម្រង​សំបុត្រ"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "មាន​កំហុស​ក្នុង​ការ​អនុវត្ត​ការ​លុប​តម្រង​សំបុត្រ"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "មាន​កំហុស​ក្នុង​ការ​អនុវត្ត​ការ​កែប្រែ​តម្រង​សំបុត្រ"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>ការ​វាយ​តម្លៃ​អំពី​ច្បាប់​តម្រង ៖</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>ច្បាប់​តម្រង​​បាន​ផ្គូផ្គង ។</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>ចាប់ផ្ដើម​ត្រង​សារ \"%1\" ពី \"%2\" នៅ \"%3\" ៖</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "ត្រង​សារ"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "បាន​បើក​កំណត់ហេតុ​តម្រង​សារ"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "រួច​ហើយ"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "ការ​ត្រង​នៅ​ក្នុង %1"
diff -Nru kmail-19.04.3/po/km/kmail.po kmail-19.12.3/po/km/kmail.po
--- kmail-19.04.3/po/km/kmail.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/km/kmail.po	2020-03-03 00:34:07.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2012-07-09 10:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -197,8 +197,8 @@
 msgstr "កូនសោ​អ៊ិនគ្រីប​ច្រើន​ក្នុង​អាសយដ្ឋាន​មួយ"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -303,27 +303,27 @@
 "in the addresses by hand."
 msgstr "KMail មិន​អាច​​រក​បញ្ជី​សំបុត្រ​រួម​នៅ​ក្នុង​ថត​នេះ​បាន​ឡើយ ។ សូម​បំពេញ​​អាសយដ្ឋាន​ដោយ​ដៃ ។"
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "កូតា"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr ""
@@ -346,7 +346,7 @@
 "បន្ទាប់មក​សង្កត់​គ្រាប់ចុច​ដែលអ្នកចង់​ឲ្យ​ភ្ជាប់​ជាមួយ​ថតនេះ ។</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "ពុម្ព"
@@ -357,109 +357,109 @@
 msgstr "ប្រើ​ពុម្ពសារ​ផ្ទាល់ខ្លួន​នៅ​ក្នុង​ថត​នេះ"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "ចម្លង​ពុម្ព​សកល"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "មើល"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "ប្រើ​រូបតំណាង​ផ្ទាល់ខ្លួន"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "ធម្មតា ៖"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "មិន​ទាន់​អាន ៖"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "បង្ហាញ​​ជួរឈរ​អ្នកផ្ញើ/អ្នកទទួល​នៅក្នុង​បញ្ជី​សារ"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "បង្ហាញ​ជួរឈរ ៖"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "លំនាំដើម"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "​អ្នក​ផ្ញើ"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "អ្នកទទួល"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "បញ្ជី​សារ"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "ប្រើ​ការ​រួម​បញ្ចូល​លំនាំដើម"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "ការ​រួមបញ្ចូល​គ្នា"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "ប្រើ​​រូបរាង​​លំនាំដើម"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "រូបរាង"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Message Default Format"
 msgstr "សារ​ថ្មី​ទៅ..."
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "HTML ដែលចូលចិត្ត​ទៅជា​អត្ថបទ​ធម្មតា"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "ចូលចិត្ត​ HTML ជាង​អត្ថបទ​ធម្មតា"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -470,103 +470,108 @@
 msgid "Retrieval Options"
 msgstr "ជម្រើស​ទៅ​យក"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "​អត្តសញ្ញាណ"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "ការទទួល"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "ការផ្ញើ"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "គណនីផ្ញើចេញ (បន្ថែម​យ៉ាងហោចណាស់​មួយ) ៖"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "ជម្រើស​ទូទៅ"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "អះអាងមុនផ្ញើ"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "ពិនិត្យ​អក្ខរាវិរុទ្ធ​មុន​ពេល​ផ្ញើ"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "កុំ​ដោយស្វ័យប្រវត្តិ"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "ពេល​ពិនិត្យមើលសំបុត្រដោយដៃ"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "ពេលពិនិត្យមើលសំបុត្រទាំងអស់"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "​ផ្ញើ​ឥឡូវ"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "​ផ្ញើ​ពេល​ក្រោយ"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "ផ្ញើ​សារ​ក្នុង​ថត​ប្រអប់ចេញ ៖"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "វិធីសាស្ត្រ​ផ្ញើ​លំនាំដើម ៖"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "Add Mail Account..."
 msgstr "បន្ថែម​ចំណាំ..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "ប្ដូរ​លំដាប់​គណនី​តាម​បំណង..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -574,30 +579,30 @@
 "properly installed."
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​គណនី​បានទេ ។ សូម​ពិនិត្យ​មើល​ការ​ដំឡើង​របស់​អ្នក ។"
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​គណនី​បានទេ"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "រួម​បញ្ចូល​ក្នុងការ​ពិនិត្យ​មើល​ដោយ​ដៃ"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "បើក​ក្រៅ​បណ្ដាញ នៅពេល​បិទ KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "ពិនិត្យ​មើល​សំបុត្រ​នៅ​ពេល​ចាប់ផ្ដើម"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -655,7 +660,7 @@
 msgid "Fixed Width Font"
 msgstr "ពុម្ពអក្សរទទឹងថេរ"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "កម្មវិធី​តែង"
@@ -962,93 +967,93 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "យើង​មិន​អាច​បង្កើត​ស្លាក​បាន​ទេ ។ ស្លាក​មាន​ឈ្មោះ​ដូច​គ្នា​រួចហើយ ។"
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "ទូទៅ"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "ពុម្ព​ស្តង់ដារ"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "ពុម្ព​ផ្ទាល់ខ្លួន"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "ប្រធាន​បទ"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "សំណុំ​តួអក្សរ"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "បឋមកថា"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "ឯកសារ​ភ្ជាប់"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "ការ​កែ​​ដោយ​ស្វ័យប្រវត្តិ"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "ប្ដូរ​ទំហំ​រូបភាព​ស្វ័យ​ប្រវត្តិ"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "​ហត្ថលេខា"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "ទ្រង់ទ្រាយ ៖"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, only quote the selected text instead of the complete "
@@ -1061,7 +1066,7 @@
 "នៅពេល​ឆ្លើយ​តប ស្រង់​តែ​អត្ថបទ​ដែលបានជ្រើស ​ជំនួស​ឲ្យ​សារ​ពេញលេញ នៅពេល​មាន​​អត្ថបទ​បាន​ជ្រើស​នៅ​ក្នុង​បង្អួច​"
 "សារ ។"
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1076,17 +1081,17 @@
 "សូម្បី​តែ​នៅពេល​​បន្ទាត់​ត្រូវ​បាន​បង្កើត​ដោយ​បន្ថែម​ការ​បំបែក​បន្ទាត់​​បន្ថែម​ខណៈពេល​ដែល\n"
 "រុំពាក្យ​ក្នុង​អត្ថបទ​ក៏​ដោយ ។"
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, only quote the message in the original format it was "
@@ -1099,7 +1104,7 @@
 "នៅ​ពេល​ឆ្លើយតប ដកស្រង់​តែ​សារ​ដែល​មាន​ទ្រង់ទ្រាយ​ដើម​តែ​ប៉ុណ្ណោះ​ វា​ត្រូវ​បាន​ទទួល ឬ​មិន​បាន​ទទួល ប្រសិនបើ​បាន​"
 "ដោះ​ធីក វា​នឹង​ឆ្លើយ​តប​ជា​អត្ថបទ​ធម្មតា​តាម​លំនាំដើម"
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1107,36 +1112,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "ក្នុង​តួ"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "ជា​ឯកសារ​ភ្ជាប់"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Default Forwarding Type:"
 msgid "Default forwarding type:"
 msgstr "ប្រភេទ​បញ្ជូល​បន្ត​លំនាំដើម ៖"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "&Edit Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "កែសម្រួល​អ្នក​ទទួល"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1144,18 +1149,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "ព្រមាន ប្រសិនបើ​មាន​អ្នក​ទទួល​ច្រើន​ត្រូវ​បាន​បញ្ជាក់"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Set the maximum number of recipients for the warning"
 msgstr "ព្រមាន នៅពេលដែល​ចំនួន​អ្នក​ទទួល​​ច្រើន​ជាង"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1166,51 +1171,51 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "គ្មានការ​រក្សាទុក​ដោយ​ស្វ័យប្រវត្តិ​ទេ"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "កំណត់​រចនាសម្ព័ន្ធ​លំដាប់​បំពេញ..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "គ្មានការ​រក្សាទុក​ដោយ​ស្វ័យប្រវត្តិ​ទេ"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "គ្មានការ​រក្សាទុក​ដោយ​ស្វ័យប្រវត្តិ​ទេ"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1218,19 +1223,19 @@
 msgid_plural " minutes"
 msgstr[0] "​ នាទី"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "ស្នើ​ការជូន​ដំណឹង​អំពី​ការរៀបចំ​សារ​ដោយស្វ័យប្រវត្តិ"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "បុព្វបទ​ប្រធានបទ​របស់​ការ​ឆ្លើយតប"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1239,59 +1244,59 @@
 "ទទួល​ស្គាល់​លំដាប់​នៃ​បុព្វបទ​នានា​ខាងក្រោម\n"
 "(ធាតុ​គឺ​ជា​កន្សោម​ធម្មតា​ដែល​មិន​ប្រកាន់​តួអក្សរ​តូច​ធំ) ៖"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "​បន្ថែម..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "​យកចេញ"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "កែប្រែ..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "បញ្ចូល​បុព្វបទ​ឆ្លើយតប​ថ្មី ៖"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "បុព្វបទ​ប្រធានបទ​របស់​ការ​បញ្ជូនបន្ត"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "បន្ថែម..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "​យកចេញ"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "​កែប្រែ..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "បញ្ចូល​បុព្វបទ​​បញ្ជូន​បន្ត​ថ្មី ៖"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1301,88 +1306,88 @@
 "បាន​ទាមទារ​ទាំងអស់ ។"
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "​កែប្រែ..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "បញ្ចូល​​សំណុំ​តួអក្សរ ៖"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "រក្សា​​សំណុំតួអក្សរដើម ពេល​​ឆ្លើយតប ឬ ​បញ្ជូន​បន្ត (បើ​អាច​ធ្វើ​បាន)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "មិនបាន​គាំទ្រ​សំណុំ​តួអក្សរ​នេះឡើយ ។"
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "ប្រើ​បច្ច័យ​​លេខសម្គាល់​សារ​ផ្ទាល់​ខ្លួន"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "បច្ច័យ​លេខសម្គាល់​សារ​ផ្ទាល់​ខ្លួន ៖"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "កំណត់​វាល​បឋមកថា​ mime ផ្ទាល់ខ្លួន ៖"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "ឈ្មោះ"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "តម្លៃ"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "​ថ្មី"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "ឈ្មោះ ៖"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "តម្លៃ ៖"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid header"
 msgstr "អាសយដ្ឋាន​អ៊ីមែល​មិនត្រឹមត្រូវ"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "ការ​ដាក់ឈ្មោះ​ឯកសារ​ភ្ជាប់​ Outlook ដែល​ឆបគ្នា"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1391,40 +1396,40 @@
 "បើក​ជម្រើស​នេះ​ដើម្បី​​ធ្វើ​ឲ្យ Outlook(tm) ស្គាល់​ឈ្មោះ​ឯកសារ​ភ្ជាប់​ដែល​មាន​តួអក្សរ​មិន​មែន​ជា​ភាសា​"
 "អង់គ្លេស"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "បើក​ការ​រក​​នៃ​ឯកសារ​ភ្ជាប់​ដែល​បាត់"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "ទទួល​ស្គាល់​​​ពាក្យ​គន្លឹះ​មួយ​ចំនួន​ខាងក្រោម​ នៅពេល​មាន​បំណង​ភ្ជាប់​ឯកសារ ៖"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "បញ្ចូល​ពាក្យ​គន្លឹះ​ថ្មី ៖"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "Attachments"
 msgid "Maximum Attachment Size:"
 msgstr "ឯកសារ​ភ្ជាប់"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr "គីឡូបៃ"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "គ្មាន​ព្រំដែន"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1519,7 +1524,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "កម្មវិធី​តែង"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1635,7 +1640,7 @@
 msgid "Archive Folder"
 msgstr "​ថត​​ប័ណ្ណសារ"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "Archive"
 msgctxt "@action"
@@ -1702,18 +1707,18 @@
 msgid "Notification"
 msgstr "ការ​ជូនដំណឹង "
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "%1 ឯកសារ​ភ្ជាប់ (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "លាក់​បញ្ជី​ឯកសារភ្ជាប់"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "បង្ហាញ​បញ្ជី​ឯកសារ​​ភ្ជាប់"
@@ -1730,393 +1735,393 @@
 msgid "Encoding"
 msgstr "ការ​អ៊ិនកូដ"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "ជ្រើស​វចនានុក្រម​ ដើម្បី​ប្រើនៅពេល​ពិនិត្យ​អក្ខរាវិរុទ្ធ​សារ​នេះ"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "ជ្រើស​ថត​សំបុត្រ​បានផ្ញើ​ ជា​កន្លែ​ង​ដែល​ច្បាប់​ចម្លង​សារ​នេះ​​នឹងត្រូវ​​បានរក្សាទុក"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "ជ្រើស​គណនី​ចេញ​ ដើម្បីប្រើ​សម្រាប់​សារ​នេះ"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "កំណត់​អាសយដ្ឋាន​ \"មក​ពី ៖\" សម្រាប់​សារ​នេះ"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "កំណត់​ប្រធានបទ​សម្រាប់​សារ​នេះ"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "អត្តសញ្ញាណ ៖"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "​វចនានុក្រម ៖ "
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "ថត សំបុត្រផ្ញើចេញ ៖"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "ដឹកជញ្ជូន​សំបុត្រ ៖"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "មក​ពី ៖"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "ប្រធានបទ ៖"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "ផ្ញើ​សំបុត្រ"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "ផ្ញើសំបុត្រ​តាម​រយៈ"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "ផ្ញើ"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "ផ្ញើពេលក្រោយ"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "ផ្ញើពេលក្រោយតាមរយៈ"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "ដាក់​ជាជួរ"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "រក្សាទុក​ជា​សេចក្ដី​ព្រាង"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "រក្សាទុក​អ៊ីមែល​ក្នុង​ថត​សេចក្ដី​ព្រាង"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "រក្សាទុក​ជា​ពុម្ព"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "រក្សាទុក​អ៊ីមែល​នៅ​ក្នុង​ថត​ពុម្ព"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "រក្សាទុក​ជា​​ឯកសារ"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "រក្សាទុក​អ៊ីមែល​ជា​អត្ថបទ ឬ​ឯកសារ html"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "បញ្ចូល​ឯកសារ​អត្ថបទ..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "បញ្ចូល​ឯកសារ​អត្ថបទ​ថ្មីៗ"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "​សៀវភៅ​អាសយដ្ឋាន​"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "បើក​សៀវភៅ​អាសយដ្ឋាន"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "កម្មវិធីតែង​ថ្មី"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "ជ្រើស​អ្នកទទួល..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "រក្សាទុក​បញ្ជី​​ចែកចាយ..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "បិទភ្ជាប់​ជា​ឯកសារ​ភ្ជាប់"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "សម្អាតកន្លែង"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "ប្រើពុម្ពអក្សរថេរ"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "បន្ទាន់"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "ការជូន​ដំណឹង​ពី​ការ​រៀបចំ​សំណើ"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "ការជូន​ដំណឹង​ពី​ការ​រៀបចំ​សំណើ"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "រុំពាក្យ"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "Snippet"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "ការ​ពិនិត្យ​​អក្ខរាវិរុទ្ធ​ដោយស្វ័យប្រវត្តិ"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Rich Text Editing"
 msgstr "បាត់បង់​ការ​ធ្វើ​ទ្រង់ទ្រាយ"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "វាលទាំងអស់"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "​អត្តសញ្ញាណ"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "វចនានុក្រម"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "ថត សំបុត្រផ្ញើចេញ"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "ដឹកជញ្ជូន​សំបុត្រ"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "មកពី"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "ប្រធានបទ"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "បន្ថែម​ហត្ថលេខា​នៅ​ខាង​ចុង"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "បន្ថែម​ហត្ថលេខា​នៅ​ខាងដើម"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "បញ្ចូល​ហត្ថលេខា​នៅ​ទីតាំង​​ទស្សន៍​ទ្រនិច"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "កម្មវិធី​ពិនិត្យ​​អក្ខរាវិរុទ្ធ..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "កម្មវិធី​ពិនិត្យ​​អក្ខរាវិរុទ្ធ"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "អ៊ិនគ្រីបសារ"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "​អ៊ិនគ្រីប"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "ចុះហត្ថលេខា​លើសារ"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "​ចុះ​ហត្ថលេខា"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "​ទ្រង់ទ្រាយ​សារ​គ្រីប"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "ជ្រើស​ទ្រង់ទ្រាយរហស្សលេខ​សម្រាប់​សារ​នេះ"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "រក​សារ..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "កំណត់​រចនាសម្ព័ន្ធ KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " បន្ទាត់ ៖ %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " ជួរឈរ ៖ %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "​ពិនិត្យ​​អក្ខរាវិរុទ្ធ ៖ បើក"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "​ពិនិត្យ​​អក្ខរាវិរុទ្ធ ៖ បិទ"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "រក្សាទុក​ជា​ពុម្ព​ម្ដង​ទៀត"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "រក្សាទុក​ជា​សេចក្ដី​ព្រាង"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "រក្សាទុក​សារ​នេះ​នៅ​ក្នុង​ថត​ពុម្ព​ម្ដង​ទៀត ។ បន្ទាប់​មក​វា​អាច​ត្រូវ​បាន​ប្រើ​នៅ​ពេល​ក្រោយ ។"
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2124,60 +2129,60 @@
 msgstr ""
 "រក្សាទុក​សារនេះ​នៅក្នុង​ថត​សេចក្ដីព្រាង ។ នៅពេលនោះ​វាអាច​ត្រូវបាន​កែសម្រួល​ និង​ ផ្ញើ​នៅពេល​ក្រោយទៀត ។"
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "តើអ្នកចង់​រក្សាទុក​សារ​សម្រាប់​ពេល​ក្រោយ ឬ បោះបង់វាចោល ?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "បិទ​កម្មវិធី​តែង"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​​ការ​រក្សាទុក​សារ​​ស្វ័យប្រវត្តិ"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "បាន​បរាជ័យ​ក្នុងការ​ផ្ញើសារ"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert Text File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "បញ្ចូល​ឯកសារ​អត្ថបទ..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "បន្ថែម​ជា​រូបភាព​ក្នុង​តួ"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "បន្ថែម​ជា​ឯកសារ​ភ្ជាប់"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "ឈ្មោះ​ឯកសារ​ភ្ជាប់ ៖"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Attachment Name"
 msgstr "អាសយដ្ឋាន​អ៊ីមែល​មិនត្រឹមត្រូវ"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Add URL into Message &Text"
 #| msgid_plural "Add URLs into Message &Text"
@@ -2185,23 +2190,23 @@
 msgid_plural "Add URLs into Message"
 msgstr[0] "បន្ថែម URLs ទៅ​ក្នុង​អត្ថបទ​សារ"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "បន្ថែម​ឯកសារ​ជា​ឯកសារ​ភ្ជាប់"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "បញ្ចូល​អត្ថបទ​ក្ដារ​តម្បៀត​ខ្ទាស់​ជា​ឯកសារ​ភ្ជាប់"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "​គ្មាន​ឈ្មោះ"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2213,12 +2218,12 @@
 "បច្ចុប្បន្ន​ មិនកំណត់​សោការអ៊ិនគ្រីប (OpenPGP or S/MIME) ដែលត្រូវប្រើ​សម្រាប់​វាឡើយ ។</"
 "p><p>សូមជ្រើស​សោ​ដើម្បី​ប្រើ​នៅក្នុង​ការកំណត់រចនាសម្ព័ន្ធ​អត្តសញ្ញាណ​ ។</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "កូនសោ​អ៊ិនគ្រីប​មិន​បាន​កំណត់"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2229,12 +2234,12 @@
 "MIME) ដែលត្រូវប្រើសិន ។</p><p>សូមជ្រើស​សោ​ដើម្បី​ប្រើ​នៅក្នុង​ការកំណត់​រចនា​សម្ព័ន្ធ​អត្តសញ្ញាណ ។</p></"
 "qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "កូនសោ​ចុះហត្ថលេខា​មិន​បាន​កំណត់"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2244,7 +2249,7 @@
 "អ្នកត្រូវតែ​បញ្ចូល​​​អាសយដ្ឋាន​អ៊ីមែល​របស់អ្នក​នៅក្នុងវាល មក​ពី ៖ ។ អ្នក​ក៏គួរតែកំណត់​អាសយដ្ឋាន​អ៊ីមែល​​របស់អ្នក​"
 "សម្រាប់​អត្តសញ្ញាណ​ទាំងអស់ ដូចច្នេះ​អ្នក​​មិនត្រូវ​បញ្ចូល​វា​នៅគ្រប់​សារទាំងអស់​នោះទេ ។"
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2253,124 +2258,124 @@
 "អ្នក​ត្រូវ​តែ​បញ្ជាក់​យ៉ាង​ហោចណាស់​អ្នក​ទទួល​ម្នាក់ ​​នៅ​ក្នុង​វាល​ ជូន​ចំពោះ ៖ ឬ​វាល ចម្លង​ជូន ឬ​ចម្លង​ជា​សម្ងាត់​"
 "ជូន ។"
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "ជូន​ចំពោះ ៖ វាល​គឺ​ទទេ ។ អញ្ចឹង​ផ្ញើសារដែរ​​ឬទេ ?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "គ្មាន​ ជូន​ចំពោះ ៖ បាន​បញ្ជាក់"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "អ្នក​មិនបាន​បញ្ជាក់ប្រធានបទ​ឡើយ ។ អញ្ចឹង​ផ្ញើសារ​ឬ ?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "មិន​បាន​បញ្ជាក់​ប្រធានបទ​ឡើយ"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "ផ្ញើអញ្ចឹង"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "បញ្ជាក់​ប្រធានបទ"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "អ្នក​ត្រូវ​តែ​បញ្ជាក់​យ៉ាង​ហោចណាស់​អ្នក​ទទួល​ម្នាក់ ដើម្បី​អាច​អ៊ីនគ្រិប​សេចក្ដី​ព្រាង​បាន ។"
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "ប្រុង​នឹង​ផ្ញើ​សំបុត្រ​ហើយ..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "​ផ្ញើ​ការ​អះអាង"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "ផ្ញើ​ឥឡូវ"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr "អ្នក​កំពុង​ព្យាយាម​ផ្ញើ​សំបុត្រ​ទៅ​អ្នក​ទទួល​ច្រើនជាង %1 ។ អញ្ចឹង​ផ្ញើសារ​ទេ ?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "មាន​អ្នក​ទទួលច្រើន​ពេក"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "ផ្ញើអញ្ចឹង"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "កែសម្រួល​អ្នក​ទទួល"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "បិទ​របៀប HTML នឹង​ធ្វើ​ឲ្យ​​អត្ថបទ​បាត់​ការ​ធ្វើទ្រង់ទ្រាយ ។ តើ​អ្នក​ប្រាកដ​ដែរឬទេ ?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "បាត់បង់កា​រធ្វើទ្រង់ទ្រាយ ?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "បាត់បង់​ការ​ធ្វើ​ទ្រង់ទ្រាយ"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "បន្ថែម​អត្ថបទ​ធម្មតា​របស់ Markup"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2378,7 +2383,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Send Confirmation"
 msgid "Plugin Editor Information"
@@ -2457,25 +2462,25 @@
 msgid "External editor was started."
 msgstr "កម្មវិធី​និពន្ធ​ខាង​ក្រៅ"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2502,11 +2507,6 @@
 msgid "Message will not be encrypted"
 msgstr "សារ​នឹង​មិន​ត្រូវ​បាន​អ៊ិនគ្រីប​ទេ"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Snippet អត្ថបទ"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2554,28 +2554,28 @@
 msgid "Cannot move messages."
 msgstr "មិន​អាច​ផ្លាស់ទី​សារ ។ %1"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "គ្មាន​ថត​បានជ្រើស​ទេ"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Open Message in List Archive"
 msgid "Messages archived"
@@ -2620,49 +2620,49 @@
 msgid "&Existing identities:"
 msgstr "អត្ត​សញ្ញាណ​ដែល​មាន​ស្រាប់ ៖"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "បញ្ចូល​ពាក្យ​គន្លឹះ​ថ្មី ៖"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "កែសម្រួល​អត្តសញ្ញាណ"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "ទូទៅ"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "ឈ្មោះ​របស់​អ្នក ៖"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2673,12 +2673,12 @@
 "នៅក្នុង​​ក្បាល​អ៊ីមែល​ដែល​ត្រូវផ្ញើចេញ ។</p><p>ប្រសិនបើ​អ្នក​ទុក​វា​ឲ្យ​ទទេ​ឈ្មោះ​ពិត​របស់​អ្នក​នឹង​មិន​បង្ហាញ​ទេ "
 "បង្ហាញ​តែ​អាសយដ្ឋាន​អ៊ីមែល​ប៉ុណ្ណោះ ។</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "ស្ថាប័ន ៖"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2689,12 +2689,12 @@
 "ក្នុង​បឋមកថា​អ៊ីមែល​ដែល​ត្រូវ​បាន​ផ្ញើ​ចេញ ។</p><p>វា​មាន​សុវត្ថិភាព (និង​ធម្មតា) ដើម្បីទុក​ឲ្យ​ទំនេរ ។</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "​អាសយដ្ឋាន​អ៊ីមែល ៖"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2708,12 +2708,12 @@
 "មួយ បង្កើត​អត្តសញ្ញា​ថ្មី ឬ​បន្ថែម​អាសយដ្ឋាន​ក្លែងក្លាយ​ថ្មី​នៅ​ក្នុង​វាល​ខាង​ក្រោម ។</p><p>ប្រសិនបើ​អ្នក​ទុក​"
 "ឲ្យ​វា​ទំនេរ ឬ​ដាក់​វា​ខុស នោះ​អ្នក​ទទួល​​នឹង​មាន​បញ្ហា​ក្នុង​ការ​ឆ្លើយតប​មក​អ្នក​វិញ ។</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "ឈ្មោះ​ក្លែងក្លាយ​អ៊ីមែល ៖"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2729,12 +2729,12 @@
 "tr><tr><th>ឈ្មោះ​ក្លែងក្លាយ ៖</th><td>first@example.org<br>last@example.org</"
 "td></tr></table><p>វាយ​អាសយដ្ឋាន​ក្លែងក្លាយ​មួយ​ក្នុង​មួយ​បន្ទាត់ ។</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "កូដសាស្ត្រ"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2754,12 +2754,12 @@
 "ចុះហត្ថលេខា​អ៊ីមែល​តាមលក្ខណៈ​ឌីជីថល​ដោយប្រើ​ OpenPGP បានឡើយ ។ មុខងារ​សំបុត្រ​ធម្មតា នឹង​មិនត្រូវបាន​"
 "ប៉ះពាល់ឡើយ ។</p><p>អ្នកអាច​ស្វែងយល់​បន្ថែម​អំពីសោ​នៅ <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "កូនសោ​ហត្ថលេខា OpenPGP ៖"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2782,12 +2782,12 @@
 "អ្នក ដោយ OpenPGP បានទេ មុខងារ​សំបុត្រ​ធម្មតា​នឹង​មិន​ត្រូវ​បាន​ប៉ះពានល់ ។</p><p>អ្នក​អាច​ស្វែងយល់​"
 "បន្ថែម​អំពីសោ​នៅ <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "កូនសោ​អ៊ិនគ្រីប OpenPGP ៖"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2800,12 +2800,12 @@
 "អ៊ីមែលដោយប្រើ S/MIME តាមលក្ខណៈ​ឌីជីថល​បាន​ឡើយ ។ មុខងារ​សំបុត្រ​​ធម្មតា​នឹងមិនត្រូវបាន​ប៉ះពាល់ឡើយ ។</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "វិញ្ញាបនបត្រ​ការចុះហត្ថលេខា S/MIME ៖"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2819,41 +2819,41 @@
 "វា​ឲ្យ​នៅ​ទទេ ប៉ុន្តែ​ KMail នឹង​មិន​អាច​អ៊ិនគ្រីប​ច្បាប់​ចម្លង​នៃ​សារ​ផ្ញើ​ចេញ​ទៅ​ឲ្យអ្នក​ដោយ​ប្រើ S/MIME ។ "
 "មុខងារ​សំបុត្រ​ធម្មតា​នឹង​មិន​ត្រូវ​បាន​ប៉ះពាល់ឡើយ ។</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "វិញ្ញាបនបត្រ​ការអ៊ិនគ្រីប S/MIME ៖"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "ទ្រង់ទ្រាយ​ដែល​ពេញចិត្ត ៖"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "ចុះហត្ថលេខា​លើសារ​ដោយស្វ័យប្រវត្តិ"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "អ៊ិនគ្រីប​សារ​ដោយស្វ័យប្រវត្តិ​នៅពេល​ណា​ក៏ដោយ​ឲ្យ​តែ​អាច​ធ្វើ​ទៅ​បាន"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "​កម្រិត​ខ្ពស់"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "ឆ្លើយតប​ទៅកាន់​អាសយដ្ឋាន ៖"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2869,12 +2869,12 @@
 "ទៅ មាន​អ៊ីមែល​របស់​អ្នក​នៅ​ក្នុង​វាល <tt>មក​ពី ៖</tt> ប៉ុន្តែ​ចង់​ឲ្យ​ការ​ឆ្លើយតប​នានា​ចូល​ទៅ​អាសយដ្ឋាន​"
 "ក្រុម ។</p><p>បើ​នៅ​សង្ស័យ សូម​ទុក​វា​នៅ​ទទេ​ចុះ ។</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "អាសយដ្ឋាន​ចម្លង​ជូន ៖"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2890,12 +2890,12 @@
 "សូម​ប្រើ​សញ្ញា​ក្បៀស (,) ដើម្បី​បំបែក​បញ្ជី​អ្នក​ទទួល​ច្បាប់​ចម្លង​ជូន ។</p><p>បើ​នៅ​សង្ស័យ សូម​ទុក​វាល​នេះ​នៅ​"
 "ទទេ​ចុះ ។</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "ចម្លងជា​សម្ងាត់​ជូន​អាសយដ្ឋាន ៖"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2912,60 +2912,60 @@
 "ជាងមួយ សូម​ប្រើ​សញ្ញាក្បៀស ដើម្បី​បំបែក​អ្នក​ទទួល​ច្បាប់ចម្លង​សម្ងាត់​របស់​អ្នក ។</p><p>បើ​នៅ​សង្ស័យ សូម​ទុក​"
 "វាល​នេះ​នៅ​ទទេ​ចុះ ។</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "វចនានុក្រម ៖"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "ថត សំបុត្រ​ផ្ញើចេញ ៖"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "ថត សេចក្ដី​ព្រាង ៖"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "ថត​ពុម្ព ៖"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "គណនី​ចេញ ៖"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Attach my vcard to message"
 msgid "Attach my vCard to message"
 msgstr "ភ្ជាប់​ជាមួយ​ vcard ទៅ​កាន់​សារ"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "បាន​បង្កើត..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 #| msgid "Autocorrection Language:"
 msgid "Autocorrection language:"
 msgstr "ភាសា​​ការ​កែ​ស្វ័យប្រវត្តិ ៖"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "ដែន​លំនាំដើម ៖"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "ដែន​លំនាំដើម ៖"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2974,33 +2974,33 @@
 "<qt><p>ដែន​លំនាំដើម​គឺត្រូវបាន​ប្រើ​ដើម្បី​បំពេញ​អាសយដ្ឋាន​អ៊ីមែល​​ដែលមាន​តែ​ឈ្មោះរបស់អ្នកប្រើ​ប៉ុណ្ណោះ ។</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "ប្រើ​ពុម្ព​សារ​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ​នេះ"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "​ហត្ថលេខា"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "រូបភាព"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "ឈ្មោះ​ក្លែងក្លាយ​អ៊ីមែល​មិន​ត្រឹមត្រូវ \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "អាសយដ្ឋាន​អ៊ីមែល​មិនត្រឹមត្រូវ"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3013,7 +3013,7 @@
 "ការនេះ​អាច​មានលទ្ធផល​នៅក្នុង​សារព្រមាន​នៅលើ​ផ្នែក​ការទទួល​នៅពេល​ដែលកំពុង​ព្យាយាមផ្ទៀងផ្ទាត់​ហត្ថលេខា​"
 "ដែលបានធ្វើ​ដោយ​ការកំណត់​រចនាសម្ព័ន្ធ​នេះ ។"
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3022,7 +3022,7 @@
 "កូនសោ​អ៊ិនគ្រីប​ OpenPGP ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​មិន​មាន​លេខ​សម្គាល់​របស់​អ្នក​ប្រើ​ណាមួយ​ដែល​បាន​ភ្ជាប់​ជា​មួយ​​"
 "អាសយដ្ឋាន​អ៊ីមែល​ដែល​បាន​កំណត់​រចនា​សម្ព័ន្ធ​សម្រាប់​អត្តសញ្ញាណ (%1) នេះ​ឡើយ ។"
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3035,7 +3035,7 @@
 "ការ​នេះ​​អាច​មាន​លទ្ធផល​នៅ​ក្នុង​សារ​ព្រមាន​នៅ​លើ​ផ្នែក​ទទួល​ នៅ​ពេល​ដែល​កំពុង​ព្យាយាម​ផ្ទៀងផ្ទាត់​ហត្ថលេខា​"
 "ដែលបានធ្វើ​ដោយ​ការ​កំណត់​រចនា​សម្ព័ន្ធ​នេះ ។"
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3044,22 +3044,22 @@
 "វិញ្ញាបនបត្រ​អ៊ិនគ្រីប​ S/MIME ដែលបានកំណត់​រចនាសម្ព័ន្ធ​មួយ មិន​មាន​អាសយដ្ឋាន​អ៊ីមែល​ដែល​បាន​កំណត់​​"
 "រចនាសម្ព័ន្ធ​សម្រាប់​អត្តសញ្ញាណ (%1) នេះ ។"
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "រក​អាសយដ្ឋាន​អ៊ីមែល​នៅក្នុង សោ/វិញ្ញាបនបត្រ​មិឃើញឡើយ"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "ឯកសារ​ហត្ថលេខា​មិនត្រឹមត្រូវ"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "កែសម្រួល​អត្តសញ្ញាណ \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3071,7 +3071,7 @@
 "មិនមាន​ថត​សេចក្ដីព្រាង​ផ្ទាល់ខ្លួន​សម្រាប់​អត្តសញ្ញាណ \"%1\" (តទៅទៀត​ឡើយ) ។ ដូច្នេះ ថត​សេចក្ដីព្រាង​"
 "លំនាំដើម​នឹងត្រូវបានប្រើ ។"
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "កែសម្រួល..."
@@ -3106,6 +3106,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "​ផ្ញើ​ការ​អះអាង"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3268,7 +3281,7 @@
 "ឧទាហរណ៍​អាច​រក​បាន​នៅ <a href=\"http://ace.home.xs4all.nl/X-Faces/\">http://ace."
 "home.xs4all.nl/X-Faces/</a> ។"
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3301,7 +3314,7 @@
 msgid_plural "Distribution lists %2 are empty, they cannot be used."
 msgstr[0] "បញ្ជី​ចែកចាយ %2 គឺ​ទទេ វា​មិនអាច​ប្រើ​បាន​ទេ ។"
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "បន្ថែម​ទៅ​កាន់​សៀវភៅ​អាសយដ្ឋាន"
@@ -3312,24 +3325,24 @@
 msgid "Contact created successfully"
 msgstr "បាន​លុប​សារ​ដោយ​ជោគជ័យ ។"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Failed to store contact"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​គណនី​បានទេ"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​សម្អាត​ធុងសំរាម​ឬ ?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Archive Folder"
 msgid "Attach Folder"
@@ -3544,7 +3557,7 @@
 msgstr "ថត"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3552,7 +3565,7 @@
 msgstr "អនុវត្ត​​គ្រប់​តម្រង​ទាំងអស់​នៅ​លើ​ថត"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3578,7 +3591,7 @@
 msgstr "បញ្ជូន​បន្ត"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "អនុវត្ត​តម្រង"
@@ -3603,7 +3616,7 @@
 msgstr "ជំនួយ"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "របារ​ឧបករណ៍​មេ"
@@ -3657,12 +3670,12 @@
 msgid "The file does not contain a message."
 msgstr "ឯកសារ​មិនមាន​សារឡើយ ។"
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "ឯកសារ​មាន​សារ​ច្រើន​ ។ មាន​តែ​សារ​ដំបូង​គេ​ប៉ុណ្ណោះ ដែល​នឹង​ត្រូវ​បង្ហាញ ។"
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3671,32 +3684,32 @@
 "តើ​អ្នក​ចង់​បញ្ជូន​សារ​ដែល​បាន​ជ្រើស​បន្ត​ជា​ឯកសារ​ភ្ជាប់​នៅ​ក្នុង​សារ​មួយ (as a MIME digest) ឬ​​ជា​សារ​"
 "នីមួយៗ ?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "ផ្ញើ​ជា​សេចក្ដីពន្យល់"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "ផ្ញើ​ផ្សេងៗ​គ្នា"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "កំពុង​ត្រងសារ"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "កំពុង​ត្រងសារ %1 នៃ %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "កំពុង​ផ្លាស់ទី​សារ"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "កំពុង​លុបសារ"
@@ -3725,29 +3738,29 @@
 msgid "Text Direction Toolbar"
 msgstr "របារ​ឧបករណ៍​ទិស​អត្ថបទ"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail ត្រូវបាន​កំណត់​ឲ្យនៅ​ក្រៅ​បណ្ដាញ ។ រាល់ការងារ​នៅលើបណ្ដាញ​ទាំងអស់​ត្រូវបាន​ផ្អាក"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "ផ្ញើ​សំបុត្រ"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "ប្រុង​នឹង​ផ្ញើ​សំបុត្រ​ហើយ..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail ត្រូវ​បាន​កំណត់​ឲ្យ​នៅ​លើ​បណ្ដាញ ។ រាល់​ការងារ​នៅ​លើ​បណ្ដាញ​ទាំងអស់​បាន​បន្ត"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3756,37 +3769,37 @@
 "KMail ត្រូវ​បាន​កំណត់​ឲ្យ​នៅ​លើ​​បណ្ដាញ រាល់​ការងារ​ដែល​នៅ​លើ​បណ្ដាញ​នឹង​ត្រូវ​បន្ត នៅ​ពេល​ដែល​ការ​តភ្ជាប់​"
 "បណ្ដាញ​ត្រូវ​បាន​រកឃើញ"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "បច្ចុប្បន្ន KMail នៅក្នុង​របៀប​ក្រៅបណ្ដាញ ។ តើអ្នក​ចង់​បន្ត​ដោយ​របៀបណា ?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "លើបណ្ដាញ/ក្រៅបណ្ដាញ"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "ធ្វើការ​នៅលើ​បណ្ដាញ"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "ធ្វើការ​នៅក្រៅ​បណ្ដាញ"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "ការ​តភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​រក​ឃើញ រាល់​ការងារ​លើ​បណ្ដាញ​នឹង​ត្រូវ​បាន​បន្ត"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "គ្មាន​ការ​តភ្ជាប់​បណ្ដាញ​ត្រូវ​បាន​រក​ឃើញ​ទេ រាល់​ការងារ​លើ​បណ្ដាញ​ទាំងអស់​នឹង​ត្រូវ​បាន​ផ្អាក"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3795,65 +3808,67 @@
 "បាន​បរាជ័យ​ក្នុងការ​បើក​ឯកសារ​រក្សាទុក​ដោយ​ស្វ័យ​ប្រវត្តិ​នៅ %1 ។\n"
 "មូលហេតុ​ ៖ %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ​រក្សាទុក​ដោយ​ស្វ័យ​ប្រវត្តិ"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the default transport:"
 msgstr[0] "អត្តសញ្ញាណ %1 ​ត្រូវ​បាន​ផ្លាស់ប្ដូរ​ ដើម្បី​ប្រើ​កា​រដឹកជញ្ជូន​លំនាំដើម ៖"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the modified transport:"
 msgstr[0] "អត្តសញ្ញាណ %1 ត្រូវ​បាន​ផ្លាស់ប្ដូរ​​ដើម្បី​ប្រើ​កា​របញ្ជូនអ្វី​​ដែល​បាន​កែប្រែ ៖"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "កំពុង​ផ្ញើ​សារ"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "កំពុង​ចាប់ផ្ដើម​ដំណើរការ​ផ្ញើ..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, fuzzy, kde-format
 #| msgid "Resource %1 is broken. This resource is now %2"
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "ធនធាន %1 ខូច ។ ធនធាន​នេះ​ឥឡូវ​គឺជា %2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "ភ្នាក់ងារ​សំបុត្រ​ប័ណ្ណសារ​មិន​ត្រូវ​បាន​ចុះឈ្មោះ​ឡើយ ។"
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, fuzzy, kde-format
 #| msgid "Archive Mail Agent was not registered."
 msgid "Send Later Agent was not registered."
 msgstr "ភ្នាក់ងារ​សំបុត្រ​ប័ណ្ណសារ​មិន​ត្រូវ​បាន​ចុះឈ្មោះ​ឡើយ ។"
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Archive Mail Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr "ភ្នាក់ងារ​សំបុត្រ​ប័ណ្ណសារ​មិន​ត្រូវ​បាន​ចុះឈ្មោះ​ឡើយ ។"
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3861,12 +3876,12 @@
 "properly installed."
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នកគ្រប់គ្រង​​វិញ្ញាបនបត្រ​បានឡើយ ។ សូម​ពិនិត្យ​មើល​ការដំឡើង​របស់អ្នក ។"
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "កំហុស KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3874,24 +3889,28 @@
 "properly installed."
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​នាំចូល​បានទេ ។ សូម​ពិនិត្យ​មើល​ការ​ដំឡើង​របស់​អ្នក ។"
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​នាំចូល​បានទេ"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "មិន​អាច​ចាប់ផ្ដើម​កម្មវិធី \"PIM Setting Exporter\" ។ សូម​ពិនិត្យមើល​​ការ​ដំឡើង​របស់​អ្នក ។"
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​កម្មវិធី \"PIM Setting Exporter\""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3899,97 +3918,97 @@
 "properly installed."
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​នាំចូល​បានទេ ។ សូម​ពិនិត្យ​មើល​ការ​ដំឡើង​របស់​អ្នក ។"
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​នាំចូល​បានទេ"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, fuzzy, kde-format
 #| msgid ""
 #| "An other mailer was found on system. Do you want to import data from it?"
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr "កម្មវិធី​ផ្ញើ​សំបុត្រ​រក​មិន​ឃើញ​នៅ​លើ​ប្រព័ន្ធ​ឡើយ ។ តើ​អ្នក​ចង់​នាំ​ចូល​ទិន្នន័យ​ពី​វា​ឬ ?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​នាំចូល​បានទេ ។ សូម​ពិនិត្យ​មើល​ការ​ដំឡើង​របស់​អ្នក ។"
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "​គ្មាន​ប្រធាន​បទ"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(គ្មាន​ពុម្ព)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "ថត​នេះ​មិនបាន​កំណត់​ជម្រើស​ផុតកំណត់​ណាមួយឡើយ"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>តើអ្នកពិត​ជា​ចង់​ធ្វើ​ឲ្យ <b>%1</b> ផុតកំណត់ឬ ?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "ធ្វើ​ឲ្យ​ថត​ផុតកំណត់"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "ផុត​កំណត់"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "សម្អាត​ធុងសំរាម"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "ផ្លាស់​ទី​ទៅ​​ធុងសំរាម"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "តើ​អ្នក​ពិត​ជា​ចង់​សម្អាត​ធុងសំរាម​ឬ ?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr "<qt>តើអ្នក​ពិតជាចង់​ផ្លាស់ទី​សារទាំងអស់ពី​ថត <b>%1</b> ទៅធុងសំរាម​ឬ ?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "បាន​ផ្លាស់​ទីសារទាំងអស់ទៅ​ធុងសំរាម"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "តើអ្នកពិតជាចង់​ឲ្យ​សារចាស់ទាំងអស់​ផុតកំណត់​ឬ ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "ផុត​កំណត់​សារចាស់ឬ ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "​ផុត​កំណត់"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4000,17 +4019,17 @@
 "ហើយ អាច​បង្កើន​ភាព​ដែល​ដូច​គ្នា ដែលប្រព័ន្ធ​របស់​អ្នក​នឹង​ត្រូវបាន​ស្រុះស្រួល​ដោយការបង្ហាញ​ផ្សេងទៀត និង "
 "ការទាញ​យក​សុវត្ថិភាព​ដែល​បាន​ស្មានទុក ។"
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "ព្រមាន​អំពី​សុវត្ថិភាព"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "ផ្ទុក​សេចក្ដី​យោង​ខាងក្រៅ"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4022,539 +4041,539 @@
 "<qt>តើ​អ្នក​ពិត​ជា​ចង់​លុប​សារ​ដែល​បាន​ជ្រើស %1 ឬ ?<br />នៅ​ពេល​បាន​លុប វា​មិន​អាច​ត្រូវ​បាន​ស្ដារ​ឡើង​វិញ​"
 "ឡើយ ។</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "លុប​សារ"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "លុប​សារ"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "កំពុង​ផ្លាស់ទី​សារ..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "កំពុង​លុបសារ..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "បាន​លុប​សារ​ដោយ​ជោគជ័យ ។"
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "បាន​ផ្លាស់ទី​សារ​ដោយជោគជ័យ ។"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "បរាជ័យ​ក្នុង​ការ​លុបសារ ។"
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "បាន​បោះបង់​ការ​លុប​សារ ។"
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "បរាជ័យ​ក្នុង​ការ​ផ្លាស់ទី​សារ ។"
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "បាន​បោះបង់​ការ​ផ្លាស់ទី​សារ ។"
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "ផ្លាស់ទី​សារ​ទៅ​ថត"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "កំពុង​ចម្លង​សារ..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "បាន​ចម្លង​សារ​ដោយជោគជ័យ ។"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "បរាជ័យ​ក្នុង​ការ​ចម្លង​សារ ។"
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "បាន​បោះបង់​ការ​ចម្លង​សារ ។"
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "ចម្លង​សារ​ទៅកាន់​ថត"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "កំពុង​ផ្លាស់ទី​សារ​ទៅកាន់​ធុង​សំរាម..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "កំពុង​ផ្លាស់ទី​សារ​ទៅកាន់​ធុង​សំរាម..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "សារ​ត្រូវបាន​ផ្លាស់ទី​ទៅកាន់​ធុងសំរាម​ដោយ​ជោគជ័យ ។"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "សារ​ត្រូវបាន​ផ្លាស់ទី​ទៅកាន់​ធុងសំរាម​ដោយ​ជោគជ័យ ។"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "បរាជ័យ​ក្នុងការ​ផ្លាស់ទីសារ​ទៅកាន់​ធុង​សំរាម ។"
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "បរាជ័យ​ក្នុងការ​ផ្លាស់ទីសារ​ទៅកាន់​ធុង​សំរាម ។"
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "បាន​បោះបង់​ការ​ផ្លាស់ទី​សារ​ទៅកាន់​ធុង​សំរាម ។"
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "បាន​បោះបង់​ការ​ផ្លាស់ទី​សារ​ទៅកាន់​ធុង​សំរាម ។"
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "លោត​ទៅ​ថត"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "​រក្សាទុកជា..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "ធ្វើ​ឲ្យ​ថត​ទាំងអស់​ផុត​កំណត់"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "ពិនិត្យ​សំបុត្រ"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "ពិនិត្យ​សំបុត្រ​នៅ​ក្នុង"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "ពិនិត្យ​សំបុត្រ"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "ផ្ញើ​សារ​ជាជួរ"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "ស្ថានភាព​នៅ​លើ​បណ្ដាញ (មិនស្គាល់)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "ផ្ញើសារ​ជាជួរ​តាមរយៈ"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "កម្មវិធី​គ្រប់គ្រង​វិញ្ញាបនបត្រ"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "នាំចូល​សារ..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "បំបាត់កំហុស Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "កម្មវិធី​មើល​កំណត់ហេតុ​តម្រង..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "កែសម្រួល​ចម្លើយតប \"ក្រៅការិយាល័យ\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "កំណត់​រចនាសម្ព័ន្ធ​ការ​ទុក​ក្នុង​ប័ណ្ណសារ​ដោយ​ស្វ័យប្រវត្តិ..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "កំពុង​លុបសារ..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "រក​សារ..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "លុប"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "ផ្លាស់ទី​សែស្រឡាយ​ទៅ​ធុងសំរាម"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "ផ្លាស់ទី​ខ្សែស្រឡាយ​ទៅ​ធុងសំរាម"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "លុប​ខ្សែស្រឡាយ"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "រក​សារ..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "ជ្រើស​សារទាំងអស់"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "ការ​គ្រប់គ្រង​បញ្ជី​សំបុត្រ​រួម..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "ផ្ដល់ផ្លូវកាត់..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "ការកំណត់​ការផុតកំណត់"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "ដាក់ថត​ជា​ប័ណ្ណសារ..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "ផ្ទុកសេចក្ដី​យោង​ខាងក្រៅ"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "ចម្លង​សារ​ទៅ..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "ផ្លាស់ទី​សារ​ទៅ..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "សារថ្មី..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "ថ្មី"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "សារ​ពីពុម្ព"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "សារថ្មី​ទៅ​បញ្ជី​សំបុត្រ​រួម..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "បង្កើត​តម្រង"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "តម្រង​នៅលើ​ប្រធានបទ..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "តម្រង​នៅលើ​មក​​ពី..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "តម្រង​នៅ​លើ​ជូន​ចំពោះ..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "តម្រង​នៅ​លើ​ជូន​ចំពោះ..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "សម្គាល់​សែស្រឡាយ"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "សម្គាល់​សែស្រឡាយ​ថា​អាន​រួច"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "សម្គាល់​សារ​ទាំងអស់​នៅ​ក្នុង​ខ្សែស្រឡាយ​ដែល​បាន​ជ្រើស​ថា​អាន​រួច"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "សម្គាល់​ខ្សែស្រឡាយ​ថា​ មិនទាន់​អាន"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "សម្គាល់​សារទាំងអស់​នៅក្នុង​ខ្សែស្រឡាយ​ដែលបានជ្រើស​ថា​មិនទាន់អាន"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "សម្គាល់ខ្សែស្រឡាយ​ថាសំខាន់"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "យក​ការសម្គាល់​ខ្សែស្រឡាយ​សំខាន់​ចេញ"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "សម្គាល់​ខ្សែស្រឡាយ​ជា​ធាតុ​សកម្មភាព"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "យក​របាំង​ខ្សែស្រឡាយ​ធាតុ​សកម្មភាព​ចេញ"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "ឃ្លាំមើល​ខ្សែស្រឡាយ"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "មិនអើពើ​ខ្សែស្រឡាយ"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "រក្សាទុក​ឯកសារ​ភ្ជាប់..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "ចម្លង​ធាតុ​ទៅ..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "អនុវត្ត​​គ្រប់​តម្រង​ទាំងអស់"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "បន្លាយ​ខ្សែស្រឡាយ / ក្រុម"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "បន្លាយ​ខ្សែស្រឡាយ ឬ​ក្រុម​បច្ចុប្បន្ន"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "វេញ​ខ្សែស្រឡាយ / ក្រុម"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "វេញ​សែស្រឡាយ ឬ​ក្រុម​បច្ចុប្បន្ន"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "វេញ​សែស្រឡាយ​ទាំងអស់"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "វេញ​សែស្រឡាយ​ទាំងអស់​នៅ​ក្នុង​ថត​បច្ចុប្បន្ន"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "វេញ​សែស្រឡាយ​ទាំងអស់"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "វេញ​សែស្រឡាយ​ទាំងអស់​នៅ​ក្នុង​ថត​បច្ចុប្បន្ន"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "បង្ហាញ​សារ"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "សារ​បន្ទាប់"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "ទៅកាន់​សារ​បន្ទាប់"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "សារ​មិន​ទាន់អាន​បន្ទាប់"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "បន្ទាប់"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "ទៅកាន់​សារ​មិនទាន់អាន​បន្ទាប់"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "សារ​មុន"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "ទៅកាន់​សារ​មុន"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "សារ​មិនទាន់​អាន​មុន"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "មុន"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "ទៅកាន់​សារ​មិន​ទាន់អាន​មុន"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "ថត​មិន​ទាន់​អាន​បន្ទាប់"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "ទៅកាន់​ថត​បន្ទាប់​ដោយមាន​សារ​មិនទាន់អាន"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "ថត​មិនទាន់អាន​មុន"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "ទៅកាន់​ថត​មុន​ដោយមាន​សារ​មិន​ទាន់​អាន"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "អត្ថបទ​មិន​ទាន់​អាន​បន្ទាប់"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "ទៅកាន់​អត្ថបទ​មិន​ទាន់​អាន​បន្ទាប់"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4562,233 +4581,239 @@
 msgstr ""
 "រមូរ​សារ​បច្ចុប្បន្ន​ចុះក្រោម ។ ប្រសិន​បើ​នៅ​ខាង​ចុង​សារ​បច្ចុប្បន្ន សូម​ទៅកាន់​សារ​មិន​ទាន់​អាន​បច្ចុប្បន្ន ។"
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "កំណត់រចនាសម្ព័ន្ធ​តម្រង..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "គ្រប់គ្រង​ស្គ្រីប​ Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "&Add Account..."
 msgstr "បន្ថែម​ចំណាំ..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "ការណែនាំ​ពី KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "បង្ហាញ​ទំព័រ​ស្វាគមន៍របស់​ KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "កំណត់​រចនាសម្ព័ន្ធ​ការជូន​ដំណឹង..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "កំណត់​រចនា​សម្ព័ន្ធ KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "ផុតកំណត់..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "បន្ថែម​ថត​សំណព្វ..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "ការ​ជាវប្រចាំ​ផ្នែក​មួយ​ចំនួន..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "អនុវត្ត​​គ្រប់​តម្រង​ទាំងអស់"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "នាំចេញ​ទិន្នន័យ KMail ..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "ទាក់ទង​សៀវភៅ​អាសយដ្ឋាន​ថ្មី..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "ចម្លង​សារ​ទៅ​ថត"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "លោត​ទៅ​ថត..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "បោះបង់​ប្រតិបត្តិការ​បច្ចុប្បន្ន"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "ផ្ដោតទៅលើ​ថតបន្ទាប់"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "ផ្ដោត​ទៅលើ​ថត​មុន"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "ជ្រើស​ថត​ដោយមាន​ការផ្ដោត"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "ផ្ដោតទៅលើ​ថតបន្ទាប់"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "ផ្ដោតទៅលើ​ថតបន្ទាប់"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "ផ្ដោត​ទៅលើ​សារបន្ទាប់"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "ផ្ដោត​ទៅលើ​សារមុន"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "ជ្រើស​សារទាំងអស់"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "ជ្រើស​សារទាំងអស់"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "ជ្រើស​សារ​ដោយមាន​ការផ្ដោត"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "កំណត់​កា​រផ្ដោត​លើ​ការ​ស្វែងរក​រហ័ស"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "ពង្រីក​ជម្រើស​ទៅ​សារ​មុន"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "ពង្រីក​ជម្រើស​ទៅ​សារ​បន្ទាប់"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "ផ្លាស់ទី​សារ​ទៅ​ថត"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "ការ​កំណត់"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Restart"
+msgid "Restart Account"
+msgstr "ចាប់ផ្ដើម​ឡើងវិញ"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "បន្ថែម​ថត​សំណព្វ"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "សម្អាត​ធុងសំរាម"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "ផ្លាស់ទី​សារ​ទាំងអស់​ទៅកាន់ធុងសំរាម"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "លុប​ការស្វែងរក"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Edit Search..."
 msgstr "កំពុង​ចាប់ផ្ដើម..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "តម្រង %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "កំពុង​ចាប់ផ្ដើម..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4799,12 +4824,12 @@
 "បង្កើន​ភាព​ដែលដូចគ្នា ដែលប្រព័ន្ធរបស់អ្នកនឹងត្រូវបាន​ស្រុះស្រួល​ដោយការបង្ហាញ​ផ្សេងទៀត និង ការទាញយក​"
 "សុវត្ថិភាពដែលបាន​ស្មានទុក ។"
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "ប្រើ HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4814,121 +4839,121 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "កំពុង​ចាប់ផ្ដើម..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "​ផ្លាស់​ទី​ទៅ​ធុង​សំរាម"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "ធុងសំរាម"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "ផ្លាស់ទី​សារ​ទៅ​ធុងសំរាម"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Can not copy item. %1"
 msgid "Cannot copy item. %1"
 msgstr "មិន​អាច​ចម្លង​ធាតុ ។ %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "សារ​ថ្មី​ទៅ..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "ឆ្លើយតប​ទៅ..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "បញ្ជូន​បន្ត​ទៅ..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Add to Existing Contact"
 msgstr "មិន​អាច​ចាប់ផ្ដើម​អ្នក​ជំនួយការ​គណនី​បានទេ"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "បើក​នៅក្នុង​សៀវភៅ​អាសយដ្ឋាន"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "សម្គាល់​តំណ​នេះ"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "កែសម្រួល​ទំនាក់ទំនង..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "រក្សាទុក​តំណ​ជា..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "រក​នៅក្នុង​សារ..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "រក្សាទុក​រូបភាព​នៅ​លើ​ថាស..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr ""
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Image On Disk..."
 msgid "Share image..."
 msgstr "រក្សាទុក​រូបភាព​នៅ​លើ​ថាស..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4937,68 +4962,68 @@
 "KMail ឥឡូវ​មាន​មូលដ្ឋាន​លើ​គ្រោងការណ៍​គ្រប់គ្រង​ព័ត៌មាន​ផ្ទាល់ខ្លួន​របស់ Akonadi ដែល​នាំមក​នូ​វការ​ផ្លាស់ប្ដូរ​"
 "ជា​​ច្រើន ។"
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "ចុច​អ៊ីមែល (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "ការ​ស្វែងរក​ដែលបាន​ធ្វើ​ឲ្យ​ប្រសើរ​ឡើង"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "គាំទ្រ​សម្រាប់​ការ​បន្ថែម​ចំណាំ (សេចក្ដី​ពិពណ៌នា) ចំពោះ​អ៊ីមែល"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "បង្កក GUI តិចតួច ការ​ពិនិត្យ​សំបុត្រ​កើតឡើង​នៅ​ក្នុង​ផ្ទៃ​ខាង​ក្រោយ"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "ការគាំទ្រ GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "ពិនិត្យមើល​អក្ខរាវិរុទ្ធ​មុន​ពេល​ផ្ញើ"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "កម្មវិធី​អ៊ីមែល​របស់ KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Mailinglist Folder Properties"
 msgid "Retrieving Folder Contents"
 msgstr "លក្ខណៈ​សម្បត្តិ​នៃ​ថត​បញ្ជី​សំបុត្រ​រួម"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "សូមរង់ចាំ"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "ក្រៅ​បណ្ដាញ"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5012,7 +5037,7 @@
 "បណ្ដាញ ។ សូម​ចុច <a href=\"kmail:goOnline\">នៅទីនេះ</a> ដើម្បី​នៅលើបណ្ដាញ . . .</"
 "p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5026,23 +5051,23 @@
 "ចុច <a href=\"kmail:goResourceOnline\">នៅ​ទី​នេះ</a> ដើម្បី​ទៅ​លើ​បណ្ដាញ . . .</"
 "p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully."
 msgid "Contact modified successfully"
 msgstr "បាន​ផ្លាស់ទី​សារ​ដោយជោគជ័យ ។"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "សារ​ថ្មី​នៅក្នុង"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "មិនមានសារ​មិនទាន់​អាន​ទេ"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5064,8 +5089,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5159,17 +5184,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5216,27 +5241,27 @@
 msgid "All"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5265,7 +5290,7 @@
 msgid "&Reply"
 msgstr "ឆ្លើយតប"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "ឆ្លើយតប..."
@@ -5275,12 +5300,12 @@
 msgid "Reply to A&uthor..."
 msgstr "ឆ្លើយតប​ទៅ​អ្នកនិពន្វ..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "ឆ្លើយតប​ទៅ​អ្នកទាំងអស់..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "ឆ្លើយតបទៅ​បញ្ជី​សំបុត្រ​រួម..."
@@ -5311,7 +5336,7 @@
 msgid "&Edit As New"
 msgstr "កែសម្រួល​សារ"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5505,118 +5530,118 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "រក​សារ"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "ស្វែង​រក"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "ក្នុង​​តួ..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "ជា​ឯកសារ​ភ្ជាប់..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "រក្សាទុក​ឯកសារ​ភ្ជាប់..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "សម្អាត​​ការ​ជ្រើសរើស"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "លោត​ទៅ​ថត"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "ផ្គូផ្គង %1"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "​ការស្វែងរក​ចុង​ក្រោយ"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "កំពុង​ចាប់ផ្ដើម..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Can not get search result. %1"
 msgid "Cannot get search result. %1"
 msgstr "មិន​អាច​ទទួលយក​លទ្ធផល​ស្វែងរក ។ %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search tag"
 msgid "Search failed."
 msgstr "ស្លាក​ស្វែង​រក"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid "Search tag"
 msgid "Search complete."
 msgstr "ស្លាក​ស្វែង​រក"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid "Search tag"
 msgid "Search stopped."
 msgstr "ស្លាក​ស្វែង​រក"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, fuzzy, kde-format
 #| msgid ""
 #| "There was a problem renaming your search folder. A common reason for this "
@@ -5629,19 +5654,19 @@
 "មាន​បញ្ហា​ក្នុងកា​រប្ដូរ​ឈ្មោះ​ថត​ស្វែងរក​របស់​អ្នក ។ ហេតុ​ផល​ធម្មតា​សម្រាប់​បញ្ហា​នេះ គឺ​ថត​ស្វែងរក​ផ្សេង​ទៀត​"
 "មាន​ឈ្មោះ​ដូច​គ្នា ។"
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "ចម្លង​សារ %1"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "កាត់សារ %1"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5772,7 +5797,7 @@
 "បញ្ជាក់​ថាតើ​​ នេះ​ជា​ពេល​ដំបូង​បង្អស់​ដែល​កម្មវិធី​ដំណើការ​មែនឬ (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5780,7 +5805,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5788,19 +5813,19 @@
 msgstr "តម្លៃ​នេះ​គឺត្រូវបាន​ប្រើ​ដើម្បី​សម្រេច​ថាតើ​ ការណែនាំ​អំពី KMail គួរតែត្រូវបាន​បង្ហាញ​ឬអត់ ។"
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "បង្ហាញ​ការ​កែសម្រួល​ស្វែង​រក​​ថត​រហ័ស"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "បញ្ជូន​បន្ត​ក្នុងតួ​ជា​លំនាំដើម ។"
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Warn if the number of recipients is more than:"
@@ -5808,7 +5833,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5819,19 +5844,19 @@
 "អាច​ត្រូវ​បាន​បិទ ។"
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "ពិនិត្យមើល​អក្ខរាវិរុទ្ធ​មុន​ពេល​ផ្ញើ"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "ស្នើ​ការជូន​ដំណឹង​អំពី​ការរៀបចំ​សារ​ដោយស្វ័យប្រវត្តិ"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5846,13 +5871,13 @@
 "><em>ការជូនដំណឹង​អំពី​ការរៀបចំ​សំណើរ</em> ។</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "រក្សាទុក​ចន្លោះពេល​ដោយស្វ័យប្រវត្តិ ៖"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5864,151 +5889,151 @@
 "ដោយ​កំណត់​វា​ទៅ​តម្លៃ 0 ។"
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "បង្ហាញ​កា​រគ្រប់គ្រង​អត្ថបទ​ដែល​បាន​ច្រឹប និង​បញ្ចូល​បន្ទះ​នៅ​ក្នុង​កម្មវិធី​តែង ។"
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "នៅ​ពេល​ពិនិត្យ​មើល សារ​ដែលបានផ្ញើ​នឹង​ត្រូវ​បាន​ទុក​នៅ​ក្នុង​ទម្រង់​ដែល​បានអ៊ីនគ្រិប"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "បញ្ជី​របស់​ URLs ដែលបាន​ប្រើប្រាស់​ថ្មី​ទាំងអស់"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "បញ្ជី​របស់​ការ​អ៊ីនកូ​ដដែល​បាន​ប្រើ​ថ្មី​ទាំងអស់"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "ទំហំ​ប្រអប់​អត្តសញ្ញាណ (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "ទំហំ​បង្អួច​ស្វែងរក (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "កម្ពស់​បង្អួច​ស្វែងរក (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "ទទឹង​ប្រអប់​កំណត់​រចនាសម្ព័ន្ធ KMail (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "កម្ពស់​របស់​ប្រអប់​កំណត់​រចនាសម្ព័ន្ធ KMail (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "ស្លាបព្រិល​ទិដ្ឋភាព​សារ"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "កុំ​បង្ហាញ​ស្លាបព្រិល​សារ​មើលជា​មុន"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "បង្ហាញ​ស្លាបព្រិល​​មើល​សារ​ជា​មុន​ខាង​ក្រោម​បញ្ជី​សារ"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "បង្ហាញ​ស្លាបព្រិល​មើលសារ​ជាមុន​នៅ​ជាប់នឹង​បញ្ជីសារ"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "បញ្ជី​ថត"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "បញ្ជី​ថត​សារ​វែង"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "បញ្ជី​ថត​ខ្លី"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "ពុម្ពសារ​​សម្រាប់​សារ​ថ្មី"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "ពុម្ព​សារ​សម្រាប់​ឆ្លើយតប"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "ពុម្ព​សារ​សម្រាប់​ឆ្លើយតប​ទៅ​អ្នក​ទាំងអស់"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "ពុម្ព​សារ​សម្រាប់​បញ្ជូន​បន្ត"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "តួអក្សរ​សម្រង់"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "បញ្ជាក់​ថាតើ​ គោលនយោបាយ​ត្រូវ​បាន​ប្រើ​នៅពេល​បង្ហាញ​គោលនយោបាយ​ដែរឬទេ"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6016,7 +6041,7 @@
 msgstr "បញ្ជាក់​ទទឹង​នៃ​វាល​សម្រាំង​នៅ​ក្នុង​ប្រអប់​បង្អួច​ស្វែងរក (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6025,7 +6050,7 @@
 "បញ្ជាក់​ទទឹង​របស់​វាល​ប្រធាន​បទ​នៅ​ក្នុង​ប្រអប់​បង្អួច​ស្វែងរក (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6033,7 +6058,7 @@
 msgstr "បញ្ជាក់​ទទឹង​របស់​វាល​​អ្នក​ផ្ញើ​នៅ​ក្នុង​ប្រអប់​បង្អួច​ស្វែងរក (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6041,7 +6066,7 @@
 msgstr "បញ្ជាក់​ទទឹង​នៃ​វាល​អ្នកទទួល​នៅ​ក្នុង​ប្រអប់​បង្អួច​ស្វែងរក (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាងក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6050,7 +6075,7 @@
 "បញ្ជាក់​ទទឹង​របស់​វាល​កាលបរិច្ឆេទ​នៅ​ក្នុង​ប្រអប់​បង្អួច​ស្វែងរក (សម្រាប់​តែ​ការ​ប្រើប្រាស់​ខាង​ក្នុង​ប៉ុណ្ណោះ)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6318,10 +6343,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6680,10 +6742,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "ពិនិត្យ​សំបុត្រ​នៅ​ក្នុង"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7293,6 +7354,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "បើកការ​ព្រមាន \"កុំសួរម្ដងទៀត\" ឡើងវិញ"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7355,6 +7426,14 @@
 msgid "Zoom: %1%"
 msgstr "ពង្រីក"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Snippet អត្ថបទ"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "ពិនិត្យ​សំបុត្រ​នៅ​ក្នុង"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "ឈ្មោះ និងទំហំ​ថត​ នៅពេល​បិទ​កូតា"
 
@@ -8695,9 +8774,6 @@
 #~ msgid "R&emove"
 #~ msgstr "​យកចេញ"
 
-#~ msgid "Restart"
-#~ msgstr "ចាប់ផ្ដើម​ឡើងវិញ"
-
 #, fuzzy
 #~| msgid "New Message To..."
 #~ msgid "Message Delayed..."
diff -Nru kmail-19.04.3/po/ko/akonadi_archivemail_agent.po kmail-19.12.3/po/ko/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ko/akonadi_archivemail_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/ko/akonadi_archivemail_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Shinjo Park <kde@peremen.name>, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
+# Shinjo Park <kde@peremen.name>, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-04-22 01:30+0200\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 19.04.3\n"
 
 #: addarchivemaildialog.cpp:44
 #, kde-format
@@ -174,14 +174,14 @@
 msgstr ""
 "이 폴더에 두 번째 보관 파일을 추가할 수 없습니다. 존재하는 파일을 수정합니다."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "디렉터리가 존재하지 않습니다. 설정을 확인하십시오. 보관 작업이 연기되었습니"
 "다."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "%1 보관 시작 중"
diff -Nru kmail-19.04.3/po/ko/akonadi_followupreminder_agent.po kmail-19.12.3/po/ko/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/ko/akonadi_followupreminder_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/ko/akonadi_followupreminder_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Shinjo Park <kde@peremen.name>, 2014, 2015, 2016, 2017, 2018, 2019.
+# Shinjo Park <kde@peremen.name>, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2019-04-22 01:29+0200\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -15,98 +15,98 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 19.04.3\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "후속 작업 알림 에이전트"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "후속 작업 알림"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "관리자"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "박신조"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kde@peremen.name"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "받는 사람"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "제목"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "끝 줄"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "응답"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "수신"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "대기 중"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "메시지 보기"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "삭제"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "선택한 항목 %1개를 삭제하시겠습니까?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "%1 님의 답장을 받음"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "다음 이메일에 대한 답장을 기다리고 있습니다:"
diff -Nru kmail-19.04.3/po/ko/akonadi_mailfilter_agent.po kmail-19.12.3/po/ko/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ko/akonadi_mailfilter_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/ko/akonadi_mailfilter_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Shinjo Park <kde@peremen.name>, 2013, 2015, 2019.
+# Shinjo Park <kde@peremen.name>, 2013, 2015, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2019-04-22 01:29+0200\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -15,24 +15,24 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 19.04.3\n"
 
 #: filterlogdialog.cpp:67
 #, kde-format
 msgid "Filter Log Viewer"
 msgstr "필터 기록 뷰어"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "공유..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "필터 활동 기록(&L)"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -41,23 +41,23 @@
 "필터 활동을 여기에서 켜거나 끌 수 있습니다. 기록을 켰을 경우에만 필터 활동 데"
 "이터가 수집되고 보여집니다."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "기록 설정"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "패턴 설명 기록하기"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "필터 규칙 검사 기록하기(&R)"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -70,34 +70,34 @@
 "터 규칙이 어떻게 처리되는지에 대한 자세한 정보를 기록합니다. 선택하지 않으면 "
 "필터 규칙이 적용되었는지 여부만 기록합니다."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "필터 패턴 검사 기록하기"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "필터 동작 기록하기"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "기록 크기 제한:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "무제한"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -109,7 +109,7 @@
 "서 로그 데이터를 저장할 메모리 양을 정할 수 있습니다. 만약 모인 로그 데이터 "
 "양이 제한보다 더 크다면 과거에 저장된 데이터부터 삭제됩니다."
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -118,63 +118,63 @@
 "파일 %1에 쓸 수 없습니다:\n"
 "자세한 오류 설명은 \"%2\"입니다."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail 오류"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "메시지 %2개 중 %1개 거르는 중"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "메일 필터 이동 적용 중 오류"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "메일 필터 삭제 적용 중 오류"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "메일 필터 수정 적용 중 오류"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>필터 규칙 평가:</b>"
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>필터 규칙이 일치합니다.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>\"%3\"에서 \"%2\"부터 메시지 \"%1\"에 필터 적용 중</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "메시지 거르는 중"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "메일 필터 기록 사용함"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "준비"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "%1 거르는 중"
diff -Nru kmail-19.04.3/po/ko/akonadi_sendlater_agent.po kmail-19.12.3/po/ko/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ko/akonadi_sendlater_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/ko/akonadi_sendlater_agent.po	2020-03-03 00:34:07.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Shinjo Park <kde@peremen.name>, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
+# Shinjo Park <kde@peremen.name>, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2019-04-22 01:27+0200\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 19.04.3\n"
 
 #: sendlaterconfiguredialog.cpp:37
 #, kde-format
@@ -59,123 +59,123 @@
 msgid "Your emails"
 msgstr "kde@peremen.name"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "받는 사람"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "제목"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "다음에 보내기"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "반복됨"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "메시지 ID"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "대기 중인 메시지 없음..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "지금 보내기"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "삭제"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "예"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "아니요"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "선택한 항목을 삭제하시겠습니까?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "항목 삭제"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "메시지도 같이 삭제하시겠습니까?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "메시지 삭제"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "메시지를 찾지 못했습니다."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "메시지를 찾지 못했습니다."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "메시지를 가져오는 중 오류가 발생했습니다."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "메시지를 가져올 수 없습니다. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "전송을 만들 수 없음"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "메시지가 실제 메시지가 아님"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "메시지를 보낼 수 없습니다."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "메시지 보냄"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "오류가 발생했습니다. 메시지를 다시 보내시겠습니까?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "오류 발생"
diff -Nru kmail-19.04.3/po/ko/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/ko/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/ko/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/ko/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:08.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This file is copyright:
 # This file is distributed under the same license as the kmail package.
-# Shinjo Park <kde@peremen.name>, 2019.
+# Shinjo Park <kde@peremen.name>, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-04-22 01:26+0200\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 19.04.3\n"
 
 #: settingsdialog.cpp:63
 #, kde-format
@@ -54,37 +54,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "통합 편지함 %1 동기화 중"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "통합 편지함 추가"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "이름:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "아이콘 선택..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "아이콘:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "보낸 편지함"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "임시 보관함"
diff -Nru kmail-19.04.3/po/ko/kmail.po kmail-19.12.3/po/ko/kmail.po
--- kmail-19.04.3/po/ko/kmail.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/ko/kmail.po	2020-03-03 00:34:07.000000000 +0000
@@ -3,14 +3,14 @@
 # LinuxKorea Co. <kde@linuxkorea.co.kr>, 2000.
 # Louis JANG <louis@mizi.com>, 2001.
 # KIM KyungHeon <tody@teoal.net>, 2002, 2003, 2004.
-# Shinjo Park <kde@peremen.name>, 2007, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
+# Shinjo Park <kde@peremen.name>, 2007, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-05-29 22:03+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2020-01-29 00:34+0100\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
 "Language: ko\n"
@@ -18,7 +18,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 19.04.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -182,8 +182,8 @@
 msgstr "한 주소에 여러 암호화 키"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -289,27 +289,27 @@
 "이 폴더에서 메일링 리스트를 완전히 검사할 수 없었습니다. 직접 주소를 입력하십"
 "시오."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "할당량"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "사용 방법:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "상태:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% 사용 중"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%2 중 %1 사용함"
@@ -331,7 +331,7 @@
 "연결하려고 하는 키를 누르십시오.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "템플릿"
@@ -342,106 +342,106 @@
 msgstr "이 폴더에 사용자 정의 메시지 템플릿 사용(&U)"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "전역 템플릿 복사(&C)"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "보기"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "사용자 정의 아이콘 사용(&I)"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "일반(&N):"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "읽지 않음(&U):"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "메시지 목록에 보낸 사람/받는 사람 항목 보이기"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "열 보이기(&W):"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "기본값"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "보낸 사람"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "받는 사람"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "메시지 목록"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "기본 분류 사용하기"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "분류"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "기본 테마 사용하기"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "테마"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "메시지 기본 형식"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "일반 텍스트보다 HTML 선호"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "HTML보다 일반 텍스트 선호"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "전역 설정 사용"
@@ -451,100 +451,105 @@
 msgid "Retrieval Options"
 msgstr "가져오기 옵션"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "프로필"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "수신"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "발신"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "LDAP 서버"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "발신 계정(하나 이상 필요함):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "공통 옵션"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "보내기 전에 확인하기(&B)"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "보내기 전에 맞춤법 검사하기"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "항상 수동으로"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "수동으로 편지를 확인할 때"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "편지를 확인할 때 항상"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "지금 보내기"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "나중에 보내기"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "보낸 편지함에 메시지 저장(&M):"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "기본적으로 보낼 방법(&U):"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "전송 실행 취소 활성화"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "메일 계정 추가..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "사용자 정의 계정..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -552,30 +557,30 @@
 msgstr ""
 "계정 마법사를 시작할 수 없습니다. AccountWizard의 설치 상태를 확인하십시오."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "계정 마법사를 시작할 수 없음"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "수동 편지 확인에 포함"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "KMail 끝낼 때 오프라인으로 전환"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "시작할 때 편지 확인하기"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -632,7 +637,7 @@
 msgid "Fixed Width Font"
 msgstr "고정폭 글꼴"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "작성기"
@@ -930,61 +935,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "태그를 만들 수 없습니다. 같은 이름으로 된 태그가 이미 존재합니다."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "일반"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "표준 템플릿"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "사용자 정의 템플릿"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "제목"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "문자 인코딩"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "헤더"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "첨부"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "자동 고침"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "그림 크기 자동 조정"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "서명"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -993,12 +998,12 @@
 "메시지 작성을 시작할 때\n"
 "자동으로 설정된 서명을 추가함"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "임의의 인용문 위에 서명 삽입"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1007,18 +1012,18 @@
 "서명 줄 이전에 RFC 호환 서명 구분자\n"
 "(대시 두 개와 공백 한 개) 삽입"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "답장할 때 서명 포함하지 않기"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "형식"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1029,7 +1034,7 @@
 "있는 경우 (완전한 메시지 대신)\n"
 "선택한 텍스트만 인용합니다."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1039,17 +1044,17 @@
 "답장을 쓸 때 원본 메시지의 줄이 자동 줄 바꿈을 통하여 줄이 바뀌었을 때에도\n"
 "원본 메시지의 모든 줄 앞에 인용 부호를 추가합니다."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "지정한 폭에서 자동 줄 바꿈 사용"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "자동 줄 바꿈에 사용할 텍스트 폭 설정"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1060,7 +1065,7 @@
 "수신된 형식을 기준으로 인용 부호를 추가하며,\n"
 "선택하지 않으면 일반 텍스트로 답장합니다."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1071,34 +1076,34 @@
 "지원하는 형식은 굵게, 기울임꼴, 밑줄, 목록, 외부\n"
 "참조입니다."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "인라인"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "첨부 파일로"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "기본 전달 메시지 형식 설정"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "기본 전달 형식:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "받는 사람"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1108,17 +1113,17 @@
 "기본적으로 메시지를 작성할 때 읽음 확인을 요청합니다.\n"
 "메시지별 설정을 \"옵션 - 읽음 확인 요청\"에서 변경할 수 있습니다"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "받는 사람이 너무 많을 때 알려 주기"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "받는 사람이 다음보다 많을 때 알려 주기"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1134,7 +1139,7 @@
 "메시지를 보내는 것을 방지합니다. 분배 목록이나 메일링 리스트는\n"
 "여기에서 제외됩니다."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1143,18 +1148,18 @@
 "최근에 입력한 주소를 기억하고\n"
 "수신자 자동 완성에 사용함"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "저장하지 않음"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "최대 최근 주소:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1163,41 +1168,41 @@
 "자동 완성에 사용하기 위하여 기억할 최근 입력한 주소의\n"
 "최대 개수입니다"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "완성 설정..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "자동 저장"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "자동으로 저장하지 않음"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
 msgid_plural " minutes"
 msgstr[0] "분"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "지정한 시기마다 자동으로 메시지 저장"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "답장 제목 접두사(&Y)"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1206,59 +1211,59 @@
 "다음 제목 접두사를 찾습니다\n"
 "(대소문자 구분 없는 정규 표현식으로 처리합니다):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "추가(&D)..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "삭제(&M)"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "수정(&I)..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "새 답장 접두사 입력:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "전달 제목 접두사(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "추가..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "삭제(&V)"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "수정..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "새 전달 접두사 입력:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1267,88 +1272,88 @@
 "메시지를 보낼 때 지정한 문자 인코딩으로 표현할 수 있는 지를 검사합니다."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "수정(&M)..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "문자 인코딩 입력:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "답장하거나 전달할 때 원본 문자 인코딩 사용하기 (가능한 경우)(&K)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "이 인코딩은 지원하지 않습니다."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "사용자 정의 message-id 접미사 사용(&U)"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "사용자 정의 message-id 접미사(&I):"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "사용자 정의 MIME 헤더 필드:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "이름"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "값"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "추가(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "이름(&N):"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "값(&V):"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 "'Content-Type'은 허용된 문자열이 아닙니다. 이 헤더는 저장되지 않습니다."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "잘못된 헤더"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook 호환 첨부 파일 이름 사용"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1357,38 +1362,38 @@
 "Outlook(tm) 사용자가 비 영어 문자열로 되어 있는 첨부 파일 이름을 볼 수 있도"
 "록 합니다"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "빠진 첨부 감지 사용하기(&N)"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "다음 단어가 들어 있으면 파일을 첨부하는 것으로 간주하기:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "새 단어 입력:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "최대 첨부 크기:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "제한 없음"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1472,8 +1477,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "변환기 텍스트 플러그인"
+msgid "Text Conversion Plugins"
+msgstr "텍스트 변환 플러그인"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1584,7 +1589,7 @@
 msgid "Archive Folder"
 msgstr "폴더 보관"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1650,18 +1655,18 @@
 msgid "Notification"
 msgstr "알림"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "첨부 %1개(%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "첨부 파일 목록 숨기기"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "첨부 파일 목록 보이기"
@@ -1678,329 +1683,329 @@
 msgid "Encoding"
 msgstr "인코딩"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "이 메시지의 맞춤법 검사 사전을 선택하십시오"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "이 메시지의 사본을 저장할 보낸 편지함 폴더를 선택하십시오"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "이 메시지를 보낼 계정을 선택하십시오"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "이 메시지의 \"보낸 사람\" 주소를 설정합니다"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "이 메시지의 제목을 설정합니다"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "프로필(&I):"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "사전(&D):"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "보낸 편지함 폴더(&S):"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "전송 방법(&M):"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "보낸 사람(&F):"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "제목(&U):"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "편지 보내기(&S)"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "다음으로 편지 보내기(&S)"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "보내기"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "나중에 보내기(&L)"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "다음으로 나중에 보내기(&L)"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "대기열에 추가"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "임시 보관함에 저장(&D)"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "임시 보관함 폴더에 이메일 저장"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "템플릿으로 저장(&T)"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "템플릿 폴더에 이메일 저장"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "파일로 저장(&F)"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "이메일을 텍스트나 HTML 파일로 저장"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "텍스트 파일 삽입(&I)..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "최근 텍스트 파일 삽입(&I)"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "주소록(&A)"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "주소록 열기"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "새 작성기(&N)"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "받는 사람 선택(&R)..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "분배 목록 저장(&D)..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "첨부 파일로 붙여넣기(&H)"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "빈 공백 정리(&E)"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "고정폭 글꼴 사용하기(&X)"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "긴급(&U)"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "읽음 확인 요청하기(&R)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "배달 확인 요청하기(&R)"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "자동 줄 바꿈(&W)"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "스니펫(&S)"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "자동 맞춤법 검사(&A)"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "서식 있는 텍스트 편집"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "서식 있는 텍스트"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "서식 있는 텍스트 편집 모드 전환"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "모든 필드(&A)"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "프로필(&I)"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "사전(&D)"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "보낸 편지함 폴더(&S)"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "전송 방법(&M)"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "보내는 사람(&F)"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "제목(&U)"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "뒤에 서명 추가(&I)"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "앞에 서명 추가(&I)"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "커서 위치에 서명 추가(&U)"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "맞춤법 검사기(&S)..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "맞춤법 검사기"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "메시지 암호화(&E)"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "암호화"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "메시지에 서명하기(&S)"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "서명"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "암호화 메시지 형식(&C)"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "이 메시지의 암호화 형식을 선택하십시오"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "후속 작업 알림 만들기..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMail 설정..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2008,53 +2013,53 @@
 msgstr ""
 "<qt>메뉴 표시줄을 숨길 것입니다. %1 키를 눌러서 복원할 수 있습니다.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "메뉴 표시줄 숨기기"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " 줄: %1"
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " 칸: %1"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "수정"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "삽입"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "맞춤법 검사: 켜짐"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "맞춤법 검사: 꺼짐"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "템플릿으로 다시 저장(&S)"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "임시 보관함에 저장(&S)"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2062,7 +2067,7 @@
 msgstr ""
 "템플릿 폴더에 이 메시지를 저장하여, 나중에 다시 사용할 수 있도록 합니다."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2071,80 +2076,80 @@
 "임시 보관함 폴더에 이 메시지를 저장하여 나중에 다시 편집해서 보낼 수 있도록 "
 "합니다."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "메시지 작성을 취소하거나, 나중에 보내기 위해 저장하시겠습니까?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "작성기 닫기"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "메시지 자동 저장 실패"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "메시지 전송 실패"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "파일 삽입"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "인라인 그림으로 추가하기(&I)"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "첨부 파일로 추가하기(&A)"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "첨부 파일 이름:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "첨부 파일 이름이 비어 있을 수 없음"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "잘못된 첨부 이름"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "URL을 메시지에 추가하기"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "첨부 파일로 파일 추가하기(&A)"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "클립보드 텍스트를 첨부 파일로 추가하기"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "이름 없음"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2156,12 +2161,12 @@
 "화를 위한 OpenPGP 키나 S/MIME 인증서가 없습니다.</p> <p>프로필 설정에서 암호"
 "화 키를 선택하십시오.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "암호화 키가 정의되지 않음"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2171,12 +2176,12 @@
 "<qt><p>이 메시지에 서명하려면 OpenPGP 키나 S/MIME 인증서를 선택하여야 합니다."
 "</p><p>프로필 설정에서 암호화 키를 선택하십시오.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "서명 키가 정의되지 않음"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2186,7 +2191,7 @@
 "보낸 사람 필드에 이메일 주소를 입력하십시오. 메시지를 보낼 때마다 입력하지 않"
 "도록 모든 프로필에 이메일 주소를 지정할 수 있습니다."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2195,37 +2200,37 @@
 "메시지를 받을 사람을 받는 사람, 참조, 숨은 참조 중 최소한 한 곳에 입력해야 합"
 "니다."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "받을 사람이 비어 있습니다. 그래도 보내시겠습니까?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "받을 사람이 지정되지 않음"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "제목이 비어 있습니다. 그래도 보내시겠습니까?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "제목이 지정되지 않음"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "그대로 보내기(&E)"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "제목 입력하기(&S)"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2234,66 +2239,66 @@
 "임시 보관함에 저장할 메시지를 암호화하려면 최소한 한 사람의 받을 사람을 지정"
 "해야 합니다."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "편지를 보내려고 하는 중..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "읽음 확인 보내기"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "지금 보내기(&S)"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr "%1명 이상에게 편지를 보내려고 하고 있습니다. 그래도 보내시겠습니까?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "받는 사람이 너무 많음"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "그대로 보내기(&S)"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "받는 사람 편집하기(&E)"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "HTML 모드를 비활성화하면 서식이 없어집니다. 계속 진행하시겠습니까?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "서식을 삭제하시겠습니까?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "서식 삭제"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "마크업 일반 텍스트 추가"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2302,7 +2307,7 @@
 "이 사람에게 보내는 이메일은 높은 단계의 암호화를 사용합니다(암호화 키를 완전"
 "히 믿음). 아이콘을 누르면 자세한 정보를 표시합니다."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2311,7 +2316,7 @@
 "이 사람에게 보내는 이메일은 중간 단계의 암호화를 사용합니다(암호화 키를 어느 "
 "정도 믿음). 아이콘을 누르면 자세한 정보를 표시합니다."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2320,7 +2325,7 @@
 "이 사람에게 보내는 이메일은 낮은 단계의 암호화를 사용합니다(암호화 키를 믿지 "
 "않음). 아이콘을 누르면 자세한 정보를 표시합니다."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2330,7 +2335,7 @@
 "이 사람에게 보내는 이메일을 암호화하지만, 암호화 강도를 확인할 수 없습니다(암"
 "호화 키를 검증할 수 없음). 아이콘을 누르면 자세한 정보를 표시합니다."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "플러그인 편집기 정보"
@@ -2407,7 +2412,7 @@
 msgid "External editor was started."
 msgstr "외부 편집기를 시작했습니다."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2416,19 +2421,19 @@
 "전송 방식을 찾을 수 없습니다. 올바른 이메일 전송 방식을 사용하는지 확인하십시"
 "오."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "보낸 편지함 폴더가 지정되지 않았습니다. 보내기 전에 폴더를 지정하십시오."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "프로필을 찾을 수 없습니다. 올바른 프로필을 사용하는지 확인하십시오."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2455,11 +2460,6 @@
 msgid "Message will not be encrypted"
 msgstr "메시지가 암호화되지 않을 것입니다"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "텍스트 스니펫"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2503,27 +2503,27 @@
 msgid "Cannot move messages."
 msgstr "메시지를 이동할 수 없습니다."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "폴더를 가져올 수 없습니다. 보고된 오류: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "반환된 폴더가 없습니다."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "부모 폴더를 가져올 수 없습니다. 보고된 오류: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "폴더 목록을 가져올 수 없습니다."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "메시지 보관됨"
@@ -2564,48 +2564,48 @@
 msgid "&Existing identities:"
 msgstr "기존 프로필(&E):"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "새 키 쌍을 생성하는 중 오류 발생: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "키 생성 오류"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "키 없음"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "새 키 쌍 만들기"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "새 키 쌍 생성 중..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "프로필 편집"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "일반"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "이름(&Y):"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2616,12 +2616,12 @@
 "만약 이 필드를 비워 두면 실명이 나타나지 않고 이메일 주소만 나타납니다.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "조직(&Z):"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2632,12 +2632,12 @@
 "더에 조직 정보를 나타내려면 여기에 입력하십시오.</p> <p>이 필드는 비워 두어"
 "도 됩니다.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "이메일 주소(&E):"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2652,12 +2652,12 @@
 "이 필드를 비워 놓거나 잘못된 주소를 입력하면 답장을 못 받을 수도 있습니다.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "추가 이메일 주소(&L):"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2673,12 +2673,12 @@
 "first@example.org<br>last@example.org</td></tr></table><p>추가 주소를 한 줄"
 "에 하나씩 입력하십시오.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "암호화"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2692,12 +2692,12 @@
 "p><p>키에 대한 자세한 정보를 보려면 <a>https://www.gnupg.org</a> 사이트를 참"
 "고하십시오.</p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP 서명 키:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2713,12 +2713,12 @@
 "니다.</p><p>키에 대한 자세한 정보를 보려면 <a>https://www.gnupg.org</a> 사이"
 "트를 참고하십시오.</p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP 암호화 키:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2731,12 +2731,12 @@
 "다.</p><p>키에 대한 자세한 정보를 보려면 <a>http://www.gnupg.org</a> 사이트"
 "를 참고하십시오.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME 서명 인증서:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2749,39 +2749,39 @@
 "을 때 첨부할 S/MIME 인증서입니다.</p><p>인증서를 지정하지 않으면 S/MIME으로 "
 "암호화할 수 없으며, 일반적인 편지 작성은 가능합니다. </p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME 암호화 인증서:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "선호하는 암호화 메시지 형식:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "자동으로 메시지에 서명"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "가능하다면 자동으로 메시지 암호화"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "고급"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "답장 받을 주소(&R):"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2797,12 +2797,12 @@
 "를 들어 <tt>From:</tt> 헤더에는 자기 주소를 입력하고, 답장을 받을 주소로는 그"
 "룹의 주소를 지정할 수 있습니다. </p><p>잘 모르겠으면 비워 두십시오.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "참조 주소(&C):"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2817,12 +2817,12 @@
 "니다.</p><p>한 명 이상의 참조를 추가하려면 쉼표를 사용하십시오.</p><p>잘 모르"
 "겠으면 비워 두십시오.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "숨은 참조 주소(&B):"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2838,57 +2838,57 @@
 "낼 때 주로 사용합니다.</p><p>한 명 이상의 숨은 참조를 추가하려면 쉼표를 사용"
 "하십시오.</p><p>잘 모르겠으면 비워 두십시오.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "사전(&I):"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "보낸 편지함 폴더(&F):"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "임시 보관함 폴더(&D):"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "템플릿 폴더(&T):"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "보내는 계정:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "메시지에 내 vCard 첨부"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "만들기..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "자동 고침 언어:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "기본 도메인 이름 복원"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "기본 도메인(&T):"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2897,33 +2897,33 @@
 "<qt><p>이메일 주소에 사용되는 기본 도메인은 사용자 이름만으로 이루어져 있습니"
 "다.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "이 프로필에서 사용자 정의 메시지 템플릿 사용하기(&U)"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "서명"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "그림"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "잘못된 추가 이메일 주소 \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "잘못된 이메일 주소"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2936,7 +2936,7 @@
 "받는 쪽에서 이 설정을 사용하여 보낸 메시지의 서명을 검사하려고 할 때 경고 메"
 "시지가 표시될 수도 있습니다."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2945,7 +2945,7 @@
 "설정한 OpenPGP 암호화 키가 이 프로필에서 사용된 이메일 주소와 일치하는 사용"
 "자 ID를 포함하고 있지 않습니다. (%1)"
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2958,7 +2958,7 @@
 "받는 쪽에서 이 설정을 사용하여 보낸 메시지의 서명을 검사하려고 할 때 경고 메"
 "시지가 표시될 수도 있습니다."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -2967,22 +2967,22 @@
 "설정한 S/MIME 암호화 키가 이 프로필에서 사용된 이메일 주소를 포함하고 있지 않"
 "습니다. (%1)"
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "키/인증서에 이메일 주소가 없음"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "서명 파일이 올바르지 않음"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "프로필 \"%1\" 편집"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -2991,7 +2991,7 @@
 "프로필에 정의한 사용자 정의 폴더가 더 이상 존재하지 않습니다. 기본 폴더를 사"
 "용합니다."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "편집..."
@@ -3022,6 +3022,18 @@
 msgid "We cannot delete vCard file."
 msgstr "vCard 파일을 지울 수 없습니다."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "정말로 취소하시겠습니까?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "확인"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3180,7 +3192,7 @@
 "예제를 보려면 <a href=\"https://ace.home.xs4all.nl/X-Faces/\">https://ace."
 "home.xs4all.nl/X-Faces/</a> 사이트를 참고하십시오."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "그림"
@@ -3212,7 +3224,7 @@
 msgid_plural "Distribution lists %2 are empty, they cannot be used."
 msgstr[0] "%2 분배 목록이 비어 있으므로 사용할 수 없습니다."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "주소록에 추가"
@@ -3222,22 +3234,22 @@
 msgid "Contact created successfully"
 msgstr "연락처 생성 완료됨"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "연락처를 저장할 수 없음: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "연락처를 저장할 수 없음"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "이 \"%1\" 폴더를 첨부하시겠습니까?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "폴더 첨부"
@@ -3447,14 +3459,14 @@
 msgstr "폴더(&O)"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "폴더에 필터 적용"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3480,7 +3492,7 @@
 msgstr "전달(&F)"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "필터 적용(&P)"
@@ -3505,7 +3517,7 @@
 msgstr "도움말(&H)"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "주 도구 모음"
@@ -3557,12 +3569,12 @@
 msgid "The file does not contain a message."
 msgstr "이 파일에 메시지가 없습니다."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "이 파일에는 메시지가 여러 개 있습니다. 첫 번째 메시지만 표시합니다."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3571,32 +3583,32 @@
 "선택한 메시지를 한 메시지의 첨부 파일(MIME digest)로 전달하거나, 각각 메시지"
 "를 개별적으로 전달하시겠습니까?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "첨부 파일로 전달"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "개별 메시지로 전달"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "메시지 필터 중"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "메시지 %2개 중 %1개 필터 중"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "메시지 이동 중"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "메시지 삭제 중"
@@ -3625,27 +3637,27 @@
 msgid "Text Direction Toolbar"
 msgstr "텍스트 방향 도구 모음"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail이 오프라인입니다. 모든 네트워크 작업이 중단되었습니다"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "이메일 보내기"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "이메일을 보낼 수 없음"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail이 온라인입니다. 모든 네트워크 작업이 다시 시작되었습니다"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3654,39 +3666,39 @@
 "KMail이 온라인입니다. 네트워크 연결이 감지된 후 모든 네트워크 작업을 다시 시"
 "작합니다"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail이 현재 오프라인 모드입니다. 무엇을 하시겠습니까?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "온라인/오프라인"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "온라인으로 작업"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "오프라인으로 작업"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "네트워크 연결이 감지되었습니다. 모든 네트워크 작업이 다시 시작되었습니다"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "네트워크 연결이 감지되지 않았습니다. 모든 네트워크 작업이 중단되었습니다"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3695,62 +3707,66 @@
 "%1에 자동 저장 파일을 열 수 없습니다.\n"
 "이유: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "자동 저장 파일 열기 실패"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the default transport:"
 msgstr[0] "다음 프로필 %1개가 기본 전송 방식을 사용하도록 변경되었습니다:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the modified transport:"
 msgstr[0] "다음 프로필 %1개가 수정된 전송 방식을 사용하도록 변경되었습니다:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "메시지 보내는 중"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "전송 작업 초기화 중..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "자원 %1이(가) 깨졌습니다."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"자원 %1이(가) 깨졌습니다.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "메일 보관 에이전트가 등록되지 않았습니다."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "나중에 보내기 에이전트가 등록되지 않았습니다."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "후속 작업 알림 에이전트가 등록되지 않았습니다."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3758,12 +3774,12 @@
 msgstr ""
 "인증서 관리자를 시작할 수 없습니다. Kleopatra 설치 상태를 확인하십시오."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail 오류"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3772,26 +3788,26 @@
 "가져오기 마법사를 시작할 수 없습니다. ImportWizard의 설치 상태를 확인하십시"
 "오."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "가져오기 마법사를 시작할 수 없음"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"\"PIM 설정 내보내기\" 프로그램을 시작할 수 없습니다. 설치 상태를 확인하십시"
+"\"PIM 데이터 내보내기\" 프로그램을 시작할 수 없습니다. 설치 상태를 확인하십시"
 "오."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "\"PIM 설정 내보내기\" 프로그램을 시작할 수 없음"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "\"PIM 데이터 내보내기\" 프로그램을 시작할 수 없음"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3800,95 +3816,95 @@
 "가져오기 마법사를 시작할 수 없습니다. ImportWizard의 설치 상태를 확인하십시"
 "오."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "가져오기 마법사를 시작할 수 없음"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "시스템에서 다른 메일 전송 도구가 발견되었습니다. 데이터를 가져오시겠습니까?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "가져오기 마법사를 시작할 수 없습니다. 설치 상태를 확인하십시오."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "제목 없음"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(템플릿 없음)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "이 폴더에는 만료 옵션이 없음"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt><b>%1</b> 폴더를 만료시키겠습니까?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "폴더 만료"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "만료(&E)"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "휴지통 비우기"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "휴지통으로 이동"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "휴지통 폴더를 비우시겠습니까?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr "<qt><b>%1</b> 폴더의 모든 메시지를 휴지통으로 이동시키겠습니까?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "모든 메시지를 휴지통으로 이동함"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "모든 오래된 메시지를 만료시키겠습니까?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "오래된 메시지를 만료시키겠습니까?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "만료"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3898,17 +3914,17 @@
 "HTML 메시지의 외부 참조를 불러 오면 스팸에 더 취약해질 수 있으며 다양한 보안 "
 "위협에 시스템이 노출될 가능성이 높아집니다."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "보안 경고"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "외부 참조 불러오기"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3920,531 +3936,531 @@
 "<qt>선택한 메시지 %1개를 삭제하시겠습니까?<br />삭제한 메시지는 복원할 수 없"
 "습니다.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "메시지 삭제"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "메시지 삭제"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "메시지 이동 중..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "메시지 삭제 중..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "메시지를 성공적으로 삭제했습니다."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "메시지를 성공적으로 이동했습니다."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "메시지 삭제에 실패했습니다."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "메시지 삭제가 취소되었습니다."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "메시지 이동이 실패했습니다."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "메시지 이동이 취소되었습니다."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "폴더로 메시지 이동"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "메시지 복사 중..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "메시지를 성공적으로 복사했습니다."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "메시지 복사에 실패했습니다."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "메시지 복사가 취소되었습니다."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "폴더로 메시지 복사 중"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "메시지를 휴지통으로 이동 중..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "메시지를 삭제하고 휴지통으로 이동 중..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "메시지를 휴지통으로 이동했습니다."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "메시지 삭제 및 휴지통 이동 성공"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "메시지를 휴지통으로 이동하는 데 실패했습니다."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "메시지를 삭제하거나 휴지통으로 이동하는 데 실패했습니다."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "메시지 휴지통 이동이 취소되었습니다."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "메시지를 삭제하거나 휴지통 이동이 취소되었습니다."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "폴더로 이동"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "다른 이름으로 저장(&A)..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "모든 폴더 만료(&E)"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "메일 확인(&M)"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "다음에서 메일 확인"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "메일 확인"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "대기 중인 메시지 보내기(&S)"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "온라인 상태(알 수 없음)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "다음으로 대기 중인 메시지 보내기"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "인증서 관리자"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "메시지 가져오기(&I)..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Sieve 디버그(&D)..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "필터 로그 뷰어(&L)..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "다른 이메일 클라이언트에서 가져오기(&I)..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "부재 중 답장 편집..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "자동 보관 설정(&C)..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "지연된 메시지..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "후속 작업 메시지..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "삭제(&D)"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "스레드를 휴지통으로 이동(&O)"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "스레드를 휴지통으로 이동"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "스레드 삭제(&H)"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "메시지 찾기(&F)..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "모든 메시지 선택(&A)"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "메일링 리스트 관리(&M)..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "단축키 할당(&A)..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "만료 설정(&E)"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "폴더 보관(&A)..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "외부 참조 불러오기(&X)"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "다음으로 메시지 복사..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "다음으로 메시지 이동..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "새 메시지(&N)..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "새로 만들기"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "템플릿에서 만든 메시지(&T)"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "메일링 리스트에 새 메시지 보내기(&O)..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "필터 만들기(&C)"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "제목에 대한 필터(&S)..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "보낸 사람에 대한 필터(&F)..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "받는 사람에 대한 필터(&T)..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "참조에 대한 필터(&C)..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "스레드 표시(&T)"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "스레드를 읽은 것으로 표시(&R)"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "스레드의 모든 메시지를 읽은 것으로 표시"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "스레드를 읽지 않은 것으로 표시(&U)"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "스레드의 모든 메시지를 읽지 않은 것으로 표시"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "스레드를 중요한 것으로 표시(&I)"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "스레드를 중요한 것으로 표시하지 않음(&I)"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "스레드를 동작 항목으로 표시(&A)"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "스레드를 동작 항목으로 표시하지 않음(&A)"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "스레드 주시(&W)"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "스레드 무시(&I)"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "첨부 파일 저장(&T)..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "복호화된 항목 복사..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "모든 필터 적용(&Y)"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "스레드/그룹 펴기(&E)"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "현재 스레드나 그룹 펴기"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "스레드/그룹 접기(&C)"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "현재 스레드나 그룹 접기"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "모든 스레드 펴기(&P)"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "현재 폴더의 모든 스레드 펴기"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "모든 스레드 접기(&O)"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "현재 폴더의 모든 스레드 접기"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "메시지 표시(&D)"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "다음 메시지(&N)"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "다음 메시지로 이동"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "다음 읽지 않은 메시지(&U)"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "다음"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "다음 읽지 않은 메시지로 이동"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "이전 메시지(&P)"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "이전 메시지로 이동"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "이전 읽지 않은 메시지(&M)"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "이전"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "이전 읽지 않은 메시지로 이동"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "다음 읽지 않은 폴더(&F)"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "다음 읽지 않은 메시지가 있는 폴더로 이동"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "이전 읽지 않은 폴더(&O)"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "이전 읽지 않은 메시지가 있는 폴더로 이동"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "다음 읽지 않은 텍스트(&T)"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "다음 읽지 않은 텍스트로 이동"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4453,223 +4469,228 @@
 "현재 메시지를 아래로 스크롤합니다. 메시지 끝에 도달하면 다음 읽지 않은 메시지"
 "로 이동합니다."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "필터 설정(&F)..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Sieve 스크립트 관리(&S)..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "계정 추가(&A)..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail 소개(&I)"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "KMail 환영 페이지 표시"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "알림 설정(&N)..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "KMail 설정(&C)..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "만료..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "즐겨찾는 폴더 추가..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "서버 측 구독..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "모든 필터 적용"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "KMail 데이터 가져오기/내보내기..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "새 주소록 연락처..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "메시지를 폴더로 복사"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "폴더로 이동..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "현재 작업 중단"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "다음 폴더에 초점 맞춤"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "이전 폴더에 초점 맞춤"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "초점이 맞은 폴더 선택"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "첫 폴더에 초점 맞춤"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "마지막 폴더에 초점 맞춤"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "다음 메시지에 초점 맞춤"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "이전 메시지에 초점 맞춤"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "첫 메시지 선택"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "마지막 메시지 선택"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "초점이 맞은 메시지 선택"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "빠른 검색에 초점 맞춤"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "이전 메시지로 선택 확장"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "다음 메시지로 선택 확장"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "메시지를 폴더로 이동"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "저대역 모드"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "이 폴더와 모든 하위 폴더의 메시지를 읽은 것으로 표시"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "이 폴더와 모든 하위 폴더의 중복 메시지 삭제"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "계정 설정(&S)"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "계정 다시 시작"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "즐겨찾는 폴더 추가"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "휴지통 비우기(&M)"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "모든 메시지를 휴지통으로 이동(&M)"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "검색 삭제(&D)"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "검색 편집..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "실행 취소(&U)"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "실행 취소: \"%1\"(&U)"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "필터 %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "검색... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4679,12 +4700,12 @@
 "메시지에 HTML을 사용하면 스팸에 더 취약해질 수 있으며 다양한 보안 위협에 시스"
 "템이 노출될 가능성이 높아집니다."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML 사용"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4699,118 +4720,118 @@
 "KMail 플러그인 설정에서 통합된 받은 편지함을 설정하거나, 새로운 편지함을 만들"
 "거나, 기능을 다시 끌 수 있습니다."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "통합된 받은 편지함을 사용하시겠습니까?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "통합된 받은 편지함 사용"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "취소"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "시작하는 중..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "휴지통으로 이동(&M)"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "휴지통"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "메시지를 휴지통으로 이동"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "항목을 복사할 수 없습니다. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "새 메시지 작성..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "답장..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "전달..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "기존 연락처에 추가"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "주소록에서 열기"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "이 링크를 책갈피에 추가"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "연락처 편집..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "다음으로 링크 저장..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "메시지에서 찾기(&F)..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "디스크에 그림 저장..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "HTML 형식으로 보기"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "이 사람이 보낸 메일을 HTML 형식으로 보기"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "이 사람이 보낸 메일의 외부 참조 불러오기"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "그림 공유..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4819,62 +4840,62 @@
 "KMail은 Akonadi 개인 정보 관리 프레임워크를 사용하며, 여러 변경 사항이 추가되"
 "었습니다."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "푸시 메일(IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "개선된 검색"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "메일에 메모(주석) 추가 지원"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "GUI 반응성 개선, 백그라운드 메일 확인"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "플러그인 지원"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "새로운 HTML 렌더러(QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "피싱 URL 검사"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "KDE 메일 클라이언트"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "폴더 내용 가져오는 중"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "기다려 주십시오..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "오프라인"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4883,7 +4904,7 @@
 "KMail이 현재 오프라인 모드입니다. 온라인으로 이동하려면 <a href=\"kmail:"
 "goOnline\">여기를</a> 누르십시오 . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4892,22 +4913,22 @@
 "계정이 현재 오프라인 모드입니다. 온라인으로 이동하려면 <a href=\"kmail:"
 "goResourceOnline\">여기를</a> 누르십시오 . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "연락처를 성공적으로 수정함"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "다음에 새 편지가 있음: "
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "읽지 않은 메시지 없음"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4929,8 +4950,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5020,17 +5041,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "요약 페이지에 보여 줄 플러그인 요약을 선택하십시오."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontact 요약"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5076,27 +5097,27 @@
 msgid "All"
 msgstr "모두"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact 요약"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontact 요약 보기"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2019 The Kontact developers"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5123,7 +5144,7 @@
 msgid "&Reply"
 msgstr "답장(&R)"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "답장 쓰기(&R)..."
@@ -5133,12 +5154,12 @@
 msgid "Reply to A&uthor..."
 msgstr "작성자에게 답장 쓰기(&U)..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "전체 답장 쓰기(&A)..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "메일링 리스트에 답장 쓰기(&L)..."
@@ -5168,7 +5189,7 @@
 msgid "&Edit As New"
 msgstr "새 메시지로 편집(&E)"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5358,112 +5379,112 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "검색 실패. 오류: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "메시지 찾기"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "찾기(&S)"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "인라인(&I)..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "첨부 파일로(&A)..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "첨부 파일 저장하기..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "선택 취소"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "원래 폴더로 이동"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1개 일치함"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "마지막 검색"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "올바른 폴더를 선택하지 않았습니다."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "조건을 선택하지 않았습니다."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "조건을 정의하지 않았습니다."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "선택한 모든 폴더가 비어 있거나 색인이 진행되지 않았습니다."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "조건을 추가하지 않았습니다."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "4글자 이하 문자열에서 사용할 수 없는 조건을 포함합니다."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "검색 중..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "검색 결과를 가져올 수 없습니다. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "검색 실패."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "검색 완료."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "검색이 중단되었습니다."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5473,19 +5494,19 @@
 "검색 폴더의 이름을 바꾸는 중 문제가 발생했습니다. 대개의 경우 같은 이름을 가"
 "지는 검색 폴더가 이미 존재합니다. 반환값: \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "메시지 %1개 복사"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "메시지 %1개 잘라내기"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "색인 상태 확인 중..."
@@ -5611,7 +5632,7 @@
 msgstr "프로그램이 맨 처음으로 실행되었는지 여부 선택(내부용)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5621,7 +5642,7 @@
 "를 물어 봅니다. 단 한 번만 묻습니다."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5629,26 +5650,26 @@
 msgstr "KMail 소개를 표시할지 여부를 결정합니다."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "폴더 빠른 검색 입력줄 보이기"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "기본적으로 인라인 답장을 사용합니다."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "받는 사람이 다음보다 많을 때 알려 주기:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5659,19 +5680,19 @@
 "경고를 끌 수 있습니다."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "보내기 전에 맞춤법 검사"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "자동으로 읽음 확인 알림 요청(&M)"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5686,13 +5707,13 @@
 "</em>으로도 여부를 선택할 수 있습니다.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "자동 저장 간격:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5703,151 +5724,151 @@
 "생성할 시간 간격을 설정하십시오. 0으로 설정하면 자동 저장을 비활성화합니다."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "작성기 창에 텍스트 스니펫 관리 및 삽입 패널을 표시합니다."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "선택하면 보낸 메시지를 암호화된 형태로 저장합니다"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "최근 사용된 모든 URL 목록"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "최근 사용된 모든 인코딩 목록"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "암호화 표시기 레이블 보이기"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "기본 보내기 단축키 검증"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "프로필 대화 상자의 크기(내부용)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "검색 창의 너비(내부용)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "검색 창의 높이(내부용)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "KMail 설정 창의 너비(내부용)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "KMail 설정 창의 높이(내부용)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "메시지 미리 보기 패널"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "메시지 미리 보기 패널을 보이지 않음"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "메시지 목록 아래에 메시지 미리 보기 패널 보임"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "메시지 목록 옆에 메시지 미리 보기 패널 보임"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "폴더 목록"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "긴 폴더 목록"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "짧은 폴더 목록"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "새 메시지에 사용할 템플릿"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "답장할 때 사용할 템플릿"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "모두 답장할 때 사용할 템플릿"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "전달할 때 사용할 템플릿"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "인용 부호"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "정책을 표시할 때 사용할 정책"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5855,7 +5876,7 @@
 msgstr "검색 창의 모음집 필드의 너비 지정(내부용)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5863,7 +5884,7 @@
 msgstr "검색 창의 모음집 필드의 높이 지정(내부용)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5871,7 +5892,7 @@
 msgstr "검색 창의 보낸 사람 필드의 너비 지정(내부용)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5879,7 +5900,7 @@
 msgstr "검색 창의 받는 사람 필드의 너비 지정(내부용)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5887,7 +5908,7 @@
 msgstr "검색 창의 날짜 필드의 너비 지정(내부용)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6150,7 +6171,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6186,7 +6207,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6505,8 +6526,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "메일 URL 추적 확인"
+msgid "Scan emails for tracking URLs"
+msgstr "이메일에서 추적기 URL 검색"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7106,6 +7127,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "모든 \"다시 묻지 않음\" 경고 활성화"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1초"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "전송 실행 취소"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7159,6 +7190,12 @@
 msgid "Zoom: %1%"
 msgstr "크기 조정: %1%"
 
+#~ msgid "Text Snippets"
+#~ msgstr "텍스트 스니펫"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "메일 URL 추적 확인"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "할당량에 거의 도달한 폴더 이름과 크기"
 
@@ -8585,9 +8622,6 @@
 #~ msgid "R&emove"
 #~ msgstr "삭제(&E)"
 
-#~ msgid "Restart"
-#~ msgstr "다시 시작"
-
 #~ msgid "Message Delayed..."
 #~ msgstr "메시지 지연됨..."
 
diff -Nru kmail-19.04.3/po/ko/kmail-refresh-settings.po kmail-19.12.3/po/ko/kmail-refresh-settings.po
--- kmail-19.04.3/po/ko/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/ko/kmail-refresh-settings.po	2020-03-03 00:34:07.000000000 +0000
@@ -0,0 +1,103 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+# Shinjo Park <kde@peremen.name>, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2020-02-16 00:54+0100\n"
+"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"Language-Team: Korean <kde-kr@kde.org>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 19.04.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "박신조"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kde@peremen.name"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "KMail 설정 초기화 도우미"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "작성자"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "KMail 설정 초기화"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "경고"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "설정 비우기"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "완료"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "정리"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "오래된 \"TipOfDay\" 설정 삭제: 완료"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "파일 `%1`에서 대화 상자 설정 삭제: 완료"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "파일 `%1`에서 필터 설정 삭제: 완료"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "설정 파일 `%1`에서 폴더 설정 삭제: 완료"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "설정 파일 `%1`에서 대화 상자 크기 삭제: 완료"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "사용하기 전에 KMail/Kontact를 닫으십시오."
diff -Nru kmail-19.04.3/po/ko/ktnef.po kmail-19.12.3/po/ko/ktnef.po
--- kmail-19.04.3/po/ko/ktnef.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/ko/ktnef.po	2020-03-03 00:34:07.000000000 +0000
@@ -1,12 +1,12 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Shinjo Park <kde@peremen.name>, 2014, 2015, 2016.
+# Shinjo Park <kde@peremen.name>, 2014, 2015, 2016, 2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-12-11 23:22+0100\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -15,7 +15,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.04.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
diff -Nru kmail-19.04.3/po/lt/akonadi_archivemail_agent.po kmail-19.12.3/po/lt/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/lt/akonadi_archivemail_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/lt/akonadi_archivemail_agent.po	2020-03-03 00:34:08.000000000 +0000
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
-"PO-Revision-Date: 2013-06-16 22:33+0300\n"
-"Last-Translator: Liudas Ališauskas <liudas@akmc.lt>\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2019-07-06 14:13+0300\n"
+"Last-Translator: Moo\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
@@ -18,17 +18,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n"
 "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Poedit 2.2.1\n"
 
 #: addarchivemaildialog.cpp:44
 #, kde-format
 msgid "Modify Archive Mail"
-msgstr "Keisti pašto archyvavimą"
+msgstr "Modifikuoti archyvuojamą paštą"
 
 #: addarchivemaildialog.cpp:46 archivemailwidget.cpp:274
 #, kde-format
 msgid "Add Archive Mail"
-msgstr "Pridėti pašto archyvą"
+msgstr "Pridėti archyvuojamą paštą"
 
 #: addarchivemaildialog.cpp:58
 #, kde-format
@@ -36,10 +36,9 @@
 msgstr "&Aplankas:"
 
 #: addarchivemaildialog.cpp:72
-#, fuzzy, kde-format
-#| msgid "F&ormat:"
+#, kde-format
 msgid "Format:"
-msgstr "F&ormatas:"
+msgstr "Formatas:"
 
 #: addarchivemaildialog.cpp:80
 #, kde-format
@@ -54,7 +53,7 @@
 #: addarchivemaildialog.cpp:96
 #, kde-format
 msgid "Backup each:"
-msgstr "Daryti kopiją kas:"
+msgstr "Daryti atsarginę kopiją kas:"
 
 #: addarchivemaildialog.cpp:112
 #, kde-format
@@ -85,7 +84,7 @@
 #: archivemailwidget.cpp:81
 #, kde-format
 msgid "Next archive in"
-msgstr "Kitas archyvas"
+msgstr "Kitas archyvas ties"
 
 #: archivemailwidget.cpp:81
 #, kde-format
@@ -103,10 +102,9 @@
 msgstr "Archyvuoti el. laiškus automatiškai."
 
 #: archivemailwidget.cpp:106
-#, fuzzy, kde-format
-#| msgid "Copyright (C) 2012, 2013 Laurent Montel"
+#, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
-msgstr "Autorinės teisės (C) 2012, 2013 Laurent Montel"
+msgstr "Autorių teisės (C) 2014-2019 Laurent Montel"
 
 #: archivemailwidget.cpp:107
 #, kde-format
@@ -116,19 +114,19 @@
 #: archivemailwidget.cpp:108
 #, kde-format
 msgid "Maintainer"
-msgstr "Palaikytojas"
+msgstr "Prižiūrėtojas"
 
 #: archivemailwidget.cpp:110
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
-msgstr "Liudas Ališauskas"
+msgstr "Liudas Ališauskas, Moo"
 
 #: archivemailwidget.cpp:111
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
-msgstr "liudas@akmc.lt"
+msgstr "liudas@akmc.lt, <>"
 
 #. i18n: ectx: property (text), widget (QPushButton, addItem)
 #: archivemailwidget.cpp:123 ui/archivemailwidget.ui:31
@@ -139,12 +137,12 @@
 #: archivemailwidget.cpp:126
 #, kde-format
 msgid "Open Containing Folder..."
-msgstr "Atverti turintį aplanką..."
+msgstr "Atverti vidinį aplanką..."
 
 #: archivemailwidget.cpp:129
 #, kde-format
 msgid "Delete"
-msgstr "Trinti"
+msgstr "Ištrinti"
 
 #: archivemailwidget.cpp:179
 #, kde-format
@@ -156,38 +154,39 @@
 msgid "Tomorrow"
 msgid_plural "%1 days"
 msgstr[0] "Rytoj"
-msgstr[1] "%1 dienos"
+msgstr[1] "%1 dienų"
 msgstr[2] "%1 dienų"
 msgstr[3] "%1 dienos"
 
 #: archivemailwidget.cpp:203
 #, kde-format
 msgid "Archive will be done %1"
-msgstr "Archyvas bus padarytas %1"
+msgstr "Archyvavimas bus atliktas %1"
 
 #: archivemailwidget.cpp:238
-#, fuzzy, kde-format
-#| msgid "Do you want to delete selected items? Do you want to continue?"
+#, kde-format
 msgid "Do you want to delete the selected items?"
-msgstr "Ar norite pašalinti pažymėtus elementus? Ar norite tęsti?"
+msgstr "Ar norite ištrinti pažymėtus elementus?"
 
 #: archivemailwidget.cpp:238
 #, kde-format
 msgid "Remove items"
-msgstr "Pašalinti elementus"
+msgstr "Šalinti elementus"
 
 #: archivemailwidget.cpp:274
 #, kde-format
 msgid ""
 "Cannot add a second archive for this folder. Modify the existing one instead."
-msgstr "Negalima pridėti antro archyvo į šį aplanką. Keiskite jau esantį."
+msgstr ""
+"Negalima pridėti antrą šio aplanko archyvą. Vietoj to, modifikuokite jau "
+"esamą archyvą."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
-msgstr ""
+msgstr "Katalogo nėra. Patikrinkite nustatymus. Archyvavimas atidėtas."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Pradėti archyvuoti %1"
@@ -196,13 +195,13 @@
 #: ui/archivemailwidget.ui:38
 #, kde-format
 msgid "Modify..."
-msgstr "Keisti..."
+msgstr "Modifikuoti..."
 
 #. i18n: ectx: property (text), widget (QPushButton, removeItem)
 #: ui/archivemailwidget.ui:45
 #, kde-format
 msgid "Remove"
-msgstr "Pašalinti"
+msgstr "Šalinti"
 
 #: widgets/formatcombobox.cpp:27
 #, kde-format
@@ -242,7 +241,7 @@
 #: widgets/unitcombobox.cpp:29
 #, kde-format
 msgid "Years"
-msgstr ""
+msgstr "Metai"
 
 #~ msgid "Archive now"
 #~ msgstr "Archyvuoti dabar"
diff -Nru kmail-19.04.3/po/lt/akonadi_followupreminder_agent.po kmail-19.12.3/po/lt/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/lt/akonadi_followupreminder_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/lt/akonadi_followupreminder_agent.po	2020-03-03 00:34:08.000000000 +0000
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2014-07-01 01:59+0000\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"Language-Team: lt\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,85 +18,85 @@
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n"
 "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr ""
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
@@ -105,12 +105,12 @@
 msgstr[2] ""
 msgstr[3] ""
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr ""
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr ""
diff -Nru kmail-19.04.3/po/lt/akonadi_mailfilter_agent.po kmail-19.12.3/po/lt/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/lt/akonadi_mailfilter_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/lt/akonadi_mailfilter_agent.po	2020-03-03 00:34:08.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: mailfilteragent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2014-03-17 20:32+0200\n"
 "Last-Translator: Liudas Ališauskas <liudas@aksioma.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -26,40 +26,40 @@
 msgid "Filter Log Viewer"
 msgstr "Filtrų žurnalo žiūryklė..."
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Registruoti filtro veiklas"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
 "data is collected and shown only when logging is turned on. "
 msgstr ""
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Registravimo informacija"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr ""
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -69,34 +69,34 @@
 "given."
 msgstr ""
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Registruoti filtro veiksmus"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Registro dydžio riba:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "neribotas"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -105,70 +105,70 @@
 "until the limit is no longer exceeded. "
 msgstr ""
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail klaida"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtruojami laiškai: %1 iš %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr ""
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr ""
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr ""
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Vertinamos filtro taisyklės:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr ""
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr ""
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Laiškai filtruojami"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "El. pašto filtravimo registras įjungtas"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Pasiruošęs"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/lt/akonadi_sendlater_agent.po kmail-19.12.3/po/lt/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/lt/akonadi_sendlater_agent.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/lt/akonadi_sendlater_agent.po	2020-03-03 00:34:08.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2015-01-26 13:33+0200\n"
 "Last-Translator: Liudas Ališauskas <liudas@akmc.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -63,57 +63,57 @@
 msgid "Your emails"
 msgstr "liudas@akmc.lt"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Kam"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Tema"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Siųsti apie"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Pasikartojimas"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Laiško identifikatorius"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Nėra laukiančių laiškų..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Siųsti dabar"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Trinti"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Taip"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Ne"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected items? Do you want to continue?"
 msgid "Do you want to delete the selected item?"
@@ -123,68 +123,68 @@
 msgstr[2] "Ar norite pašalinti pažymėtus elementus? Ar norite tęsti?"
 msgstr[3] "Ar norite pašalinti pažymėtus elementus? Ar norite tęsti?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Pašalinti elementus"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Ar norite pašalinti ir laiškus?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Pašalinti laiškus"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Laiškas nerastas."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Laiškas nerastas."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Klaida gaunant laišką."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Negalima gauti laiško. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Nepavyksta sukurti perdavimo"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Laiškas nėra tikras laiškas."
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Negalima išsiųsti laiško."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Laiškas išsiųstas"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Aptikta klaida. Ar norite siųsti dar kartą?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Aptikta klaida"
diff -Nru kmail-19.04.3/po/lt/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/lt/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/lt/akonadi_unifiedmailbox_agent.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/lt/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:08.000000000 +0000
@@ -0,0 +1,89 @@
+# Lithuanian translations for kmail package.
+# Copyright (C) 2019 This file is copyright:
+# This file is distributed under the same license as the kmail package.
+# Automatically generated, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2018-11-09 04:02+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: lt\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n"
+"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
+
+#: settingsdialog.cpp:63
+#, kde-format
+msgid "Add"
+msgstr ""
+
+#: settingsdialog.cpp:77
+#, kde-format
+msgid "Modify"
+msgstr ""
+
+#: settingsdialog.cpp:100
+#, kde-format
+msgid "Remove"
+msgstr ""
+
+#: settingsdialog.cpp:110
+#, kde-format
+msgid "Do you really want to remove unified mailbox <b>%1</b>?"
+msgstr ""
+
+#: settingsdialog.cpp:111
+#, kde-format
+msgid "Really Remove?"
+msgstr ""
+
+#: unifiedmailboxagent.cpp:59 unifiedmailboxagent.cpp:151
+#, kde-format
+msgid "Unified Mailboxes"
+msgstr ""
+
+#: unifiedmailboxagent.cpp:184
+#, kde-format
+msgid "Synchronizing unified mailbox %1"
+msgstr ""
+
+#: unifiedmailboxeditor.cpp:95
+#, kde-format
+msgid "Add an Unified MailBox"
+msgstr ""
+
+#: unifiedmailboxeditor.cpp:107
+#, kde-format
+msgid "Name:"
+msgstr ""
+
+#: unifiedmailboxeditor.cpp:114
+#, kde-format
+msgid "Pick icon..."
+msgstr ""
+
+#: unifiedmailboxeditor.cpp:115
+#, kde-format
+msgid "Icon:"
+msgstr ""
+
+#: unifiedmailboxmanager.cpp:309
+#, kde-format
+msgid "Inbox"
+msgstr ""
+
+#: unifiedmailboxmanager.cpp:316
+#, kde-format
+msgid "Sent"
+msgstr ""
+
+#: unifiedmailboxmanager.cpp:323
+#, kde-format
+msgid "Drafts"
+msgstr ""
diff -Nru kmail-19.04.3/po/lt/kmail.po kmail-19.12.3/po/lt/kmail.po
--- kmail-19.04.3/po/lt/kmail.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/lt/kmail.po	2020-03-03 00:34:08.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2017-06-25 15:02+0200\n"
 "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba@gmail.com>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -197,8 +197,8 @@
 msgstr "Keletas šifravimo raktų vienam adresui"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -305,27 +305,27 @@
 "KMail negalėjo pilnai aptikti pašto sąrašo šiame aplanke. Prašome įrašyti "
 "adresą ranka."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Naudojimas:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Būsena:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% pilnas"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 iš %2 panaudota"
@@ -348,7 +348,7 @@
 "kuriuos norite susieti su šiuo aplanku.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Šablonai"
@@ -359,108 +359,108 @@
 msgstr "Na&udoti savadarbį laiško šabloną šiam aplankui"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopijuoti globaliuosius šablonus"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Rodinys"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Naudoti savitus ženkliukus"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normalus:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "N&eskaitytas:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Rodyti siuntėjo/gavėjo stulpelį laiškų sąraše"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Ro&dyti stulpelį:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Numatyta"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Siuntėjas"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Gavėjas"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Laiškų sąrašas"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Naudoti numatytąjį kanalų skaitymą"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Kanalų skaitymas"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Naudoti numatytąjį apipavidalinimą"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Apipavidalinimas"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Laiško numatytas formatas"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "Pirmenybė HTML prieš įprastą tekstą"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &Plain Text to HTML"
 msgid "Prefer text to HTML"
 msgstr "Pirmenybė įprastam testui prie HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Use Global Setting"
 msgid "Use Global Settings"
@@ -471,103 +471,108 @@
 msgid "Retrieval Options"
 msgstr "Atsiuntimo parinktys"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Tapatybė"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Gavimas"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Siuntimas"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Išsiunčiamų paskyros (įdėkite bent vieną):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Bendros parinktys"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Klausti prieš siunčiant"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Tikrinti rašybą prieš siunčiant"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Niekuomet automatiškai"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Tikrinant paštą rankiniu būdu"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Visada tikrinant paštą"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Siųsti dabar"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Siųsti vėliau"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Siųsti &laiškus iš Siunčiamų laiškų aplanko:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Numatytasis si&untimo būdas:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "Add Mail Account..."
 msgstr "Pridėti pastabą..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "Keisti paskyrų eiliškumą..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -576,30 +581,30 @@
 msgstr ""
 "Nepavyko paleisti paskyrų vediklio. Patikrinkite, ar tinkamai įdiegėte."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Nepavyksta paleisti paskyrų vediklio"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Įtraukti tikrinant paštą rankiniu būdu"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Atsijungti išjungiant KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Tikrinti paštą paleidimo metu"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -657,7 +662,7 @@
 msgid "Fixed Width Font"
 msgstr "Nekintamo pločio šriftas"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Tekstų rengyklė"
@@ -961,91 +966,91 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Negalime sukurti žymės. Žymė tuo pačiu pavadinimu jau yra."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Bendri"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standartiniai šablonai"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Savadarbiai šablonai"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Tema"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Koduotė"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Antraštės"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Priedai"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Auto taisymas"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Automatiškai keisti paveikslėlio dydį"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Parašas"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Įterpti parašą virš bet kokio cituojamo teksto"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Atsakant necituoti jokio esančio parašo"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formatuoti"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1053,7 +1058,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1061,17 +1066,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Nustatyti teksto plotį automatiniam žodžių kėlimui"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1079,7 +1084,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1087,34 +1092,34 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Įdėtas tekste"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Kaip priedas"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Nustatyti numatytą persiųsto laiško formatą"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Numatytasis persiuntimo tipas:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Gavėjai"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1122,17 +1127,17 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Perspėti, jeigu per daug gavėjų išvardinta"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Nustatyti didžiausią gavėjų skaičių šiam perspėjimui"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1143,50 +1148,50 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Be saugojimo"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Redaguoti užbaigimo tvarką..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Automatinio išsaugojimo nėra"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Automatinio išsaugojimo nėra"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1196,18 +1201,18 @@
 msgstr[2] " minučių"
 msgstr[3] " minutės"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Automatiškai išsaugoti laišką šiuo nustatytu laiko intervalu"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Atsak&ymo temos priešdėliai"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1216,59 +1221,59 @@
 "Atpažinti bet kurį iš šių priešdėlių\n"
 "(tai yra įprastosios išraiškos, raidžių dydis neskiriamas):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Pridėti..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "P&ašalinti"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Kei&sti..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Įrašyti naują atsakymo priešdėlį:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Temos priešdėliai &persiunčiant"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Pridėti..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Pa&šalinti"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Keisti..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Įrašyti naują persiuntimo priešdėlį:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1278,89 +1283,89 @@
 "galo, ieškant koduotės, turinčios visus reikalingus simbolius."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Keisti..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Įrašyti koduotę:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Išlai&kyti originalo koduotę atsakant arba persiunčiant (esant galimybei)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Ši koduotė yra nepalaikoma."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Na&udoti parinktą laiško id priesagą"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Parinkta laiško &id priesaga:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Nustatyti parinktus MIME antraščių laukus:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Reikšmė"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Nauja"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Pavadinimas:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Reikšmė:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "Neteisinga data"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Su Outlook suderinami priedų pavadinimai"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1369,39 +1374,39 @@
 "Įgalinkite šią parinktį, jei norite, kad Outlook(tm) suprastų priedų vardus, "
 "turinčius ne angliškų simbolių."
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Į&jungti trūkstamų priedų aptikimą"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Bet kurį iš šių raktažodžių laikyti ketinimu pridėti failą:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Įrašyti naują raktažodį:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Attachment:"
 msgid "Maximum Attachment Size:"
 msgstr "Priedas:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Neribotas"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1495,7 +1500,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Tekstų rengyklė"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1613,7 +1618,7 @@
 msgid "Archive Folder"
 msgstr "Aplanko archyvavimas"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1679,7 +1684,7 @@
 msgid "Notification"
 msgstr "Pranešimas"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1688,12 +1693,12 @@
 msgstr[2] "%1 priedų (%2)"
 msgstr[3] "%1 priedas (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Slėpti priedų sąrašą"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Rodyti priedų sąrašą"
@@ -1710,332 +1715,332 @@
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Parinkite žodyną, naudojamą šio laiško rašybos tikrinimui"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Parinkti „From:“ (nuo) el. pašto adresą šiam laiškui"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Nustatyti temą šiam laiškui"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Tapatybė:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "Žo&dynas:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Išsiųstų laiškų ap&lankas:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Paš&to perdavimas:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Nuo:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "T&ema:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "Siųsti &paštą"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Siųsti &paštą per"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Siųsti"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Siųsti &vėliau"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Siųsti paštą &vėliau per"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Į eilę"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Įrašyti &juodraščiu"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Išsaugoti el. laišką Juodraščių aplanke"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Įrašyti ša&blonu"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Išsaugoti el. laišką Ruošinių aplanke"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Įrašyti kaip &failą"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Įterpti &teksto failą..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Įte&rpti neseniai naudotą teksto failą"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adresų knygelė"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Atverti adresų knygelę"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Naujas redaktorius"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Pažymėti &gavėjus..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Išsaugoti &platinimo sąrašą"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Įterpti kaip pri&edą"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Iš&valyti tarpus"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Naudoti ne&kintamo pločio šriftą"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Skubus"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Prašyti pristatymo pranešimo"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Prašyti pristatymo pranešimo"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Ke&lti žodžius"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Fragmentai"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatiškai tikrinti rašybą"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Raiškiojo teksto redagavimas"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Raiškusis tekstas"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Visus laukelius"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Tapatybė"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "Žo&dynas"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Išsiųs&tų laiškų aplankas"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Pašto transportas"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Nuo"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "T&ema"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Padėti pa&rašą"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Pridėti parašą"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Pridėti parašą žymeklio vietoje"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Rašybos tikrinimas..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Rašybos tikrinimas"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Šifruoti laišką"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Šifravimas"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Pa&sirašyti laišką"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Pasirašymas"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Kriptografinis laiško formatas"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Pasirinkite šio laiško kriptografinį formatą"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Ieškoti laiškų..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Konfi&gūruoti KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2044,53 +2049,53 @@
 "<qt>Tai pilnai paslėps meniu juostą. Norėdami vėl ją parodyti spauskite %1.</"
 "qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Slėpti meniu juostą"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Eilutė: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Stulpelis: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "PRŠ"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "ĮTRP"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Rašybos tikrinimas: išjungtas"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Rašybos tikrinimas: išjungtas"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Iš &naujo įrašyti šablonu"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Į&rašyti kaip juodraštį"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2098,7 +2103,7 @@
 msgstr ""
 "Išsaugokite laišką Šablonų aplanke. Jį vėliau galėsite pakartotinai naudoti."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2107,60 +2112,60 @@
 "Išsaugokite laišką Juodraščių aplanke. Ją vėliau galėsite redaguoti ir "
 "išsiųsti."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Ar atsisakote laiško, ar jį išsaugosite vėlesniam naudojimui?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Užverti redaktorių"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Laiško automatinis išsaugojimas nepavyko"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Laiško išsiųsti nepavyko"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert Text File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Įterpti &teksto failą..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Pridėti &kaip Įterptą paveikslėlį"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Pri&dėti kaip priedą"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Priedo pavadinimas:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "Neteisinga data"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2169,7 +2174,7 @@
 msgstr[2] "Į laiško tekstą įterpti kelis URL"
 msgstr[3] "Į laiško tekstą įterpti kelis URL"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2178,17 +2183,17 @@
 msgstr[2] "Pridėti &failus kaip priedus"
 msgstr[3] "Pridėti &failus kaip priedus"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Podėlio tekstą įterpti kaip pri&edą"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "bevardis"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2201,12 +2206,12 @@
 "raktas ar liudijimas.</p><p>Prašome pasirinkti naudotiną raktą(-us) "
 "tapatybės konfigūracijoje.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Neapibrėžtas šifravimo raktas"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2217,12 +2222,12 @@
 "kuris turėtų būti tam naudojamas (OpenPGP arba S/MIME). </p><p>Prašome "
 "nurodyti naudotiną raktą tapatybės konfigūracijoje.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nenurodytas pasirašymo raktas"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2233,7 +2238,7 @@
 "nurodyti savo el. pašto adresą kiekvienoje tapatybėje, kad nereikėtų jo "
 "įrašinėti kiekvieną kartą ranka."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2242,59 +2247,59 @@
 "Reikia nurodyti bent vieną gavėją lauke „Kam:“, „Kopija“ ar „Nematoma "
 "kopija“."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Laukas „Kam:“ yra tuščias. Ar vis tiek siųsti?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Lauke „Kam:“ nėra adresato"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Jūs neįrašėte temos. Ar vis tiek siųsti?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nenurodyta tema"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Siųsti k&aip yra"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Nurodyti „Temą“"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Reikia nurodyti bent vieną gavėją, kad galima būtų užšifruoti ruošinį."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Ruošiuosi siųsti laišką..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Išsiuntimo patvirtinimas"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Siųsti dabar"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2302,65 +2307,65 @@
 msgstr ""
 "Jūs bandote išsiųsti laišką daugiau kaip %1 gavėjams. Ar vis tiek siųsti?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Per daug gavėjų"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Siųsti k&aip yra"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Keisti gavėjus"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "Išjungus HTML režimą bus prarastas formatavimas. Ar tikrai išjungti?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Prarasti formatavimą?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Prarasti formatavimą"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2368,7 +2373,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Sending Without Confirmation"
 msgid "Plugin Editor Information"
@@ -2440,25 +2445,25 @@
 msgid "External editor was started."
 msgstr "Išorinis redaktorius buvo paleistas."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2485,11 +2490,6 @@
 msgid "Message will not be encrypted"
 msgstr "Laiškas nebus užšifruotas"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Tekstų fragmentai"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2533,27 +2533,27 @@
 msgid "Cannot move messages."
 msgstr "Nepavyksta perkelti žinučių."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Negražintas joks aplankas."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Laiškai suarchyvuoti"
@@ -2594,49 +2594,49 @@
 msgid "&Existing identities:"
 msgstr "&Esančios tapatybės:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Įrašyti naują raktažodį:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Redaguoti tapatybę"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Bendri"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Jūsų vardas:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2648,12 +2648,12 @@
 "p><p>jei laukas liks neužpildytas, Jūsų vardo antraštėje nebus, ten "
 "pasirodys tik el. pašto adresas.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zacija:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2665,12 +2665,12 @@
 "laiškų antraštėje.</p><p>Palikti jį tuščią yra visiškai saugu ir normalu.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&El. pašto adresas:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2686,12 +2686,12 @@
 "neužpildytą, arba, jei padarysite klaidą, žmonės, bandydami Jums atsakyti, "
 "susidurs su sunkumais.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "El. pašto a&lternatyvos:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2702,12 +2702,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kriptografija"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2728,12 +2728,12 @@
 "pasirašyti laiškų, tačiau įprastų pašto funkcijų tai nepalies.</p><p>Apie "
 "raktus daugiau sužinoti galite <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP parašo raktas:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2757,12 +2757,12 @@
 "tačiau įprastų pašto funkcijų tai nepalies.</p><p>Apie raktus daugiau "
 "sužinoti galite <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP šifravimo raktas:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2775,12 +2775,12 @@
 "negalės skaitmeniniu būdu, naudojant S/MIME, pasirašyti laiškų, tačiau "
 "įprastų pašto funkcijų tai nepalies.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME pasirašymo liudijimas:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2795,40 +2795,40 @@
 "MIME, užkoduoti išeinančių laiškų, tačiau įprastų pašto funkcijų tai "
 "nepalies.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME šifravimo liudijimas:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Pageidaujamas formatavimas:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Automatiškai pasirašyti laiškus"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Kada tik įmanoma, automatiškai šifruoti &laiškus"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Išsamiau"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "„Kam atsakyti“ ad&resas:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2846,12 +2846,12 @@
 "grupės adresu.</p><p>jei abejojate tokio adreso reikalingumu, palikite lauką "
 "neužpildytą.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&CC adresai:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2867,12 +2867,12 @@
 "paskyrai.</p><p>Norėdami nurodyti daugiau nei vieną adresą, atskirkite juos "
 "kableliais.</p><p>Jei kyla abejonių, palikite šitą laukelį tuščią.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Ne&matomos kopijos adresai:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2889,57 +2889,57 @@
 "paskyrai.</p><p>Norėdami nurodyti daugiau nei vieną adresą, atskirkite juos "
 "kableliais.</p><p>Jei kyla abejonių, palikite šitą laukelį tuščią.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Ž&odynas:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Išsiųstų laiškų &aplankas:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Juodraščių aplankas:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Ša&blonų aplankas:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Išsiuntimo paskyra:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Pridėti mano vCard laiške"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Sukurti..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Automatinio taisymo kalba:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Atkurti numatytą domeno vardą:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Numa&tytasis domenas:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2948,33 +2948,33 @@
 "<qt><p>Numatytasis domenas yra naudojamas užbaigti el. pašto adresams, kurie "
 "turi tik naudotojų vardus.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Naudoti savadarbį laiško šabloną šiai tapatybei"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Parašas"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Paveikslėlis"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Neteisinga el. pašto alternatyva „%1“"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Neteisingas el. pašto adresas"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2987,7 +2987,7 @@
 "Dėl šio neatitikimo gavėjo pusėje gali būti rodomi perspėjimo pranešimai, "
 "nes bus bandoma patikrinti parašus, padarytus su šia konfigūracija."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2996,7 +2996,7 @@
 "Vienas iš konfigūruotų OpenPGP šifravimo raktų neturi jokio naudotojo ID su "
 "šiai tapatybei konfigūruotu el. pašto adresu (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3009,7 +3009,7 @@
 " Dėl šio neatitikimo gavėjo pusėje gali būti rodomi perspėjimo pranešimai, "
 "nes bus bandoma patikrinti parašus, padarytus su šia konfigūracija."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3018,22 +3018,22 @@
 "Vienas iš konfigūruotų S/MIME šifravimo liudijimų neturi jokio šiai "
 "tapatybei konfigūruoto el. pašto adreso (%1)"
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "El. pašto adresas nerastas tarp raktų/liudijimų"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Parašo failas neteisingas"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Redaguoti tapatybę „%1“"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3045,7 +3045,7 @@
 "Tapatybės „%1“ parinkto juodraščių aplanko nėra (arba, jau nebėra). Todėl "
 "bus naudojamas numatytasis juodraščių aplankas."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Keisti..."
@@ -3077,6 +3077,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Išsiuntimo patvirtinimas"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3246,7 +3259,7 @@
 "Pavyzdžius galima rasti <a href=\"http://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Paveikslėlis"
@@ -3281,7 +3294,7 @@
 msgstr[2] "Gavėjų sąrašai „%2“ yra tušti, jų negalima naudoti."
 msgstr[3] "Gavėjų sąrašai „%2“ yra tušti, jų negalima naudoti."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Įdėti į adresų knygą"
@@ -3291,22 +3304,22 @@
 msgid "Contact created successfully"
 msgstr "Kontaktas sėkmingai sukurtas"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kontaktas negali būti išsaugotas: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Nepavyko išsaugoti kontakto"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Ar pageidaujate pridėti šį aplanką „%1“?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Pridėti aplanką"
@@ -3508,7 +3521,7 @@
 msgstr "&Aplankas"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3516,7 +3529,7 @@
 msgstr "Pritaikyti &visus filtrus aplankams"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3542,7 +3555,7 @@
 msgstr "&Persiųsti"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Pritaik&yti filtrą"
@@ -3567,7 +3580,7 @@
 msgstr "&Pagalba"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Pagrindinė įrankinė"
@@ -3624,12 +3637,12 @@
 msgid "The file does not contain a message."
 msgstr "Faile nėra laiško."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Faile yra daugiau nei vienas laiškas. Rodomas tik pirmas laiškas."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3638,32 +3651,32 @@
 "Norite persiųsti pasirinktus laiškus kaip priedus viename laiške (kaip MIME "
 "santrauka), ar kaip individualius laiškus?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Siųsti kaip santrauką"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Siųsti individualiai"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Laiškai filtruojami"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtruojami laiškai: %1 iš %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Laiškai perkeliami"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Laiškai trinami"
@@ -3692,29 +3705,29 @@
 msgid "Text Direction Toolbar"
 msgstr "Teksto krypties įrankinė"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail nustatytas dirbti atsijungus; visi darbai tinkle sustabdyti"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "Siųsti &paštą"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Ruošiuosi siųsti laišką..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail nustatytas dirbti prisijungus; visi darbai tinkle atnaujinami"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3723,49 +3736,49 @@
 "KMail nustatytas dirbti prisijungus; visi darbai bus pratęsti kai tik bus "
 "prisijungta prie tinklo"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail šiuo metu veikia neprisijungęs. Ar norite prisijungti?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Prisijungęs/atsijungęs"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Dirbti prisijungus"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Dirbti neprisijungus"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Tinklo sujungimas nustatytas, visi tinklo darbai atnaujinti"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Nėra tinklo sujungimo, visi tinklo darbai yra sulaikyti"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Nepavyko atidaryti automatinio saugojimo failo"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3775,7 +3788,7 @@
 msgstr[2] "Šios %1 tapatybių buvo pakeistos ir naudos numatytą transportą:"
 msgstr[3] "%1 tapatybė buvo pakeista ir naudos numatytą transportą:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3787,44 +3800,47 @@
 "Šios %1 tapatybių buvo pakeistos ir turi naudoti modifikuotą transportą:"
 msgstr[3] "%1 tapatybė buvo pakeista ir turi naudoti modifikuotą transportą:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Siunčiami laiškai"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Ruošiamasi siųsti..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Resursas %1 yra sugadintas."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Pašto archyvavimo agentas nebuvo užregistruotas."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Siuntimo vėliau agentas nebuvo užregistruotas."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Send Later Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr "Siuntimo vėliau agentas nebuvo užregistruotas."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3832,12 +3848,12 @@
 "properly installed."
 msgstr "Negalima paleisti liudijimų tvarkyklės; Patikrinkite ar tai įdiegta."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail klaida"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3846,25 +3862,29 @@
 msgstr ""
 "Nepavyko paleisti importavimo vediklio. Patikrinkite, ar tinkamai įdiegėte."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Nepavyksta paleisti importavimo vediklio"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Nepavyko paleisti importavimo vediklio. Patikrinkite, ar tinkamai įdiegėte."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Nepavyksta paleisti importavimo vediklio"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3873,69 +3893,69 @@
 msgstr ""
 "Nepavyko paleisti importavimo vediklio. Patikrinkite, ar tinkamai įdiegėte."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Nepavyksta paleisti importavimo vediklio"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Nepavyko paleisti importavimo vediklio. Patikrinkite, ar tinkamai įdiegėte."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Nėra temos"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(šablonų nėra)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Šiam aplankui nėra nurodyta jokių galiojimo laiko parinkčių"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Ar tikrai norite trinti senus laiškus iš aplanko <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Trinti senus laiškus aplanke"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Trinti se&nus laiškus"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Ištuštinti šiukšlinę"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Išmesti į šiukšlinę"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Ar tikrai norite ištuštinti šiukšlinę?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3944,27 +3964,27 @@
 "<qt>Ar tikrai norite perkelti visus laiškus iš aplanko <b>%1</b> į šiukšlinę?"
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Visi laiškai perkelti į šiukšlinę"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Ar tikrai norite sunaikinti visus senus laiškus?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Trinti senus laiškus?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Trinti senus"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3974,17 +3994,17 @@
 "Įkeliant išorines HTML nuorodas padidėja tikimybė gauti „brukalą“; taip pat "
 "išauga Jūsų sistemos pažeidimo dėl esamų ar būsimų saugumo spragų tikimybė."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Saugumo perspėjimas"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Įkelti nuorodas iš išorės"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4005,538 +4025,538 @@
 "<qt>Ar tikrai norite ištrinti %1 pasirinktą laišką?<br />Ištrynus, jis "
 "nebegali būti atstatytas.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Ištrinti laiškus"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Ištrinti laišką"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Laiškai perkeliami..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Laiškai trinami..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Laiškai sėkmingai ištrinti."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Laiškai sėkmingai perkelti."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Laiškų ištrinti nepavyko."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Laiškų trynimas nutrauktas."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Laiškų perkėlimas nepavyko"
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Laiškų perkėlimas nutrauktas."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Perkelti laišką į aplanką"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Laiškai kopijuojami..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Laiškai sėkmingai nukopijuoti."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Nepavyko nukopijuoti laiškų."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Laiškų kopijavimas nutrauktas."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopijuoti laiškus į aplanką"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Perkeliami laiškai į šiukšlinę..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Perkeliami laiškai į šiukšlinę..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Laiškai sėkmingai perkelti į šiukšlinę."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Laiškai sėkmingai perkelti į šiukšlinę."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Laiškų perkelti į šiukšlinę nepavyko"
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Laiškų perkelti į šiukšlinę nepavyko"
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Laiškų perkėlimas nutrauktas į šiukšlinę."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Laiškų perkėlimas nutrauktas į šiukšlinę."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Pereiti į aplanką"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Įrašyti &kaip..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Ištri&nti senus laiškus visuose aplankuose"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Tikrinti paštą"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Tikrinti paštą iš"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Tikrinti paštą"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Siųsti eilės laiškus"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Prisijungimo būsena (nežinoma)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "&Siųsti eilėje esančius laiškus per"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Liudijimų tvarkytuvė"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importuoti laiškus..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Derinti Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filtrų žu&rnalų žiūryklė..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Redaguoti „Nesu darbo vietoje“ atsakymus..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Konfigūruoti automatinį archyvavimą..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Užsilaikę pranešimai..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Ieškoti laiškų..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Trinti"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Per&kelti giją į šiukšlinę"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Perkelti giją į šiukšlinę"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Trinti &giją"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Ieškoti laiškų..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Žymė&ti visus laiškus"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Pašto sąrašo tvarkymas..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Priski&rti greituosius klavišus..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
-msgstr "&Senų laiškų nustatymai"
+msgstr "&Senų laiškų nuostatos"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Archyvuoti aplanką..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Įkelti laiško &nurodomas išorines nuorodas"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Laiškus kopijuoti į..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Laiškus perkelti į..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Naujas laiškas..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Naujas"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Naujas laiškas pagal ša&bloną"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Naujas laiškas pašto s&ąrašui..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Su&daryti filtrą"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtruoti „&Temą“..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtruoti „&Nuo“..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtruoti „&Kam“..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Filtruoti „&Kam“..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Žymėti &giją"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Žymėti giją &skaityta"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Žymėti visus pasirinktos gijos laiškus skaitytais"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Žymėti giją ne&skaityta"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Žymėti visus pasirinktos gijos laiškus neskaitytais"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Žymėti giją s&varbia"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Naikinti gijos žymę „&Svarbi“"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Žymėti giją kaip &veiksmo elementą"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Naikinti gijos žymę „&Veiksmo elementas“"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Stebėti giją"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignoruoti giją"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Į&rašyti priedus..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Kopijuoti elementą į..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Pritaikyti &visus filtrus"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Išplėsti giją / grupę"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Išplėsti esamą giją ar grupę"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Sutraukti giją / grupę"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Sutraukti esamą giją ar grupę"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Iš&plėsti visas gijas"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Išplėsti visas gijas esamame aplanke"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "S&utraukti visas gijas"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Sutraukti visas gijas esamame aplanke"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Rodyti laišką"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Kitas laiškas"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Eiti prie kito laiško"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Tolesnis &neskaitytas laiškas"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Tolesnis"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Eiti į ankstesnį neskaitytą laišką"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Ankstesnis laiškas"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Eiti į ankstesnį laišką"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Ank&stesnis neskaitytas laiškas"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Eiti į ankstesnį neskaitytą laišką"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Kitas neskaitytas a&plankas"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Eiti į kitą aplanką su neskaitytais laiškais"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Ankstesnis neskaitytas ap&lankas"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Eiti į ankstesnį aplanką su neskaitytais laiškais"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Kitas neskaitytas &tekstas"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Eiti į kitą neskaitytą tekstą"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4545,221 +4565,227 @@
 "Slinkti žemyn esamo laiško tekstu.  Jei pasiektas laiško galas, eiti prie "
 "kito neskaityto laiško."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Konfigūruoti &filtrus..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Tvarkyti &Sieve scenarijus..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "&Add Account..."
 msgstr "Pridėti pastabą..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "K&Mail įžanga"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Rodyti KMail pasisveikinimo puslapį"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Konfigūruoti &pranešimus..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Konfi&gūruoti KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Trinti senus..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Pridėti mėgstamą aplanką..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Serverio pusės prenumerata..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Pritaikyti &visus filtrus"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "&Eksportuoti KMail duomenis..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Naujas adresų knygos kontaktas..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopijuoti laišką į aplanką"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Pereiti į aplanką..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Atšaukti vykdomą operaciją"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Perkelti žymeklį į kitą aplanką"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Perkelti žymeklį į ankstesnį aplanką"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Pažymėti žymekliu išskirtą aplanką"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Fokusuoti ties pirmu aplanku"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Fokusuoti ties paskutiniu aplanku"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Perkelti žymeklį į kitą laišką"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Perkelti žymeklį į ankstesnį laišką"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Pažymėti pirmą laišką"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Pažymėti paskutinį laišką"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Pažymėti žymekliu išskirtą laišką"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Nustatyti fokusavimą greitai paieškai"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Išplėsti pažymėjimą iki ankstesnio laiško"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Išplėsti pažymėjimą iki kito laiško"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Perkelti laišką į aplanką"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Nuostatos"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Customize accounts order..."
+msgid "Restart Account"
+msgstr "Keisti paskyrų eiliškumą..."
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Pridėti mėgstamą aplanką"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Iš&tuštinti šiukšlinę"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Perkelti visus laiškus į &šiukšlinę"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Pašalinti paieškos aplanką"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Keisti paiešką..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "Atš&aukti"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "Atš&aukti: „%1“"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtruoti: %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4767,7 +4793,7 @@
 msgid "Search... <%1>"
 msgstr "Ieškoti...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4777,12 +4803,12 @@
 "Naudojant laiškuose HTML gali padidėti tikimybė gauti „brukalą“;  taip pat "
 "išauga Jūsų sistemos pažeidimo dėl esamų ar būsimų saugumo skylių tikimybė."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Naudoti HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4792,118 +4818,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Paleidžiama..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Perkelti į šiukšlinę"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Perkelti laišką į šiukšlinę"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Nepavyksta kopijuoti elemento. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Naujas laiškas adresatui..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Kam atsakyti..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Kam persiųsti..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Pridėti prie esančio kontakto"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Atverti su adresų knygele"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Įdėti žymelę šiai nuorodai"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Keisti adresatą..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Įrašyti nuorodą kaip..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Ieškoti laiške..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Įrašyti paveikslą diske..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr ""
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Bendrinti paveikslėlį..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4912,68 +4938,68 @@
 "KMail dabar pastatytas ant Akonadi Asmeninės informacijos tvarkymo sistemos, "
 "kuri duoda daug įvairių pakeitimų."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Tikrinti el. paštą (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Patobulinta paieška"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Palaikoma pastabų (anotacijų) pridėjimas laikams"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Mažiau GNS strigimų, pašto tikrinimas vyksta fone"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG palaikymas"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "Tikrinti rašybą prieš siunčiant"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE elektroninio pašto programa"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "Gaunamos aplanko savybės"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Prašome palaukti"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "Dirbti neprisijungus"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -4987,7 +5013,7 @@
 "neprisijungęs. Spauskite <a href=\"kmail:goOnline\">čia</a> norėdami "
 "prisijungti . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5001,22 +5027,22 @@
 "neprisijungęs. Spauskite <a href=\"kmail:goResourceOnline\">čia</a> norėdami "
 "prisijungti . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontaktas sėkmingai pakeistas"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nauji laiškai aplanke"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Neskaitytų laiškų nėra"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5041,8 +5067,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5135,17 +5161,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5192,27 +5218,27 @@
 msgid "All"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5239,7 +5265,7 @@
 msgid "&Reply"
 msgstr "At&sakyti"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "A&tsakyti..."
@@ -5249,12 +5275,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Atsakyti &autoriui..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Atsakyti &visiems..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Atsakyti pašto są&rašui..."
@@ -5285,7 +5311,7 @@
 msgid "&Edit As New"
 msgstr "R&edaguoti laišką"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5481,45 +5507,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Rasti laiškus"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Ieškoti"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Laiško tekste..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "K&aip priedą..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Įrašyti priedus..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Išvalyti pažymėjimą"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Šokti į originalų aplanką"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5528,68 +5554,68 @@
 msgstr[2] "%1 atitikmenų"
 msgstr[3] "%1 atitikmuo"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Naujausia paieška"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Ieškoma..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Nepavyksta gauti paieškos rezultatų. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Paieška nepavyko."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Paieška baigta."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Paieška sustabdyta."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5599,7 +5625,7 @@
 "Yra problemų pervadinant paieškos aplanką. Dažniausia to problema yra kito "
 "paieškos aplanko buvimas tuo pačiu pavadinimu. Klaida gražino „%1“."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5608,7 +5634,7 @@
 msgstr[2] "Kopijuoti %1 laiškų"
 msgstr[3] "Kopijuoti %1 laišką"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5617,7 +5643,7 @@
 msgstr[2] "Iškirpti %1 laiškų"
 msgstr[3] "Iškirpti %1 laišką"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5745,7 +5771,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5753,7 +5779,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5761,27 +5787,27 @@
 msgstr "Šis įrašas naudojamas nustatant, ar turi būti rodoma KMail įžanga."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 #| msgid "Show folder quick search field"
 msgid "Show folder quick search line edit"
 msgstr "Rodyti aplankų greitosios paieškos lauką"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Perspėti, jei gavėjų skaičius yra daugiau nei:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5790,19 +5816,19 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Tikrinti rašybą prieš siunčiant"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automatiškai prašyti &pranešimo apie laiško pristatymą"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5819,13 +5845,13 @@
 "pranešimo</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Automatinio išsaugojimo intervalas:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5837,151 +5863,151 @@
 "automatinį išsaugojimą nustatydami reikšmę „0“."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Neseniai naudotų koduočių sąrašas"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Tapatybės dialogo dydis (tik vidiniam naudojimui)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Paieškos lango plotis (tik vidiniam naudojimui)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Paieškos lango aukštis (tik vidiniam naudojimui)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "KMail konfigūravimo lango plotis (tik vidiniam naudojimui)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "KMail konfigūravimo lango aukštis (tik vidiniam naudojimui)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Laiškų peržiūros langas"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Nerodyti laiškų peržiūros polangio"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Rodyti laiškų peržiūros polangį žemiau laiškų sąrašo"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Rodyti laiškų peržiūros polangį šalia laiškų sąrašo"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Aplankų sąrašas"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Ilgas aplankų sąrašas"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Trumpas aplankų sąrašas"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Laiško šablonas naujam laiškui"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Laiško šablonas atsakymui"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Laiško šablonas atsakymui visiems"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Laiško šablonas persiuntimui"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Citavimo rašmenys"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Nustato naudojamas taisykles, kai rodomos taisyklės"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5989,7 +6015,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5997,7 +6023,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6005,7 +6031,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6013,7 +6039,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6021,7 +6047,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6290,7 +6316,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6611,10 +6637,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Tikrinti paštą iš"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7240,6 +7265,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Iš naujo įgalinti visus „Daugiau manęs neklausti“ perspėjimus"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7302,6 +7337,14 @@
 msgid "Zoom: %1%"
 msgstr "Mastelis"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Tekstų fragmentai"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Tikrinti paštą iš"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Aplanko vardas ir dydis kada uždaryti kvotą"
 
@@ -7827,7 +7870,7 @@
 #~ msgstr "Rėmelis apie perspėjimą, rodomą prieš HTML laišką"
 
 #~ msgid "Plugins Settings"
-#~ msgstr "Papildinio nustatymai"
+#~ msgstr "Papildinio nuostatos"
 
 #, fuzzy
 #~| msgid "GnuPG support"
diff -Nru kmail-19.04.3/po/lt/ktnef.po kmail-19.12.3/po/lt/ktnef.po
--- kmail-19.04.3/po/lt/ktnef.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/lt/ktnef.po	2020-03-03 00:34:08.000000000 +0000
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2012-04-13 04:27+0200\n"
 "Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"Language-Team: lt\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru kmail-19.04.3/po/lv/akonadi_archivemail_agent.po kmail-19.12.3/po/lv/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/lv/akonadi_archivemail_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/lv/akonadi_archivemail_agent.po	2020-03-03 00:34:08.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2012-07-01 15:43+0300\n"
 "Last-Translator: Einars Sprugis <einars8@gmail.com>\n"
 "Language-Team: Latvian <locale@laka.lv>\n"
@@ -179,12 +179,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr "Šajai mapei nevar pievienot otru arhīvu. Labojiet jau esošo."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Sākt arhivēt %1"
diff -Nru kmail-19.04.3/po/lv/kmail.po kmail-19.12.3/po/lv/kmail.po
--- kmail-19.04.3/po/lv/kmail.po	2019-07-09 00:20:24.000000000 +0000
+++ kmail-19.12.3/po/lv/kmail.po	2020-03-03 00:34:08.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2010-01-13 18:47+0200\n"
 "Last-Translator: Viesturs Zarins <viesturs.zarins@mii.lu.lv>\n"
 "Language-Team: Latvian <locale@laka.lv>\n"
@@ -202,8 +202,8 @@
 msgstr "vairākas šifrēšanas atslēgas vienai adresei"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -319,28 +319,28 @@
 msgstr ""
 "KMail nespēja noteikt šīs mapes vēstkopu. Lūdzu pašrocīgi aizpildiet adreses."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Izmantots:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, fuzzy, kde-format
 #| msgid "Status: "
 msgid "Status:"
 msgstr "Statuss: "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 %3 used"
 msgid "%1 of %2 used"
@@ -365,7 +365,7 @@
 "piekārtot šai mapei.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Sagataves"
@@ -376,109 +376,109 @@
 msgstr "&Lietot pielāgotas vēstuļu sagataves šai mapei"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopēt globālās sagataves"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Skats"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Izmantot pielāgotas &ikonas"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normāla:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Nelasīta:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Rādīt Sūtītājs/Saņēmējs kolonu vēstuļu sarakstā"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Rādīt kolonu:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Noklusētā"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Sūtītājs"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Saņēmējs"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Vēstuļu saraksts"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Lietot noklusēto agregēšanu"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregēšana"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Lietot noklusēto tēmu"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tēma"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "Nedrošs vēstules formāts"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "Dot priekšroku HTML"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "Dot priekšroku &HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -490,104 +490,109 @@
 msgid "Retrieval Options"
 msgstr "Ielādē anotācijas"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Identitāte"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Saņemšana"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Sūtīšana"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Nosūtīšanas konti (pievienojiet vismaz vienu):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Kopīgas opcijas"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Ap&stiprināt pirms sūtšanas"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Automātiski nekad"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Pašrocīgi pārbaudot pastu"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Visās pasta pārbaudēs"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Sūtīt uzreiz"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Sūtīt vēlāk"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Nosūtīt izejošās &mapē esošās vēstules."
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Nokl&usētā sūtīšanas metode:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Pievienot kontu"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu Foreground color setting"
 #| msgid "Custom..."
 msgid "Custom Account..."
 msgstr "Pielāgota..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -597,33 +602,33 @@
 "Neizdevās palaist sertifikātu pārvaldnieku. Lūdzu pārbaudiet jūsu "
 "instalāciju."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start account wizard"
 msgstr "Neizdevās izveidot kontu"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, fuzzy, kde-format
 #| msgid "Include in manual mail chec&k"
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Iekļaut &pašrocīgā pasta pārbaudē"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Check mail on startup"
 msgstr "Pārbaudīt pastu, sā&kot darbu"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -681,7 +686,7 @@
 msgid "Fixed Width Font"
 msgstr "Fiksēta platuma fonts"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Vēstuļu rakstītājs"
@@ -991,94 +996,94 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Pamata"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standarta sagataves"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Pielāgotas sagataves"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Temats"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Rakstzīmju kopa"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Galvenes"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Pielikumi"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Paraksts"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 #| msgid "Insert signature above quoted text"
 msgid "Insert the signature above any quoted text"
 msgstr "Ievietot parakstu virs citētā teksta"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "F&ormāts:"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1086,7 +1091,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1094,17 +1099,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1112,7 +1117,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1120,36 +1125,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Iekļauti"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "kā pielikumu"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Default Forwarding Type:"
 msgid "Default forwarding type:"
 msgstr "Noklusētais pārsūtīšanas veids:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "All Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Visi saņēmēji"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1157,18 +1162,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Brīdināt, ja ir norādīti pārāk daudz saņēmēji"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Maksimālais saņēmēja redaktora rindu skaits."
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1179,52 +1184,52 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Bez autosaglabāšanas"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "Nesenās adreses"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Konfigurēt pabeigšanas kārtību..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Bez autosaglabāšanas"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Bez autosaglabāšanas"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1234,19 +1239,19 @@
 msgstr[1] " min"
 msgstr[2] " min"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "Automātiski pirprasīt &vēstuļu saņemšanas apstiprinājumus"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Atbild&es temata prefiksi"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1255,59 +1260,59 @@
 "Atpazīt jebkuru šādu prefiksu virkni\n"
 "(ieraksti ir reģistrjūtīgas regulāras izteiksmes):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "P&ievienot..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Aiz&vākt"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Red&iģēt..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Ievadiet jaunu atbildes prefiksu:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Pār&sūtītas temata prefiksi"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Pievienot..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Aiz&vākt"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Rediģēt..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Ievadiet jaunu pārsūtīšanas prefiksu:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1317,90 +1322,90 @@
 "meklēta rakstzīmju kopa, kas satur visas nepieciešamās rakstzīmes."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Rediģēt..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Ievadiet rakstzīmju kopu:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Paturēt sākotnējo rakstzīmju kopu, atbildot vai pārsūtot vēstuli (ja "
 "iespējams)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Šī rakstzīmju kopa netiek atbalstīta."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Izmantot pielāgotu vēstules ID sufiksu"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Pielāgots vēstules &ID sufikss:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definēt pielāgotus mime galvenes laukus:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nosaukums"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Vērtība"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "Jau&na"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nosaukums:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Vērtība:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid signature."
 msgid "Invalid header"
 msgstr "Nederīgs paraksts"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Ar Outlook savietojami pielikumu nosaukumi"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1409,41 +1414,41 @@
 "Ieslēdziet šo, lai Outlook(tm) saprastu pielikumu nosaukumus, kas satur "
 "rakstzīmes ārpus latīņu alfabēta."
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Ieslēgt trūkstošu &pielikumu noteikšanu"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Atpazīt šos atslēgas vārdus, kā failu pievienošanas pazīmi:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Ievadiet jaunu atslēgas vārdu:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Ir pielikums"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, fuzzy, kde-format
 #| msgid " MB"
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " MB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "Žurnāla izmēra ierobežojums:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1537,7 +1542,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Vēstuļu rakstītājs"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1659,7 +1664,7 @@
 msgid "Archive Folder"
 msgstr "Arhivēt mapi"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgctxt "Start of the filename for a mail archive file"
 #| msgid "Archive"
@@ -1730,7 +1735,7 @@
 msgid "Notification"
 msgstr "Jaunu vēstuļu paziņojums"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgctxt "filename for the %1-th unnamed attachment"
 #| msgid "attachment.%1"
@@ -1740,13 +1745,13 @@
 msgstr[1] "pielikums.%1"
 msgstr[2] "pielikums.%1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgid "Hide attachment list."
 msgid "Hide attachment list"
 msgstr "Slēpt pielikumu sarakstu."
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "Hide attachment list."
 msgid "Show attachment list"
@@ -1765,393 +1770,393 @@
 msgid "Encoding"
 msgstr "Kodējums"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, fuzzy, kde-format
 #| msgid "Set subject of message"
 msgid "Set a subject for this message"
 msgstr "Uzstādīt vēstules tematu"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitāte:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Vārdnīca:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "No&sūtītā pasta mape:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Pasta transports:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&No:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Temats:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Sūtīt pastu"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Sūtīt pastu ar"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Sūtīt"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Sūtīt vē&lāk"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Sūtīt vē&lāk ar"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, fuzzy, kde-format
 #| msgid "Queue"
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Ierindot"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Saglabāt kā &melnrakstu"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "Meklēt visās l&okālajās mapēs"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Saglabāt kā saga&tavi"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 #| msgid "Save as &Template"
 msgid "Save email in Template folder"
 msgstr "Saglabāt kā saga&tavi"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "Saglabāt failā"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, fuzzy, kde-format
 #| msgid "&Insert File..."
 msgid "&Insert Text File..."
 msgstr "&Ievietot failu..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, fuzzy, kde-format
 #| msgid "&Insert File Recent"
 msgid "&Insert Recent Text File"
 msgstr "&Ievietot nesenu failu"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adrešu grāmata"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Atvērt adrešu grāmatu"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Jauns vēstules rakstītājs"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "&Izvēlieties saņēmējus..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Saglabāt a&dresātu sarakstu..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Pievienot kā &pielikumu"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Notīrīt tukšumus"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Lietot &fiksētu fontu"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Steidzama"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Pieprasīt saņemšanas paziņojumu"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Pieprasīt saņemšanas paziņojumu"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Rindu aplaušana"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Fragmenti"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automātiska  pareizrakstības parbaude"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Rich Text Editing"
 msgstr "Zaudēt formatējumu"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Visi lauki"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitāte"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "Vār&dnīca"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "No&sūtītā pasta mape:"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Pasta transports:"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&No"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Temats"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Pievienot pa&rakstu beigās"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Pievienot parakstu &sākumā"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Pievienot parakstu pie &kursora "
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Pareiz&rakstība..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Pareizrakstība"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Ši&frēt vēstuli"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Šifrēt"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Parak&stīt vēstuli"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Parakstīt"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Kriptogrāfiskais vēstules formāts"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Meklēt vēstules..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Konfigurēt KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Rinda: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolona: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Pareizrakstība: ieslēgta"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Pareizrakstība: izslēgta"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "&Saglabāt kā sagatavi"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Saglabāt kā melnrakstu"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2160,7 +2165,7 @@
 "Saglabā šo vēstuli Sagatavju mapē. To tad varēs vēlāk izmantot jaunu vēstuļu "
 "rakstīšanai."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2168,62 +2173,62 @@
 msgstr ""
 "Saglabā šo vēstuli Melnrakstu mapē. To tad varēs vēlāk pielabot un nosūtīt."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Vai vēlaties saglabāt šo vēstuli vēlākai turpināšanai vai izmest?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Aizvērt vēstuļu rakstītāju"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Autosave Message Failed"
 msgstr "Neizdevās automātiski saglabāt"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Sending messages"
 msgid "Sending Message Failed"
 msgstr "Sūta vēstules"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Ievietot faila saturu"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Pievienot kā &iekļautu attēlu."
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Pievienot kā &pielikumu"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Pielikuma nosaukums:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid signature."
 msgid "Invalid Attachment Name"
 msgstr "Nederīgs paraksts"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Quoted Message Text"
 msgid "Add URL into Message"
@@ -2232,7 +2237,7 @@
 msgstr[1] "Citēts vēstules teksts"
 msgstr[2] "Citēts vēstules teksts"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, fuzzy, kde-format
 #| msgid "Add as &Attachment"
 msgid "Add File as &Attachment"
@@ -2241,17 +2246,17 @@
 msgstr[1] "Pievienot kā &pielikumu"
 msgstr[2] "Pievienot kā &pielikumu"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Ielīmēt kā pielikumu"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "nenosaukts"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2263,12 +2268,12 @@
 "identitāte nesatur tam piemērotu (OpenPGP vai S/MIME) šifrēšanas atslēgu.</"
 "p><p>Lūdzu norādiet šai identitātei lietojamo atslēgu(as).</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Nav norādīta šifrēšanas atslēga"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2279,12 +2284,12 @@
 "(OpenPGP vai S/MIME) parakstīšanas atslēga.</p><p>Lūdzu norādiet atslēgu "
 "identitātes konfigurācijā.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nav norādīta parakstīšanas atslēga"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2294,7 +2299,7 @@
 "Jums jāievada e-pasta adrese No: laukā. Jums vajadzētu norādīt e-pasta "
 "adreses visām savām identitātēm, lai nav katreiz tā jāievada šeit."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2305,37 +2310,37 @@
 msgstr ""
 "Jums jānorāda vismaz viens saņēmējs, vai nu Kam: laukā vai CC, vai BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Kam: lauks ir tukšs. Vai sūtīt šo vēstuli?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Nav norādīts Kam:"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Jūs nenorādījāt tēmu. Vai sūtīt tāpat?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nav norādīts temats"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&Sūtīt kā ir"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Norādīt tēmu"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2346,22 +2351,22 @@
 msgstr ""
 "Jums jānorāda vismaz viens saņēmējs, vai nu Kam: laukā vai CC, vai BCC."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Grasās sūtīt pastu..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Nosūtīšanas apstiprināšana"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Sūtīt tagad"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2369,66 +2374,66 @@
 msgstr ""
 "Jūš mēģināt nosūtīt vēstuli vairāk nekā %1 saņēmējiem. Vai tiešām nosūtīt?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Pārāk daudz saņēmēju"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Sūtīt kā ir"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "R&ediģēt saņēmējus"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "Izslēdzot HTML režīmu, tiks pazaudēta visa formatēšana. Vai tiešām?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Vai zaudēt formatējumu?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Zaudēt formatējumu"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "Vēstuli kā vienkāršu tekstu"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2436,7 +2441,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2523,25 +2528,25 @@
 msgid "External editor was started."
 msgstr "Ārējs Redaktors"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2568,11 +2573,6 @@
 msgid "Message will not be encrypted"
 msgstr "Vēstule netiks šifrēta"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Teksta fragmenti"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2621,31 +2621,31 @@
 msgid "Cannot move messages."
 msgstr "Kopēt vai pārvietot vēstules uz %1"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Unable to create subfolder for folder '%1'."
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Neizdevās izveidot apakšmapi mapei '%1'."
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "Nav norādīta mape"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Unable to create subfolder for folder '%1'."
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Neizdevās izveidot apakšmapi mapei '%1'."
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Unable to retrieve a message for folder '%1'."
 msgid "Unable to return list of folders."
 msgstr "Neizdevās iegūt vēstuli no mapes '%1'."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgctxt ""
 #| "@info:tooltip Formats to something like 'Messages received Yesterday'"
@@ -2692,50 +2692,50 @@
 msgid "&Existing identities:"
 msgstr "&Esošās identitātes:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Kļūda pārdēvējot mapi %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Ievadiet jaunu atslēgas vārdu:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Rediģēt identitāti"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Pamata"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Jūsu vārds:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2746,12 +2746,12 @@
 "nosūtīto vēstuļu galvenē.</p><p>Ja atstāsiet tukšu, jūsu īstais vārds "
 "neparādīsiesm būs tikai e-pasta adrese.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zācija:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2762,12 +2762,12 @@
 "parādīsies nosūtīto vēstuļu galvenē.</p><p>Droši varat šo atstāt tukšu.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-pasta adrese:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Email address</h3><p>This field should have your full email "
@@ -2784,13 +2784,13 @@
 "p><p>Ja atstāsiet tukšu, vai ievadīsiet nepareizi, nevarēsiet saņemt "
 "atbildes vēstules.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, fuzzy, kde-format
 #| msgid "&Email address:"
 msgid "Email a&liases:"
 msgstr "&E-pasta adrese:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2801,12 +2801,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kriptogrāfija"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2827,12 +2827,12 @@
 "pasta lietošanai.</p><p>Vairāk par atslēgām varat uzzināt <a>http://www."
 "gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP parakstīšanas atslēga:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2856,12 +2856,12 @@
 "lietošanai.</p><p>Vairāk par atslēgām varat uzzināt <a>http://www.gnupg.org</"
 "a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP šfirēšanas atslēga:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2874,12 +2874,12 @@
 "parakstīt jūsu vēstules ar S/MIME, tas netraucēs ikdienas pasta lietošanai.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME parakstīšanas sertifikāts:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2893,42 +2893,42 @@
 "iespējai.</p><p>Varat atstāt šo tukšu, bet tad KMail nevarēs parakstīt jūsu "
 "vēstules, tas netraucēs ikdienas pasta lietošanai.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME šifrēšanas sertifikāts:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred crypto message format:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Vēlamais vēstuļu šifrēšanas formāts:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "&Automātiski parakstīt vēstules"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Automātiski ši&frēt vēstules, kad vien iespējams"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Paplašināti"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "A&tbildēt-uz edrese:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2944,13 +2944,13 @@
 "<tt>No:</tt> laukā ir norādīta jūsu adrese, bet atbildes tiek sūtītas uz "
 "gupas adresi.</p><p>Ja šaubāties, atstājiet tukšu.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "&BCC adreses:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2974,12 +2974,12 @@
 "vēstules kopiju citam jūsu kontam.</p><p>Lai norādītu vairākas adreses, "
 "atdaliet tās ar komatiem.</p><p>Ja šaubāties, atstājiet tukšu.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC adreses:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2995,61 +2995,61 @@
 "vēstules kopiju citam jūsu kontam.</p><p>Lai norādītu vairākas adreses, "
 "atdaliet tās ar komatiem.</p><p>Ja šaubāties, atstājiet tukšu.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Vārdnīca:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Nosūtītā pasta &mape:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Me&lnrakstu mape:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Sagatavju mape:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 #| msgid "Configure Account"
 msgid "Outgoing Account:"
 msgstr "Konfigurēt kontu"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "Pievienot vēstulei 'galveni'"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "Pārdēvēt..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr ""
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Noklusē&tais domēns:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Noklusē&tais domēns:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3058,34 +3058,34 @@
 "<qt><p>Noklusētais domēns tiek izmantots e-pasta adrešu automātiskai "
 "pabeigšanai, ja adresē norādīts tikai lietotāja vārds.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Lietot pielāgotas vēstuļu sagataves šai identitātei"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Paraksts"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Attēls"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Email Alias \"%1\""
 msgstr "Nederīga e-pasta adrese"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Nederīga e-pasta adrese"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3098,7 +3098,7 @@
 "Tas var izraisīt brīdinājuma paziņojumus saņēmējam mēģinot pārbaudīt šādu "
 "parakstu."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3107,7 +3107,7 @@
 "Viena no norādītajām OpenPGP parakstīšanas atslēgām nesatur lietotāja ID ar "
 "konfigurēto e-pasta adresi kā tās identitāti (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3120,7 +3120,7 @@
 "Tas var izraisīt brīdinājuma paziņojumus saņēmējam mēģinot pārbaudīt šādu "
 "parakstu."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3129,22 +3129,22 @@
 "Viens no norādītajiem S/MIME šifrēšanas sertifikātiem nesatur lietotāja ID "
 "ar konfigurēto e-pasta adresi kā tās identitāti (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Atslēgā/Sertifikātā nav arasta e-pasta adrese"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Paraksta fails nav derīgs"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Rediģēt identitāti \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3156,7 +3156,7 @@
 "Pielāgotā identitātes \"%1\" melnrakstu mape (vairs) nepastāv, tāpēc tiks "
 "izmantota noklusētā melnrakstu mape."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Rediģēt..."
@@ -3194,6 +3194,21 @@
 msgid "We cannot delete vCard file."
 msgstr "Neizdevās sinhronizēt maildir mapi."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgctxt "@info"
+#| msgid "Do you really want to execute <filename>%1</filename>?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Vai tiešām gribat izpildīt <filename>%1</filename>?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Nosūtīšanas apstiprināšana"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3359,7 +3374,7 @@
 "Piemēri ir atrodami <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://"
 "www.xs4all.nl/~ace/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3395,7 +3410,7 @@
 msgstr[1] "Adresātu saraksts \"%1\" ir tukšs, to nevar izmantot."
 msgstr[2] "Adresātu saraksts \"%1\" ir tukšs, to nevar izmantot."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Pievienot adrešu grāmatai"
@@ -3406,24 +3421,24 @@
 msgid "Contact created successfully"
 msgstr "Vēstules veiksmīgi izdzēstas."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Failed to parse vCard."
 msgid "Failed to store contact"
 msgstr "Kļūda analizējot vCard."
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Vai jūs tiešām vēlaties iztukšot miskastes mapi?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Archive Folder"
 msgid "Attach Folder"
@@ -3644,7 +3659,7 @@
 msgstr "M&ape"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3652,7 +3667,7 @@
 msgstr "Pielietot visus &filtrus"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current Folder & All Subfolders"
@@ -3679,7 +3694,7 @@
 msgstr "Pā&rsūtīt"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Pielietot filtru"
@@ -3704,7 +3719,7 @@
 msgstr "&Palīdzība"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Galvenā rīkjosla "
@@ -3760,12 +3775,12 @@
 msgid "The file does not contain a message."
 msgstr "Šis fails nesatur vēstuli"
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Šis fails satur vairākas vēstules. Tiek rādīta tikai pirmā vēstule."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3774,32 +3789,32 @@
 "Vai vēlaties pārsūtīt izvēlētās vēstules kā pielikumus vienai vēstulei (kā "
 "MIME krājums) vai kā individuālas vēstules?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Sūtīt krājumu"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Sūtīt individuāli"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrē vēstules"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrē vēstules %1 no %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Pārvieto vēstules"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Dzēš vēstules"
@@ -3828,29 +3843,29 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail ir pārslēgta nesaistes režīmā; visas tīkla darbības ir atliktas"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Grasās sūtīt pastu..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail ir pārslēgta tiešsaistes režīmā; visas tīkla darbības atsāktas"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3858,52 +3873,52 @@
 "connection is detected"
 msgstr "KMail ir pārslēgta tiešsaistes režīmā; visas tīkla darbības atsāktas"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail pašlaik atrodas nesaistes režīmā. Ko jūs vēlaties darīt tālāk?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Tiešsaisne/Bezsaiste"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Strādāt tiešsaitē"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Strādāt nesaistē"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
 msgstr "KMail ir pārslēgta tiešsaistes režīmā; visas tīkla darbības atsāktas"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "KMail ir pārslēgta nesaistes režīmā; visas tīkla darbības ir atliktas"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Opening Autosave File Failed"
 msgstr "Neizdevās automātiski saglabāt"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3914,7 +3929,7 @@
 msgstr[2] ""
 "Šīs %1 identitāšu ir izmainītas, lai izmantotu noklusēto transportu:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3923,44 +3938,46 @@
 msgstr[1] "Šīs %1 identitātes ir izmainītas, lai izmantotu mainīto transportu:"
 msgstr[2] "Šīs %1 identitāšu ir izmainītas, lai izmantotu mainīto transportu:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Sūta vēstules"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, fuzzy, kde-format
 #| msgid "Initiating sender process..."
 msgid "Initiating sending process..."
 msgstr "Sāk sūtīšanas procesu..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3970,12 +3987,12 @@
 "Neizdevās palaist sertifikātu pārvaldnieku. Lūdzu pārbaudiet savu "
 "instalāciju."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail kļūda"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -3985,29 +4002,29 @@
 "Neizdevās palaist sertifikātu pārvaldnieku. Lūdzu pārbaudiet jūsu "
 "instalāciju."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start import wizard"
 msgstr "Neizdevās izveidot kontu"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Neizdevās palaist sertifikātu pārvaldnieku. Lūdzu pārbaudiet jūsu "
 "instalāciju."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Neizdevās izveidot kontu"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -4017,18 +4034,18 @@
 "Neizdevās palaist sertifikātu pārvaldnieku. Lūdzu pārbaudiet jūsu "
 "instalāciju."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to create account"
 msgid "Unable to start ImportWizard"
 msgstr "Neizdevās izveidot kontu"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
@@ -4036,52 +4053,52 @@
 "Neizdevās palaist sertifikātu pārvaldnieku. Lūdzu pārbaudiet jūsu "
 "instalāciju."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Nav temata"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(nav sagatavju)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Šai mapei nav novecošanas iesatījumu"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Vai tiešām gribat izņemt veco no mapes <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Izņemt veco no mapes"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Izņemt v&eco"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Iztukšot miskasti"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Pārvietot uz miskasti"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Vai jūs tiešām vēlaties iztukšot miskastes mapi?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4090,27 +4107,27 @@
 "<qt>Vai jūs tiešām gribat pārvietot visas vēstules no mapes<b>%1</b> uz "
 "miskasti?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Visas vēstules pārvietas uz miskasti"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Vai tiešām vēlaties izņemt vecās vēstules?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Izņemt vecās vēstules?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Izņemt"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4121,17 +4138,17 @@
 "sūtītājiem un palielina iespēju ka jūsu sistēma tiks uzlausta izmantojot "
 "kādu esošu vai nākotnes drošības ievainojamību."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Drošības brīdinājums"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Ielādēt ārējās saites"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4149,411 +4166,411 @@
 "<qt>Vai tiešām vēlaties dzēst izvēlētās %1 vēstuļu?<br />Pēc dzēšanas tās "
 "nebūs iespējams atjaunot.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Izdzēst vēstules"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Izdēst vēstuli"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Pārvieto vēstules..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Dzēš vēstules..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Vēstules veiksmīgi izdzēstas."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Vēstules veiksmīgi pārvietotas."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Neizdevās izdzēst vēstules."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Vēstuļu dzēšana atcelta."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Neizdevās pārvietot vēstules."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Vēstuļu pārvietošana atcelta."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Pārvietot vēstules uz mapi"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopē vēstules..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Vēstules veiksmīgi nokopētas."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Neizdevās nokopēt vēstules."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Vēstuļu kopēšana atcelta."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopēt vēstules uz mapi"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Pārvieto vēstules uz miskasti..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Pārvieto vēstules uz miskasti..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Vēstules veiksmīgi pārvietotas uz miskasti"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Vēstules veiksmīgi pārvietotas uz miskasti"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Neizdevās pārvietot vēstules uz miskasti."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Neizdevās pārvietot vēstules uz miskasti."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Vēstuļu pārvietošana uz miskasti atcelta."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Vēstuļu pārvietošana uz miskasti atcelta."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Pāriet uz mapi"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Saglabāt &kā..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Izņemt &veco no visām mapēm"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Pārbaudīt pastu"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Pārbaudīt pastu no"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Pārbaudīt pastu"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "No&sūtīt ierindotās vēstules"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Tiešaistes satuss (nezināms)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Nosūtīt ierindotās vēstules ar"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Sertifikātu pārvaldnieks"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages"
 msgid "&Import Messages..."
 msgstr "&Importēt vēstules"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Atkļū&dot Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filtru žurnā&la skatītājs..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Rediģēt \"Neesmu birojā\" atbildes..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "Ko&nfigurēt paziņojumus..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "Dzēš vēstules..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Meklēt vēstules..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Dzēst"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Pārviet&ot pavedienu uz miskasti"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Pārvietot pavedienu uz miskasti"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Dzēst pa&vedienu"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Meklēt vēstules..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Izvēlēties &viesas vēstules"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Vēst&kopu pārvaldība..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Piešķirt īsceļu..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Nove&cošanas iestatījumi"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arhivēt mapi..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Ielādēt ā&rējās saites"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Message To..."
 msgstr "Jauna vēstule..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Move Message To..."
 msgstr "Jauna vēstule..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Jau&na vēstule..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Jauna"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Vēstule no saga&taves"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Java vēstule vēstk&opai..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Izveidot f&iltru"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtru pēc &temata..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "&Filtru pēc sūtītāja..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Fil&tru pēc saņēmēja..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Fil&tru pēc saņēmēja..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Atzīmē&t pavedienu"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Atzīmēt pavedienu kā &lasītu"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Atzīmēt visas vēstules izvēlētajā pavedienā kā lasītas"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Atzīmēt pavedienu kā nelastīt&u"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Atzīmēt visas vēstules izvēlētajā pavedienā kā nelasītas"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Atzīmēt paved&ienu kā svarīgu"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Noņemt pavedienam svarīgs &iezīmi"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Atzīmēt pavedienu kā d&arāmu"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Noņemt pavedienam &darba iezīmi"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Vērot pavedienu"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorēt pavedienu"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Saglabā&t pielikumus..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Copy Decrypted To..."
 msgstr "Jauna vēstule..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Pielietot visus &filtrus"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4561,13 +4578,13 @@
 msgid "&Expand Thread / Group"
 msgstr "Izvērst pav&edienu"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "Izvērst aktīvo pavedienu"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4575,123 +4592,123 @@
 msgid "&Collapse Thread / Group"
 msgstr "&Sakļaut pavedienu"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "Sakļaut aktīvo pavedienu"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Izvērst visus &pavedienus"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Izvēst visus aktīvās mapes pavedienus"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Sa&kļaut visus pavedienus"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Sakļaut visus aktīvās mapes pavedienus"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Pa&rādīt vēstuli"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Nākamā vēstule"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Doties uz nākamo vēstuli"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Nākamā ne&lasītā vēstule"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Nākamā"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Doties uz nākamo nelasīto vēstuli"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Ie&priekšējā vēstule"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Doties uz iepriekšējo vēstuli"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Iepriekšējā nelasītā vēstule"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Iepriekšējā"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Doties uz iepriekšējo nelasīto vēstuli"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Nākamā nelasītā &mape"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Doties uz nākamo mapi ar nelasītām vēstulēm"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Iepriekšējā nelasītā m&ape"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Doties uz iepriekšējo mapi ar nelasītām vēstulēm"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Nākamais nelasītais &teksts"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Doties uz nākamo nelasīto tekstu"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4700,235 +4717,241 @@
 "Ritina uz priekšu aktīvo vēstuli. Kad sasniegtas tās beigas, dodas uz nākamo "
 "nelasīto vēstuli."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Konfigurēt &filtrus..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Pārvaldīt &Sieve skriptus..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Pievienot kontu"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Ievads KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Parāda KMail ievada lapu"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Ko&nfigurēt paziņojumus..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Konfigurēt KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Novecošana..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Pievienot iecienīto mapi..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Servera puses pieraksts..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Pielietot visus &filtrus"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "&Konfigurēt KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "Open Address Book"
 msgid "New AddressBook Contact..."
 msgstr "Atvērt adrešu grāmatu"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopēt vēstuli uz mapi"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Pāriet uz mapi..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Pārtraukt aktīvo darbību"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Pāriet uz nākamo mapi"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Pāriet uz iepriekšējo mapi"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Izvēlēties atvērto mapi"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "Pāriet uz nākamo mapi"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "Pāriet uz nākamo mapi"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Pāriet uz nākamo vēstuli"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Pāriet uz iepriekšējo vēstuli"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "Izvēlēties &viesas vēstules"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "Izvēlēties &viesas vēstules"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Izvēlēties aktīvo vēstuli"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Fokusēties uz ātro meklēšanu"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Paplašināt izvēli uz iepriekšējo vēstuli"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Paplašināt izvēli uz nākamo vēstuli"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Pārvietot vēstuli uz mapi"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Use message indicator"
 msgid "Use Less Bandwidth"
 msgstr "Lietot vēstuļu ziņotāju"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "Ie&statījumi"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "Identitātes nosaukums"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Pievienot iecienīto mapi"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Iztukšot &miskasti"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Pārvietot visas vēstules uz &miskasti"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Dzēst meklēšanu"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Rediģēt skriptu..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtrs %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Startē..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4939,12 +4962,12 @@
 "palielina iespēju ka jūsu sistēma tiks uzlausta izmantojot kādu esošu vai "
 "nākotnes drošības ievainojamību."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Izmantot HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4954,195 +4977,195 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "&Atcelt"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Startē..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Pārvietot uz &miskasti"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Izmest"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Pārvietot vēstuli uz miskasti"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Copy or Move Messages to %1"
 msgid "Cannot copy item. %1"
 msgstr "Kopēt vai pārvietot vēstules uz %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Jauna vēstule..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Atbildēt..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Pārsūtīt..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Failed to parse vCard."
 msgid "Add to Existing Contact"
 msgstr "Kļūda analizējot vCard."
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Atvērt adrešu grāmatā"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Pievienot saiti grāmatzīmēm"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit With..."
 msgid "Edit contact..."
 msgstr "Rediģēt ar..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Saglabāt saiti kā..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Meklēt vēstulē..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "Saglabāt saiti kā..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Show HTML status bar"
 msgid "Show HTML Format"
 msgstr "Rādīt HTML statusa joslu"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, fuzzy, kde-format
 #| msgid "Set the folder where new messages from this account are put"
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Iestatīt mapi, kurā likt jaunas vēstules no šī konta"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 #| msgid "Load external references from the Internet for this message."
 msgid "Load external reference when mail comes for this contact"
 msgstr "Ielādēt no Interneta šīs vēstules ārējās norādes."
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "Saglabāt saiti kā..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG atbalsts "
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "Ap&stiprināt pirms sūtšanas"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE e-pasta klients"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folderlist"
 msgid "Retrieving Folder Contents"
 msgstr "Ielādē mapju sarakstu"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Lūdzu uzgaidiet"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "Strādāt nesaistē"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5156,7 +5179,7 @@
 "režīmā. Spiediet <a href=\"kmail:goOnline\">šeit</a>, lai pārslēgtos "
 "tiešsaistē . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5170,24 +5193,24 @@
 "režīmā. Spiediet <a href=\"kmail:goOnline\">šeit</a>, lai pārslēgtos "
 "tiešsaistē . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully."
 msgid "Contact modified successfully"
 msgstr "Vēstules veiksmīgi pārvietotas."
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Jaunas vēstules mapēs"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, fuzzy, kde-format
 #| msgid "KMail - There are no unread messages"
 msgid "There are no unread messages"
 msgstr "KMail - Nav neizlasītu vēstuļu"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, fuzzy, kde-format
 #| msgid "Unread messages:"
 msgid "1 unread message"
@@ -5212,8 +5235,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5307,19 +5330,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Kontakti"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5368,28 +5391,28 @@
 msgid "All"
 msgstr "Pilnas"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2009, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2009, KMail izstrādātāji"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5418,7 +5441,7 @@
 msgid "&Reply"
 msgstr "&Atbildēt"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "At&bildēt..."
@@ -5428,12 +5451,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Atbildēt a&utoram..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "&Atbildēt visiem..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Atbildēt &vēstkopai..."
@@ -5465,7 +5488,7 @@
 msgid "&Edit As New"
 msgstr "R&ediģēt vēstuli"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5673,12 +5696,12 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Meklēt vēstules"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, fuzzy, kde-format
 #| msgctxt "@action:button Search for messags"
 #| msgid "&Search"
@@ -5686,35 +5709,35 @@
 msgid "&Search"
 msgstr "&Meklēt"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Iekļauti..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "kā &pielikumu..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Saglabāt pielikumus..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Tīrīt izvēli"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "Pāriet uz mapi"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5722,69 +5745,69 @@
 msgstr[1] "%1 atbilstības"
 msgstr[2] "%1 atbilstību"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Pēdējā meklēšana"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 #| msgid "Could not sync maildir folder."
 msgid "You did not selected a valid folder."
 msgstr "Neizdevās sinhronizēt maildir mapi."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "Startē..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Copy or Move Messages to %1"
 msgid "Cannot get search result. %1"
 msgstr "Kopēt vai pārvietot vēstules uz %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "Meklēšana pārtraukta"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgctxt "@info:status Number of folders for which update is completed."
 #| msgid " completed"
 msgid "Search complete."
 msgstr " pabeigti"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgctxt ""
 #| "@info/plain Displayed grayed-out inside the textbox, verb to search"
@@ -5792,7 +5815,7 @@
 msgid "Search stopped."
 msgstr "Meklēt"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5800,7 +5823,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, fuzzy, kde-format
 #| msgid "Copy Messages"
 msgid "Copy Message"
@@ -5809,7 +5832,7 @@
 msgstr[1] "Kopēt vēstules"
 msgstr[2] "Kopēt vēstules"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, fuzzy, kde-format
 #| msgid "Cut Messages"
 msgid "Cut Message"
@@ -5818,7 +5841,7 @@
 msgstr[1] "Izgriezt vēstules"
 msgstr[2] "Izgriezt vēstules"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Chec&k mail on startup"
 msgid "Checking index status..."
@@ -5948,7 +5971,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5956,7 +5979,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5964,19 +5987,19 @@
 msgstr "Šī vērtība tiek izmantota, lai izlemtu, vai rādīt KMail ievadu."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Rādīt mapju ātrās meklēšanas joslu"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Noklusēti pārsūtīt vēstules iegulti."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Warn if the number of recipients is more than:"
@@ -5984,7 +6007,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5995,20 +6018,20 @@
 "prasīs apstiprinājumu. Šo brīdinājumu var izslēgt."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "Ap&stiprināt pirms sūtšanas"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automātiski pirprasīt &vēstuļu saņemšanas apstiprinājumus"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -6024,13 +6047,13 @@
 "saņemšanas paziņojumu</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Automātiskas saglabāšanas intervāls:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -6042,7 +6065,7 @@
 "rezerves kopijas, šeit ievadot 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -6050,145 +6073,145 @@
 "paneli."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Vēstuļu priekšapskates panelis"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Nerādīt vēstules priekšapskates paneli"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Rādīt vēstules priekšapskates paneli zem vēstuļu saraksta"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Rādīt vēstules priekšapskates paneli blakus vēstuļu sarakstam"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Mapju saraksts"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Garš mapju saraksts"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Īss mapju saraksts"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Sagatave jaunai vēstulei"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Sagatave atbildei"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Sagatave atbildei visiem"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Sagatave pārsūtīšanai"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Citēšanas rakstzīmes"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6196,7 +6219,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6204,7 +6227,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6212,7 +6235,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6220,7 +6243,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6228,7 +6251,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6514,10 +6537,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6888,10 +6948,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Pārbaudīt pastu no"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7569,6 +7628,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Atjaunot visus \"Vairs nevaicāt\" brīdinājumus"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7633,6 +7702,14 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#~ msgid "Text Snippets"
+#~ msgstr "Teksta fragmenti"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Pārbaudīt pastu no"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Mapes nosaukums un izmērs, kad tuvu kvotai"
 
@@ -11194,11 +11271,6 @@
 #~ msgstr "Pārbaudes inter&vāls:"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Identitātes nosaukums"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "&Serveris atbalsta Sieve"
@@ -12890,10 +12962,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "Atver URL..."
 
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "Vai tiešām gribat izpildīt <filename>%1</filename>?"
-
 #~ msgid "Execute"
 #~ msgstr "Izpildīt"
 
diff -Nru kmail-19.04.3/po/mr/akonadi_archivemail_agent.po kmail-19.12.3/po/mr/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/mr/akonadi_archivemail_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/mr/akonadi_archivemail_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2013-03-12 17:54+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
@@ -175,12 +175,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr ""
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/mr/akonadi_mailfilter_agent.po kmail-19.12.3/po/mr/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/mr/akonadi_mailfilter_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/mr/akonadi_mailfilter_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2013-03-12 17:51+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
@@ -22,40 +22,40 @@
 msgid "Filter Log Viewer"
 msgstr ""
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr ""
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
 "data is collected and shown only when logging is turned on. "
 msgstr ""
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr ""
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr ""
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -65,34 +65,34 @@
 "given."
 msgstr ""
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr ""
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr ""
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr ""
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "अमर्यादीत"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -101,70 +101,70 @@
 "until the limit is no longer exceeded. "
 msgstr ""
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
 "\"%2\" is the detailed error description."
 msgstr ""
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr ""
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr ""
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr ""
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr ""
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr ""
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr ""
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr ""
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr ""
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr ""
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "मेल गाळणी नोंद कार्यान्वित"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "तयार"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/mr/kmail.po kmail-19.12.3/po/mr/kmail.po
--- kmail-19.04.3/po/mr/kmail.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/mr/kmail.po	2020-03-03 00:34:08.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2013-04-15 11:18+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
@@ -197,8 +197,8 @@
 msgstr "प्रत्येक पत्त्यासाठी बहुविध संकेतिक लिपीच्या चाचण्या"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "के-मेल"
@@ -304,27 +304,27 @@
 msgstr ""
 "के-मेल ह्या संचयीकेमधील पत्त्यांची यादी पूर्णपणे शोधू शकत नाही. कृपया पत्ते हाताने लिहा."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "कोटा"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "वापर :"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "स्थिती :"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% पूर्ण"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 KiB used"
 msgid "%1 of %2 used"
@@ -347,7 +347,7 @@
 "करा आणि आणि नंतर तुम्ही संचयीकेशी संबंध जोडू इच्छित असलेली कळ/कळ संयोजन दाबा.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "नमूने"
@@ -358,109 +358,109 @@
 msgstr "ह्या संचयीकेत संदेशाची पारंपारिक प्रारूपे वापरा (&U)"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "जागतीक प्रारुपांची नक्कल करा (&C)"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "दृश्य"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "ऐच्छिक चिन्हे वापरा (&I)"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "सामान्य (&N):"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "न वाचलेले (&U):"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "संदेशांच्या यादीत पाठविणारा(प्रेषक)/घेणारा(प्राप्तकर्ता) हे रकाने दाखवा "
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "स्तंभ दर्शवा (&W):"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "मूलभूत"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "पाठवणारा"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "घेणारा"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "संदेश यादी"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "मूलभूत एकीकरण वापरा"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "एकीकरण"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "मूलभूत शैली वापरा"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "शैली"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "New Message To..."
 msgid "Message Default Format"
 msgstr "...  ला नवा संदेश"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "सध्या मजकुरापेक्षा HTML ला प्राधान्य द्या"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "सध्या मजकुरापेक्षा &HTML ला पसंती द्या"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Use Global Settings"
@@ -471,103 +471,108 @@
 msgid "Retrieval Options"
 msgstr "पुनःप्राप्तीचा पर्याय"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "ओळख (&I)"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "घेत आहे"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "पाठवत आहे"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "बाहेर जाणारी खाती(किमान एक तरी वाढवा):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "सामान्य पर्याय"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "पाठविण्यापूर्वी खात्री करा (&B)"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "पाठविण्यापूर्वी वर्णलेखन तपासा"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "स्वयंचलितरित्या कधीही नाही"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "स्वहस्ते मेल तपासताना"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "सर्व मेल तपासताना"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "आता पाठवा"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "नंतर पाठवा"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "संदेश आउटबॉक्स संचयीकेत पाठवा (&M)"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "मूलभूत पाठविण्याची पद्धत (&U):"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "Add Mail Account..."
 msgstr "सूचना/नोंद वाढवा..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "खात्यांची क्रमवारी सानुकूल करा"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -575,30 +580,30 @@
 "properly installed."
 msgstr "खाते(account) विझार्ड चालू करू शकलो नाही. तुमची संचमांडणी/प्रतिस्थापन तपासा."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr " खाते(account) विझार्ड चालू करू शकत नाही"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "स्वहस्ते मेल तपासताना अंतर्भूत करा"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "के-मेल बंद होताना ऑफलाइन करा"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "प्रारंभवेळी मेल तपासा"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -654,7 +659,7 @@
 msgid "Fixed Width Font"
 msgstr "ठराविक रुंदीचे फॉन्ट"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "संपादक"
@@ -965,93 +970,93 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "आम्ही लेबल/खुण निर्माण करू शकत नाही. या नावाचे लेबल/खुण आधीच अस्तित्वात आहे."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "सामान्य"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "प्रमाणित नमूने"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "ऐच्छिक नमूने"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "विषय"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "अक्षर संच"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "हेडर्स"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "अटॅचमेंट"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "स्वयंचलित सुधारणा"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "प्रतिमेच्या आकारात स्वयंचलित बदल करा"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "हस्ताक्षर"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "स्वरूप (&O):"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, only quote the selected text instead of the complete "
@@ -1064,7 +1069,7 @@
 "निवडलेला मजकूर संदेशांच्या खिडकीत असेल तेंव्हा उत्तर पाठवताना पूर्ण संदेशाऐवजी फक्त निवडलेला "
 "मजकूर अवतरण चिन्हात टाका"
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1080,17 +1085,17 @@
 "असेल\n"
 " तरी ही अवतरणाची चिन्हे टाका"
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, only quote the message in the original format it was "
@@ -1103,7 +1108,7 @@
 "उत्तर पाठवतेवेळी मजकूर जसा मिळाला तसाच अवतरण चिन्हात टाका, तसे न केल्यास पूर्वनिर्धारित "
 "तरतुदींमुळे (by default) उत्तर साध्या स्वरूपातील मजकुरात जाईल"
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1111,36 +1116,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "इनलाइन"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "अटॅचमेंट प्रमाणे"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Default Forwarding Type:"
 msgid "Default forwarding type:"
 msgstr "मूलभूत फॉर्वर्डींग प्रकार :"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "&Edit Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "प्राप्तकर्ते संपादन करा (&E)"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1148,18 +1153,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "जर खूपच प्राप्तकर्ते निर्देशित केले असतील तर पूर्वसूचना द्या"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Set the maximum number of recipients for the warning"
 msgstr "प्राप्तकर्त्यांची संख्या   पेक्षा मोठी असेल तर इशारा द्या"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1170,51 +1175,51 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "स्वयंचलित साठवणे नाही"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "पूर्णत्व क्रम संयोजीत करा..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "स्वयंचलित साठवणे नाही"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "स्वयंचलित साठवणे नाही"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1223,19 +1228,19 @@
 msgstr[0] " मिनिट"
 msgstr[1] " मिनिट"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "विनंती आणि संदेशाच्या मांडणीची स्वयंचलीत सूचना (&M)"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "विषयाच्या उपसर्गाना उत्तर पाठवा (&Y)"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1244,59 +1249,59 @@
 "पुढील पूर्वप्रत्ययांचा/उपसर्गांचा अनुक्रम ओळखा\n"
 " (ह्या नोंदी अक्षराच्या प्रकारासंबंधी संवेदनशील असलेले नेहमीचे शब्दप्रयोग/वाक्प्रयोग आहेत);"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "जोडा (&D)..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "काढून टाका (&M)"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "बदला (&I)..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "नवीन उत्तर प्रीफिक्स दाखल करा :"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "फॉर्वर्ड विषय प्रीफिक्स (&W)"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "जोडा..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "काढून टाका (&V)"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "बदला..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "नवीन फॉर्वर्ड प्रीफिक्स दाखल करा :"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1306,88 +1311,88 @@
 "संदेशासाठी ही यादी तपासली."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "बदला (&M)..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "अक्षर संच दाखल करा :"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "उत्तर देताना किंवा पाठविताना (शक्य असेल तर) अक्षरांचा मूळ समूह तसाच ठेवा (&K)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "हा अक्षर संच समर्थीत नाही."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "ऐच्छिक संदेश-आयडी सफिक्स वापरा (&U)"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "ऐच्छिक संदेश-आयडी सफिक्स (&I):"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "इच्छिक माइम(mime) प्रकारची शिर्षलेख/शीर्षक प्रक्षेत्रे निश्चीत करा."
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "नाव"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "मूल्य"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "नवीन (&W)"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "नाव (&N):"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "मूल्य (&V):"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid header"
 msgstr "अवैध इमेल पत्ता"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "आउटलूक-अनुकूल अटॅचमेंट नाव"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1396,40 +1401,40 @@
 "इंग्लिशमध्ये नसलेली अक्षरे/खुणा असलेल्या जोडण्यांच्या नावे आउटलूकला समजण्यासाठी ह्या पर्यायाकडे "
 "वळा"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "न सापडणाऱ्या अटॅचमेंट चा शोध कार्यान्वित करा (&N)"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "फाइल जोडण्याचे उद्दिष्ट दर्शविणारा खालीलपैकी कोणताही महत्वाचा शब्द जाणून घ्या"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "नवीन कळ शब्द दाखल करा :"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "Attachments"
 msgid "Maximum Attachment Size:"
 msgstr "अटॅचमेंट"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "मर्यादा नाही"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1523,7 +1528,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "संपादक"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1642,7 +1647,7 @@
 msgid "Archive Folder"
 msgstr "संग्रह संचयीका"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "Archive"
 msgctxt "@action"
@@ -1709,19 +1714,19 @@
 msgid "Notification"
 msgstr "सूचना"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 अटॅचमेंट (%2)"
 msgstr[1] "%1 अटॅचमेंट (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "अटॅचमेंट यादी लपवा"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "अटॅचमेंट यादी दर्शवा"
@@ -1738,393 +1743,393 @@
 msgid "Encoding"
 msgstr "एन्कोडिंग"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "के-मेल"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "ह्या संदेशाचे स्पेलिंग तपासतेवेळी वापरण्याचा शब्दकोश निवडा"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "ह्या संदेशाची प्रत संग्रहित करण्यासाठी पाठविलेल्या मेलची संचयीका निवडा."
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "हा संदेश पाठविण्यासाठी बहिर्गामी खाते निवडा"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "ह्या संदेशासाठी:\"From:\" ईमेलपत्ता निश्चीत करा "
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "ह्या संदेशासाठी विषय निश्चीत करा"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "ओळख (&I):"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "शब्दकोश (&D):"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "पाठविलेल्या मेल्सची संचयीका (&S)"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "मेल वाहतुक (&M):"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "पासून (&F):"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "विषय (&U):"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "मेल पाठवा (&S)"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "याद्वारे मेल पाठवा (&S)"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "पाठवा"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "नंतर पाठवा (&L)"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "द्वारे नंतर पाठवा (&L)"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "रांगेत ठेवा"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "मसुदा म्हणून संग्रहित करा (&D)"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "ईमेल मसुदा संचयीकेत संग्रहित करा"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "प्रमाणित मजकूर म्हणून संग्रहित करा (&T)"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "प्रमाणित मजकूर संचयीकेत ईमेल संग्रहित करा"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "फाईल म्हणून संग्रहित करा (&F)"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "ईमेल मजकूर म्हणून किंवा html फाईल म्हून संग्रहित करा"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "मजकूर फाईल समाविष्ट करा (&I)..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "अलिकडील मजकूर फाईल समाविष्ट करा (&I)"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "पत्ता पुस्तक (&A)"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "पत्ते नोंदवही उघडा"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "नवीन रचनाकार (&N)"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "प्राप्तकर्ते निवडा (&R)..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "वितरण यादी संग्रहित करा (&D)..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "अटॅचमेंट प्रमाणे चिटकवा (&H)"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "मोकळ्या जागा (&E)"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "निश्चीत केलेली अक्षरमुद्रा वापरा (&X)"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "तातडीचे (&U)"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "स्वयंचलीत अधिसूचनेसाठी विनंती करा (&R)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "स्वयंचलीत अधिसूचनेसाठी विनंती करा (&R)"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "शब्दओघ (&W)"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "स्निपेट्स (&S)"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "स्वयंचलीत स्पेलिंग तपासणी (&A)"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Rich Text Editing"
 msgstr "रचना/रूपरेषा गमवा"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "सर्व प्रक्षेत्रे (&A)"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "ओळख (&I)"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "शब्दकोश (&D)"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "पाठविलेल्या संदेशांची संचयीका (&S)"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "मेल वाहतुक (&M)"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "पासून (&F)"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "विषय (&U)"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "हस्ताक्षर जोडा (&I)"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "स्वाक्षरी आधी जोडा (&E)"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "कर्सरच्या जागेवर स्वाक्षरी समाविष्ट करा (&U)"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "स्पेलिंग तपासणारा (&S)"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "स्पेलिंग तपासणारा"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "संदेशाचे संकेतीकरण करा (&E)"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "कुटलिपीबद्ध करा"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "संदेशावर स्वाक्षरी करा (&S)"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "स्वाक्षरी"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "सांकेतिक लिपीतील संदेशाची रूपरेखा (&C)"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "ह्या गुप्त लिपीतील सांदेशासाठी आराखडा निवडा"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "संदेश शोधा (&F)..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "के-मेल चे संयोजन करा"
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " ओळ : %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " स्तंभ: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "स्पेलिंग तपासणी: चालू"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "स्पेलिंग तपासणी; बंद"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "प्रमाणित मजकूर म्हणून राखीव ठेवा (&S)"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "मसुदा म्हणून संग्रहित करा (&S)"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "प्रमाणित मजकुराच्या संचयीकेत हा संदेश राखून ठेवा"
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2133,60 +2138,60 @@
 "मसुद्याच्या संचयीकेत हा संदेश संग्रहित करा. नंतर तो संपादन करून नंतरच्या काळात तो पाठविता "
 "येईल."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "हा संदेश पुढील काळासाठी संग्रहित करावयाचा आहे की काढून टाकावयाचा आहे?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "रचना/जुळविणारी प्रणाली बंद करा "
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "स्वयंचालीत पद्धतीने संदेश संग्रहित करण्याचे काम यशस्वी झाले नाही"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "संदेश पाठविण्याचे काम यशस्वी झाले नाही"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert Text File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "मजकूर फाईल समाविष्ट करा (&I)..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "इनलाईन प्रतिमा म्हणून समाविष्ट करा (&I)"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "अटॅचमेंट प्रमाणे जोडा (&A)"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "अटॅचमेंटचे नाव :"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Attachment Name"
 msgstr "अवैध इमेल पत्ता"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "&Edit Message"
 msgid "Add URL into Message"
@@ -2194,24 +2199,24 @@
 msgstr[0] "संदेश संपादित करा (&E)"
 msgstr[1] "संदेश संपादित करा (&E)"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "अटॅचमेंट प्रमाणे फाईल जोडा (&A)"
 msgstr[1] "अटॅचमेंट प्रमाणे फाईल्स जोडा (&A)"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "अटॅचमेंट प्रमाणे क्लिपबोर्ड मजकूर अंतर्भूत करा"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "निनावी"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2223,12 +2228,12 @@
 "ऑनलाईन ओळख (OpenPGP or S/MIME) सांकेतीकरणाच्या कळीचा तपशील देऊ शकत नाही.</"
 "p><p>ह्या ऑनलाईन ओळखीच्या मांडणीसाठी कळ निवडा.</p></qt> "
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "तपशील नसलेली सांकेतीकरणाची कळ"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2239,12 +2244,12 @@
 "(OpenPGP or S/MIME) तपशील द्यावा लागेल.</p><p> ऑनलाईन ओळख मांडणीमध्ये वापरण्यासाठी "
 "कळ निवडा.</p></qt> "
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "तपशील/ओळख नसलेली स्वाक्षरीची कळ"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2255,7 +2260,7 @@
 "ओळखींसाठी तुमचा ईमेल पत्ता प्रविष्ट केला पाहिजे ज्यामुळे तुम्हाला प्रत्येक संदेशासाठी तो "
 "पुन्हापुन्हा नोंदवायला लागणार नाही."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2264,37 +2269,37 @@
 "कडे: प्रक्षेत्र किंवा CC म्हणून किंवा  BCC म्हणून तुम्ही किमान एका प्राप्तकर्त्याचे नाव नमूद केले "
 "पाहिजे. "
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "कडे: हे प्रक्षेत्र रिकामे आहे. असे असूनही संदेश पाठवायचा का?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "ला नको: नमूद केले आहे"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "तुम्ही विषय नमूद केलेला नाही. असे असूनही संदेश पाठवायचा का? "
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "कोणताही विषय नमूद केलेला नाही"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "आहे तसे पाठवा (&E)"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "विषय नमूद करा (&S)"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2303,22 +2308,22 @@
 "मसुदा सांकेतिक लिपीत लिहिण्यासाठी तुम्ही किमान एका प्राप्तकर्त्याचे नाव नमूद/निश्चीत केले "
 "पाहिजे."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "ईमेल पाठविण्याच्या बेतातच आहे..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "मंजूरी पाठवा"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "आता पाठवा (&S)"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2327,22 +2332,22 @@
 "तुम्ही %1 पेक्षा जास्त प्राप्तकर्त्यांना मेल पाठवायचा प्रयत्न करीत आहात. तरीही संदेश "
 "पाठवायचा का? "
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "खूपच जास्त प्राप्तकर्ते"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "आहे तसे पाठवा (&S)"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "प्राप्तकर्ते संपादन करा (&E)"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2351,43 +2356,43 @@
 "HTML पद्धत/रीत बंद करण्याने मजकुराच्या आराखड्यावर/रुपरेषेवर परिणाम होईल. तुम्हाला पद्धत "
 "बंद करण्याविषयी खात्री आहे?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "ही रचना/रूपरेषा गमवा?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "रचना/रूपरेषा गमवा"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "खुणा केलेला/दर्जेदार साध मजकूर वाढवा"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2395,7 +2400,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Send Confirmation"
 msgid "Plugin Editor Information"
@@ -2475,25 +2480,25 @@
 msgid "External editor was started."
 msgstr "बाहेरील संपादक"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2520,11 +2525,6 @@
 msgid "Message will not be encrypted"
 msgstr "संदेशाचे संकेतीकरण केले जाणार नाही"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "मजकुराचे छोटे भाग"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2572,28 +2572,28 @@
 msgid "Cannot move messages."
 msgstr "संदेश हलवू शकत नाही.%1"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "संचयीका निवडली नाही"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Open Message in List Archive"
 msgid "Messages archived"
@@ -2636,49 +2636,49 @@
 msgid "&Existing identities:"
 msgstr "अस्तित्वातील ओळखी (&E):"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "नवीन कळ शब्द दाखल करा :"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "ओळख संपादित करा"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "सामान्य"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "तुमचे नाव (&Y):"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2689,12 +2689,12 @@
 "ह्या प्रक्षेत्रात असले पाहिजे;</p><p>हे प्रक्षेत्र तुम्ही रिकामे ठेवल्यास तुमचे खरे नाव फक्त इमेल "
 "पत्त्यावर दिसणार नाही..</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "संस्था (&Z):"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2705,12 +2705,12 @@
 "दाखवावयाचे असेलतर ते ह्या प्रक्षेत्रात असले पाहिजे.</p><p>हे रिकामे ठेवणे सुरक्षित(आणि "
 "सर्वसाधारण) आहे.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "इमेल पत्ता (&E):"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2725,12 +2725,12 @@
 "जास्तीचे पत्ते समाविष्ट करा.</p><p>तुम्ही हे प्रक्षेत्र मोकळे ठेवलेत वा त्यात चूक झाली तर "
 "लोकांना तुम्हाला उत्तरे पाठविण्यात अडचण होईल.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "इमेल अलायस (&L):"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2746,12 +2746,12 @@
 "tr><tr><th>उपनावे  :</th><td>first@example.org<br>last@example.org</td> </"
 "tr></table><p>प्रत्येक ओळीत एक उपनावाचा पत्ता टंकित करा.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "क्रिप्टोग्राफी"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2772,12 +2772,12 @@
 "होणार नाही.</p><p>.तुम्हाला कळीविषयी/चाव्याविषयी अधिक माहिती\" \"<a>http://www."
 "gnupg.org</a></p></qt>येथे मिळू शकेल."
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "ओपनपीजीपी स्वाक्षरी कळ :"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2802,12 +2802,12 @@
 "</p><p>तुम्ही <a>http://www.gnupg.org</a></p></qt> येथे कळासाबंधी अधिक माहिती "
 "मिळवू शकता."
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "ओपनपीजीपी कुटलिपी कळ :"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2820,12 +2820,12 @@
 "अंकीय स्वाक्षऱ्या करणे शक्य होणार नाही;नेहमीच्या कार्यप्रणालीवर कोणताही परिणाम होणार "
 "नाही</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME स्वाक्षरी प्रमाणपत्र :"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2840,41 +2840,41 @@
 "पाठविल्या जाणाऱ्या संदेशांच्या नकलांचे सांकेतीकरण करणे शक्य होणार नाही; नेहमीच्या "
 "कार्यप्रणालीवर काहीही परिणाम होणार नाही.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME कुटलिपी प्रमाणपत्र :"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "पसंतीचे स्वरूप :"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "संदेशांवर स्वयंचलीत स्वाक्षऱ्या (&A)"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "जेव्हा शक्य असेल तेव्हा स्वयंचलित पद्धतीने संदेशांचे सांकेतीकरण होते (&M)"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "प्रगत"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "\"यास उत्तर द्या\" चा पत्ता (&R):"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2891,12 +2891,12 @@
 "त्यांना येणारा प्रतिसाद मात्रएका समुह् पत्त्याकडे जावयास पाहिजे असेल.</p><p>काही शंका "
 "असतील तर हे प्रक्षेत्र कोरे ठेवा.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&CC पत्ते :"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2913,12 +2913,12 @@
 "स्वल्पविरामाचे चिन्ह वापरा आणि मेलची प्रत प्राप्त होणाऱ्या लोकांच्या यादीचे पृथ्थकरण करा.</"
 "p><p>काही शंका असतील तर हे प्रक्षेत्र कोरे ठेवा.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC पत्ते :"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2935,59 +2935,59 @@
 "करण्यासाठी, स्वल्पविरामाचे चिन्ह वापरा आणि BBC प्राप्तकार्त्याच्या यादीचे पृथ्थकरण करा.</"
 "p><p>काही शंका असतील तर हे प्रक्षेत्र कोरे ठेवा.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "शब्दकोश (&I):"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "पाठवलेले मेल संचयीका (&F):"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "मसूदा संचयीका (&D):"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "नमूने संचयीका (&T):"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "बाहेर जाणारे खाते :"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "संदेशास माझे व्ही-कार्ड जोडा"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "निर्माण करा..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 #| msgid "Autocorrection Language:"
 msgid "Autocorrection language:"
 msgstr "स्वयंचलित सुधारणा भाषा :"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "मूलभूत डोमेन (&T):"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "मूलभूत डोमेन (&T):"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2996,33 +2996,33 @@
 "<qt><p>पूर्वनिर्धारित (Default) अधिक्षेत्र हे फक्त वापरणाराचे नाव असलेले इमेल पत्ते पूर्ण "
 "करण्यासाठी वापरले आहे</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "ह्या ऑनलाइन ओळखीसाठी इच्छिक संदेश नमूने वापरा (&U)"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "हस्ताक्षर"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "प्रतिमा"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "अवैध इमेल अलायस \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "अवैध इमेल पत्ता"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3035,7 +3035,7 @@
 "याचा परिणाम ग्रहणकर्ता जेंव्हा या मांडणीद्वारे केलेल्या स्वाक्षऱ्या पडताळून पाहण्याचा प्रयत्न "
 "करेल तेंव्हा त्याला इशारेवजा संदेश मिळण्यात होईल."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3044,7 +3044,7 @@
 "मांडणी केलेल्या OpenPGP सांकेतीककरणाच्या चाव्यांपैकी एकीमध्ये (%1) ह्या ऑनलाइन ओळखीसाठी "
 "रचना केलेल्या ईमेल पत्त्याबरोबर प्रयोगकर्त्याची कोणतीही ऑनलाईन ओळख समाविष्ट नाही."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3057,7 +3057,7 @@
 "याचा परिणाम ग्रहणकर्ता जेंव्हा या मांडणीद्वारे केलेल्या स्वाक्षऱ्या पडताळून पाहण्याचा प्रयत्न "
 "करेल तेंव्हा त्याला इशारेवजा संदेश मिळण्यात होईल."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3066,22 +3066,22 @@
 "मांडणी केलेल्या कोणत्यातरी एका S/MIME सांकेतीकरण प्रमाणपत्रात ह्या ऑनलाईन ओळखीसाठी "
 "तयार केलेला ईमेल पत्ता समाविष्ट नाही(%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "चाव्या वा कळा/ प्रमाणपत्रे यांच्यात ईमेल पत्ता सापडला नाही"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "ही स्वाक्षरी फाईल वैध नाही"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "ओळख संपादित करा \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3093,7 +3093,7 @@
 "ऑनलाईन ओळखीसाठी इच्छिक मसुद्यांची संचयीका \"%1\" अस्तित्वात नाही(आता) म्हणून "
 "पूर्वनिर्धारित मसुद्यांची संचयीका वापरायला लागेल"
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "संपादन...."
@@ -3127,6 +3127,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "मंजूरी पाठवा"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3292,7 +3305,7 @@
 "उदाहरणे येथे उपलब्ध आहेत<a href=\"http://ace.home.xs4all.nl/X-Faces/\">http://ace."
 "home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3326,7 +3339,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "पत्ता पुस्तकात जोडा"
@@ -3336,22 +3349,22 @@
 msgid "Contact created successfully"
 msgstr "यशस्वीरित्या संपर्क तयार केला"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "संपर्क साठवू शकत नाही : %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "संपर्क साठविण्यास अपयश"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "\"%1\" हि संचयीका अटेच करायची का?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "संचयीका अटेच करा"
@@ -3566,7 +3579,7 @@
 msgstr "संचयीका (&O)"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3574,7 +3587,7 @@
 msgstr "संचयीकेवर सर्व गाळण्या लागू करा (&Y)"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3600,7 +3613,7 @@
 msgstr "पुढे (&F)"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "गाळणी लावा (&P)"
@@ -3625,7 +3638,7 @@
 msgstr "मदत (&H)"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "मुख्य साधनपट्टी"
@@ -3680,12 +3693,12 @@
 msgid "The file does not contain a message."
 msgstr "ह्या फाईलमध्ये संदेश नाही"
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "या फाईलमध्ये एकाहून अधिक/बहुविध संदेश आहेत. फक्त पहिला संदेश दाखविला आहे."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3694,32 +3707,32 @@
 "तुम्हाला एक संदेशाला जोडपत्राच्या स्वरूपात निवडक संदेश पाठवायचे आहेत (MIME सारसंग्रह म्हणून) "
 "की पृथक संदेश म्हणून? "
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "सारसंग्रह म्हणून पाठवा"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "पृथकपणे पाठवा"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "संदेशांना गाळणी"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "संदेशाना गाळणी%1 of %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "संदेश हलवत आहे"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "संदेश काढून टाकत आहे"
@@ -3748,66 +3761,66 @@
 msgid "Text Direction Toolbar"
 msgstr "मजकूर दिग्दर्शन/मार्गदर्शन"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "के-मेल ऑफलाईन ठेवा. नेटवर्कमधील सर्व कामे निलंबित/अकार्यक्षम केली आहेत."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "मेल पाठवा (&S)"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "ईमेल पाठविण्याच्या बेतातच आहे..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "के-मेल ऑनलाईन ठेवा. नेटवर्कमधील सर्व कामे सुरु केली आहेत."
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr "के-मेल ओंनलाईन ठेवा. नेटवर्कमधील सर्व कामे नेटवर्कमधील जोडणी शोधल्यावर सुरु होतील."
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "के-मेल सध्या ऑफलाईन स्थितीत आहे. तुम्ही पुढे कसे जाऊ इच्छिता?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "ऑनलाईन/ऑफलाईन"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "काम ऑनलाईनवर"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "काम ऑफलाईनवर"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "नेटवर्क जोडणी शोधली. नेटवर्कमधील सर्व कामे सुरु झाली."
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "नेटवर्कमधील कोणतीही जोडणी सापडली नाही. नेटवर्कमधील सर्व कामे निलंबित आहेत."
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3816,12 +3829,12 @@
 "स्वयंचलित संग्रहणांची फाईल उघडण्याची क्रिया %1 येथे यशस्वी झाली नाही.\n"
 "कारण: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr " स्वयंचलित संग्रह करणारी फाईल उघडण्याची क्रिया यशस्वी झाली नाही"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3829,7 +3842,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3837,46 +3850,48 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "संदेश पाठवित आहे"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "पाठविण्याची प्रक्रिया सुरु करीत आहे..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, fuzzy, kde-format
 #| msgid "Resource %1 is broken. This resource is now %2"
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "संसाधन %1 निकामी झाले आहे.हे संसाधन आता %2 आहे"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1 : %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "जुन्या मेलच्या अभिकर्त्याची नोंदणी झाली नव्हती."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, fuzzy, kde-format
 #| msgid "Archive Mail Agent was not registered."
 msgid "Send Later Agent was not registered."
 msgstr "जुन्या मेलच्या अभिकर्त्याची नोंदणी झाली नव्हती."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Archive Mail Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr "जुन्या मेलच्या अभिकर्त्याची नोंदणी झाली नव्हती."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3884,12 +3899,12 @@
 "properly installed."
 msgstr "प्रमाणपत्र व्यवस्थापक पद्धती सुरु करू शकत नाही; स्थापनाव्यवस्था तपासा."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "के-मेल चूक"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3897,24 +3912,28 @@
 "properly installed."
 msgstr "आयात करणारा विझार्ड चालू करू शकलो नाही. तुमची संचमांडणी तपासून पहा"
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "आयात विझार्ड सुरु करणे शक्य होत नाही"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "\"PIM Setting Exporter\" कार्यक्रम सुरु करू शकलो नाही. संचमांडणी तपासा."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "\"PIM Setting Exporter\"  कार्यक्रम सुरु करू शकत नाही"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3922,13 +3941,13 @@
 "properly installed."
 msgstr "आयात करणारा विझार्ड चालू करू शकलो नाही. तुमची संचमांडणी तपासून पहा"
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "आयात विझार्ड सुरु करणे शक्य होत नाही"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, fuzzy, kde-format
 #| msgid ""
 #| "An other mailer was found on system. Do you want to import data from it?"
@@ -3937,59 +3956,59 @@
 "प्रणालीवर एक इतर प्रेषक मिळाला आहे. तुम्हाला तेथून माहितीसठा मिळवायचा/आयात करावयाचा "
 "आहे का?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "आयात करणारा विझार्ड चालू करू शकलो नाही. तुमची संचमांडणी तपासून पहा"
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "विषय नाही"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(प्रमाणित मजकूर नाही)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "ह्या संचयीकेत कोणतेही मुदत समाप्तीचे पर्याय समाविष्ट/निश्चीत केलेले नाहीत"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>तुम्हाला संचयीकेच्या मुदतीची समाप्ती करायची आहे याबद्दल खात्री आहे का? <b>%1</b>?</"
 "qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "संचयीका संपुष्टात आणा"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "संपुष्टात आणा (&E)"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "कचरापेटी रिकामी करा"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "कचरापेटीत टाका"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "तुम्हाला कचरापेटीची संचयीका रिकामी करायची आहे याबद्दल खात्री आहे?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3998,27 +4017,27 @@
 "<qt>तुम्हाला संचीकेमधून सर्व संदेश<b>%1</b> कचरापेटीत हलवायचे आहेत याबद्दल खात्री आहे का?</"
 "qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "सर्व संदेश कचरापेटीत हलविले"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "सर्व जुने संदेश कालबाह्य करायचे याबद्दल तुम्हाला खात्री आहे?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "जुने संदेश कालबाह्य करा"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "कालबाह्य"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4029,17 +4048,17 @@
 "वाटेल आणि अशी शक्यता निर्माण होईल की तुमची प्रणाली सध्याच्या आणि अपेक्षित अशा सुरक्षेच्या "
 "साहसी उपयांशी तडजोड करेल."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "सुरक्षा इशारा"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "बाहेरील संदर्भ भारीत/समाविष्ट करा"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4050,539 +4069,539 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "संदेश काढून टाका"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr " संदेश काढून टाका "
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "संदेश हलवीत आहे..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "संदेश काढून टाकत आहे..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "संदेश यशस्वीरीत्या काढून टाकले."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "संदेश यशस्वीरीत्या हलविले"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "संदेश काढून टाकण्याचे काम यशस्वी झाले नाही."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "संदेश काढून टाकण्याचे काम रद्द केले आहे."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "संदेश हलविण्याचे काम यशस्वी झाले नाही."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "संदेश हलविण्याचे काम रद्द केले आहे."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "संदेश संचयीकेत हलवा"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "संदेशांची नक्कल करणे चालू आहे..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "संदेशांची नक्कल करण्याचे काम यशस्वी झाले."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "संदेशांची नक्कल करण्याचे काम यशस्वी झाले नाही."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr " संदेशांची नक्कल करण्याचे काम रद्द केले आहे."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "संचयीकेत संदेशांची नक्कल करा"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "संदेश कचरापेटीत हलवत आहे..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "संदेश कचरापेटीत हलवत आहे..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "संदेश कचरापेटीत यशस्वीरीत्या हलविले."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "संदेश कचरापेटीत यशस्वीरीत्या हलविले."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "संदेश कचरापेटीत हलविण्याचे काम यशस्वी झाले नाही"
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "संदेश कचरापेटीत हलविण्याचे काम यशस्वी झाले नाही"
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "संदेश कचरापेटीत हलविण्याचे काम रद्द केले आहे."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "संदेश कचरापेटीत हलविण्याचे काम रद्द केले आहे."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "संचयीका त्वरित निवडा/क्लिक करा/उघडा"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "असे साठवा (&A)..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "सर्व संचयीका कालबाह्य करा (&E)"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "मेल तपासा (&M)"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "आलेले मेल तपासा"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "मेल तपासा"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "क्रमवारीतील मेल पाठवा (&S)"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "ऑनलाईन स्थिती(माहित नाही)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "च्याद्वारे क्रमवारीतील संदेश पाठवा"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "प्रमाणपत्र व्यवस्थापक"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "संदेश आयात करा (&I)..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "दोषनिवारक गाळणी (&D)..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "गाळणी लॉग दर्शिका (&L)..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr " \"Out of Office\" उत्तरे संपादित करा..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "स्वयंचलीत माहितीसाठा तयार करण्याची यंत्रणेची मांडणी करा (&C)..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "संदेश काढून टाकत आहे..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "संदेश शोधा (&F)..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "काढून टाका (&D)"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "थ्रेड कचरापेटीत हलवा (&O)"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "थ्रेड कचरापेटीत हलवा "
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "थ्रेड हटवा (&H)"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "संदेश शोधा (&F)..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "सर्व संदेश निवडा (&A)"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "करावयाच्या/पाठवावयाच्या मेलच्या यादीचे व्यवस्थापन (&M)..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "जवळचा मार्ग/सोपा उपाय निश्चीत करा (&A)..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "संपुष्टात आणण्यासाठी कालबाह्य करण्यासाठी संयोजना (&E)"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "जुन्या माहिती साठ्याची संचयीका (&A)..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "बाह्य संदर्भ दाखल करा (&X)"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "संदेशाची प्रत याकडे पाठवा..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "संदेश    कडे हलवा"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "नवीन संदेश (&N)..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "नवीन"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "प्रमाणित मजकुराकडून संदेश (&T)"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "पाठवायच्या मेल-यादीसाठी नवा संदेश (&O)"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "गाळणी निर्माण करा (&C)"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "या विषयाची गाळणी (&S)..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "याकडून वर गाळणी लावा (&F)..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "याकडे वर गाळणी लावा (&T)..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "याकडे वर गाळणी लावा (&T)..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "थ्रेडवर खुण करा (&T)"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "थ्रेडवर वाचल्याची खुण करा (&R)"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "निवडलेल्या थ्रेडमधील सर्व संदेशांवर वाचले म्हणून खुणा करा"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "थ्रेडवर वाचले नाही अशा खुणा करा (&U)"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "निवडलेल्या थ्रेडमधील सर्व संदेशांवर न वाचल्याच्या खुणा करा "
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "थ्रेडवर महत्वाचे अशी खुण करा (&I)"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "महत्वाचा थ्रेड म्हणून असलेली खुण काढून टाका (&I)"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "कार्यवाही करण्याची बाब म्हणून थ्रेडवर खुण करा (&A)"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr " कार्यवाही करण्याची बाब म्हणून थ्रेडवर असलेली खुण काढून टाका (&A)"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "थ्रेडवर लक्ष ठेवा (&W)"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "थ्रेडकडे दुर्लक्ष करा (&I)"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "अटॅचमेंट साठवा (&T)..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "... कडे  बाब/कलम नक्कल करा"
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "सर्व गाळण्या लागू करा (&Y)"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "थ्रेड/संच वाढवा (&E)"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "सध्याचा/चालू थ्रेड संच वाढवा"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "थ्रेड/संचाचे आकुंचन करा (&C)"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "सध्याचा/चालू थ्रेड अथवा संच आकुंचित करा"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "सर्व थ्रेडस् वाढवा"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "सध्याच्या/चालू संचयीकेतील सर्व थ्रेडस् वाढवा"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "सर्व थ्रेडस् आकुंचित करा (&O)"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "सध्याच्या/चालू संचयीकेतील सर्व थ्रेडस् आकुंचित करा "
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "संदेश दाखवा (&D)"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "पुढील संदेश (&N)"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "पुढील संदेशाकडे जा"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "पुढील न वाचलेला संदेश (&U)"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "पुढील"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "पुढील न वाचलेल्या संदेशाकडे जा"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "मागील संदेश (&P)"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "मागील संदेशाकडे जा"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "मागील न वाचलेला संदेश (&M)"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "मागील"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "मागील न वाचलेल्या संदेशाकडे जा"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "पुढील न वाचलेली संचयीका (&F)"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "न वाचलेले संदेश असलेल्या पुढील संचयीकेकडे जा"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "मागील न वाचलेली संचयीका (&O)"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr " न वाचलेले संदेश असलेल्या मागील संचयीकेकडे जा "
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "न वाचलेला पुढील मजकूर (&T)"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "न वाचलेल्या पुढील मजकुराकडे जा"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4590,229 +4609,235 @@
 msgstr ""
 "सध्याचा संदेश खाली सरकवा. सध्याच्या संदेशाच्या शेवटी असेल तर पुढील न वाचलेल्या संदेशाकडे जा"
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "गाळण्यांची संयोजना करा (&F)..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "संहितांचे व्यवस्थापन करा (&S)..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Note..."
 msgid "&Add Account..."
 msgstr "सूचना/नोंद वाढवा..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "के-मेल ची ओळख (&I)"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "के-मेल चे स्वागत पृष्ठ दाखवा"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "सूचना संयोजीत करा (&N)..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "के-मेलची संयोजना करा (&C)..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "कालबाह्य करा..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "आवडती संचयीका वाढवा"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "सर्व्हरसाईड सदस्यता/वर्गणी..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "सर्व गाळण्या लागू करा (&Y)"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "के-मेल माहितीसाठा निर्यात करा (&E)..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "नवीन पत्ते नोंदवहीतील संपर्क..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "संचयीकेमध्ये संदेशांची नक्कल करा"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "संचयीकेकडे एकदम जा..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "सध्याची क्रिया निष्फळ करा"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "पुढील संचयीकेवर फोकस /लक्ष केंद्रित करा"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "मागील संचयीकेवर फोकस/लक्ष केंद्रित करा "
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "लक्ष केंद्रित असलेली संचयीका निवडा"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "पहिल्या संचयीकेवर लक्ष केंद्रित करा"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "शेवटच्या संचयीकेवर लक्ष केंद्रित करा"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "पुढील संदेशावर लक्ष केंद्रित करा"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "मागील संदेशावर लक्ष केंद्रित करा"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "पहिला संदेश निवडा"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "शेवटचा संदेश निवडा"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "लक्ष केंद्रित करून संदेश निवडा"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "जलदगती शोधावर लक्ष केंद्रित करा"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "मागील संदेशापर्यंत निवडप्रक्रिया वाढवा"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "पुढील संदेशापर्यंत निवडप्रक्रिया वाढवा "
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "संदेश संचयीकेत हलवा"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "संयोजना (&S)"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Restart"
+msgid "Restart Account"
+msgstr "पुन्हा सुरु करा"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "आवडती संचयीका वाढवा"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "कचरापेटी रिकामी करा (&M)"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "सर्व संदेश कचऱ्यात हलवा (&M)"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "शोध वगळा (&D)"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Edit Search..."
 msgstr "सुरु करत आहे..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "गाळणी %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "सुरु करत आहे..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4823,12 +4848,12 @@
 "निर्माण होईल की तुमची प्रणाली सध्याच्या आणि अपेक्षित अशा सुरक्षेच्या साहसी उपयांशी तडजोड "
 "करेल."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML वापरा"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4838,121 +4863,121 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "सुरु करत आहे..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "कचरापेटीत टाका (&M)"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "कचरापेटी"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "संदेश कचराकुंडीत हलवा"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Can not copy item. %1"
 msgid "Cannot copy item. %1"
 msgstr "बाब/कलम नक्कल करू शकत नाही. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "...  ला नवा संदेश"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "यास उत्तर द्या..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "यास पुढे..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Failed to store contact"
 msgid "Add to Existing Contact"
 msgstr "संपर्क साठविण्यास अपयश"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "पत्ते नोंदवहीत उघडा"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "या लिंकला ओळखचिन्ह करा"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "संपर्क संपादन करा..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "लिंक अशी साठवा..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "याच्यात संदेश शोधा (&F)..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "प्रतिमा डिस्कमध्ये संग्रहित करा..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr ""
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Image On Disk..."
 msgid "Share image..."
 msgstr "प्रतिमा डिस्कमध्ये संग्रहित करा..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4961,68 +4986,68 @@
 "के-मेल आता Akonadi वैयक्तिक माहिती व्यवस्थापन चौकटीवर आधारित आहे जी खूप बदल चौफेर "
 "घडवून आणते."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "इमेल ढकला/पुढे रेटा (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "सुधारित शद्ध"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "नोंदी (टिपा) वाढविण्यासाठी सहाय्य/मदत करा"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "GUI जितके थिजेल, पार्श्वभूमीवर मेल तपासणी होत राहील"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "ग्नू-पीजी समर्थन"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "पाठविण्यापूर्वी वर्णलेखन तपासा"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "केडीई ईमेल ग्राहक"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "संचयीका गुणधर्म बाहेर काढत आहे"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "कृपया थांबा"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "ऑफलाइन"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5035,7 +5060,7 @@
 "<h2 style='margin-top: 0px;'>ऑफलाईन</h2><p>खाते सध्या ऑफलाईन स्थितीत आहे. क्लिक "
 "करा<a href=\"के-मेल:goOnline\">येथे</a>ऑनलाईन स्थितीत जाण्यासाठी...</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5049,22 +5074,22 @@
 "करा<a href=\"के-मेल:goResourceOnline\">येथे</a>ऑनलाईन स्थितीत जाण्यासाठी...</"
 "p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "यशस्वीरित्या संपर्क बदलला"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "नवीन संदेश येत आहे"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "तेथे न वाचलेले संदेश नाहीत"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5087,8 +5112,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5182,17 +5207,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5239,27 +5264,27 @@
 msgid "All"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5287,7 +5312,7 @@
 msgid "&Reply"
 msgstr "उत्तर द्या (&R)"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "उत्तर द्या (&R)..."
@@ -5297,12 +5322,12 @@
 msgid "Reply to A&uthor..."
 msgstr "लेखकाला उत्तर द्या (&U)"
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "सर्वाना उत्तर द्या (&A)"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "मेलिंग यादीला उत्तर द्या (&L)"
@@ -5333,7 +5358,7 @@
 msgid "&Edit As New"
 msgstr "संदेश संपादित करा (&E)"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5527,119 +5552,119 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "संदेश शोधा"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "शोध (&S)"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "इनलाइन (&I)..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "अटॅचमेंट प्रमाणे (&A)..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "अटॅचमेंट साठवा..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "निवड काढून टाका"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "संचयीका त्वरित निवडा/क्लिक करा/उघडा"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 जुळवणी"
 msgstr[1] "%1 जुळवण्या"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "शेवटचा शोध"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "सुरु करत आहे..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Can not get search result. %1"
 msgid "Cannot get search result. %1"
 msgstr "परिणाम निश्कर्ष शोधू शकत नाही. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search tag"
 msgid "Search failed."
 msgstr "खुण शोधा"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid "Search tag"
 msgid "Search complete."
 msgstr "खुण शोधा"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid "Search tag"
 msgid "Search stopped."
 msgstr "खुण शोधा"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, fuzzy, kde-format
 #| msgid ""
 #| "There was a problem renaming your search folder. A common reason for this "
@@ -5652,21 +5677,21 @@
 "तुमच्या संचयीकेला दुसरे नाव देण्यात अडचणी होत्या. याचे नेहमीचे कारण म्हणजे याच नावाची दुसरी "
 "शोध संचयीका अस्तित्वात आहे."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "संदेशाची प्रत करा"
 msgstr[1] "%1 संदेशांची प्रत करा"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "संदेश कापा"
 msgstr[1] "%1 संदेश कापा"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5800,7 +5825,7 @@
 "उपयोगासाठी)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5808,7 +5833,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5818,19 +5843,19 @@
 "केला जातो"
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "संचयीका जलद शोध घेणारी संपादित पद्धती "
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "मूलभूतसारखे इनलाइन फॉर्वर्ड करा."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Warn if the number of recipients is more than:"
@@ -5838,7 +5863,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5849,19 +5874,19 @@
 "पुष्टीसाठी विचारणा करेल. इशारा इशाऱ्याकडे दुर्लक्ष करा/इशारा बंद करा."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "पाठविण्यापूर्वी वर्णलेखन तपासा"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "विनंती आणि संदेशाच्या मांडणीची स्वयंचलीत सूचना (&M)"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5876,13 +5901,13 @@
 "अधिसूचनेसाठी विनंती</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "स्वयंचलित साठवणे मध्यांतर :"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5894,151 +5919,151 @@
 "० ह्या मूल्यावर निश्चीत करून असमर्थ करू शकता."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "मांडणीतील मजकुराच्या तुकड्याचे/छोट्या भागाचे व्यवस्थापन आणि समावेशन चौकोन दाखवा."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "तपासणी झाल्यानंतर पाठविलेले संदेश संकेतन स्वरूपात साठविले जातील"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "नुकत्याच वापरलेल्या वैश्विक/एकात्म साधन शोधकांची (URLs) यादी"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "नुकत्याच वापरलेल्या सर्व संकेतनांची यादी"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "ऑनलाईन ओळख संवादाचा आकार (अंतर्गत उपयोगासाठी)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "शोध खिडकीची रुंदी (अंतर्गत उपयोगासाठी)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "शोध खिडकीची उंची (अंतर्गत उपयोगासाठी)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "व्यूहरचना केलेल्या के-मेल संवादाची रुंदी (अंतर्गत उपयोगासाठी)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr " व्यूहरचना केलेल्या के-मेल संवादाची उंची (अंतर्गत उपयोगासाठी) "
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "संदेश पूर्वावलोकन उपखंड"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "संदेश पूर्वावलोकन उपखंड दाखवू नका"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "संदेशांच्या यादीखाली पूर्वावलोकन उपखंड दाखवा"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr " संदेश पूर्ववलोकन उपखंड संदेशांच्या यादीखाली दाखवा"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "संचयीका यादी"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "लांब/नोठ्या संचयीकांची यादी"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "लहान संचयीकांची यादी"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "नवीन संदेशासाठी प्रमाणित संदेश मजकूर"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "उत्तरासाठी प्रमाणित संदेश मजकूर"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "सर्वाना उत्तर पाठविण्यासाठी प्रमाणित संदेश मजकूर"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "फॉर्वर्ड करिता संदेश नमूना"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "अक्षर समूह उधृत करा"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "नीति प्रदर्शित करताना उपयोगात आणलेली नीति दाखवते"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6047,7 +6072,7 @@
 "शोध खिडकी संवादातील संचय/संग्रह प्रक्षेत्राची रुंदी निर्देशित करते (फक्त अंतर्गत उपयोगासाठी)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6056,7 +6081,7 @@
 "शोध खिडकी संवादातील विषय या प्रक्षेत्राची रुंदी निर्देशित करते (फक्त अंतर्गत उपयोगासाठी) "
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6066,7 +6091,7 @@
 "उपयोगासाठी) "
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6076,7 +6101,7 @@
 "उपयोगासाठी) "
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6086,7 +6111,7 @@
 "उपयोगासाठी) "
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6356,10 +6381,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6718,10 +6780,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "आलेले मेल तपासा"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7333,6 +7394,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "\"पुन्हा विचारणा करू नका\" हे इशारे पुन्हा कार्यरत करा"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7397,6 +7468,14 @@
 msgid "Zoom: %1%"
 msgstr "झूम"
 
+#~ msgid "Text Snippets"
+#~ msgstr "मजकुराचे छोटे भाग"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "आलेले मेल तपासा"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "ठराविक संख्येच्या जवळ असलेल्या संचयीकेचे नाव आणि आकार"
 
@@ -8687,9 +8766,6 @@
 #~ msgid "R&emove"
 #~ msgstr "काढून टाका (&E)"
 
-#~ msgid "Restart"
-#~ msgstr "पुन्हा सुरु करा"
-
 #, fuzzy
 #~| msgid "New Message To..."
 #~ msgid "Message Delayed..."
diff -Nru kmail-19.04.3/po/mr/ktnef.po kmail-19.12.3/po/mr/ktnef.po
--- kmail-19.04.3/po/mr/ktnef.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/mr/ktnef.po	2020-03-03 00:34:08.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2013-03-11 16:13+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
diff -Nru kmail-19.04.3/po/nb/akonadi_archivemail_agent.po kmail-19.12.3/po/nb/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/nb/akonadi_archivemail_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nb/akonadi_archivemail_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2015-02-07 19:01+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -178,12 +178,12 @@
 "Kan ikke legge til et nytt arkiv for denne mappa. Endre det eksisterende "
 "arkivet i stedet."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Mappa finnes ikke. Kontroller innstillinger. Arkivering utsatt."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Start arkivering av %1"
diff -Nru kmail-19.04.3/po/nb/akonadi_followupreminder_agent.po kmail-19.12.3/po/nb/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/nb/akonadi_followupreminder_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nb/akonadi_followupreminder_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2015-02-07 19:01+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -19,97 +19,97 @@
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agent for påminnelse om oppfølging"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr ""
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Vedlikeholder"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Bjørn Steensrud"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "bjornst@skogkatt.homelinux.org"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Til"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Emne"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Frist"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Svar"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Mottatt"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "På vent"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Vis melding"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Slett"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Svar mottatt fra %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Du venter fortsatt på et svar om denne e-posten:"
diff -Nru kmail-19.04.3/po/nb/akonadi_mailfilter_agent.po kmail-19.12.3/po/nb/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/nb/akonadi_mailfilter_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nb/akonadi_mailfilter_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2015-02-07 19:02+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -24,17 +24,17 @@
 msgid "Filter Log Viewer"
 msgstr "Filterloggviser"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Logg filteraktiviteter"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -43,23 +43,23 @@
 "Her kan du slå av og på logging av filteraktiviteter. Loggdata blir "
 "naturligvis bare samlet og vist hvis logging er slått på."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Loggedetaljer"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Beskrivelse av loggmønster"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Logg behandling av filter&regler"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -73,34 +73,34 @@
 "om hver enkelt filterregel, ellers blir det bare meldt om resultatet av alle "
 "regler i hvert enkelt filter."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Logg behandling av filtermønstre"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Logg filterhandlinger"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Maksimal størrelse for loggen:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "ubegrenset"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -113,7 +113,7 @@
 "størrelsen blir de eldste dataene slettet til grensen ikke er overskredet "
 "lenger. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -122,63 +122,63 @@
 "Klarte ikke skrive fila %1:\n"
 "«%2» er detaljert feilbeskrivelse."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-feil"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerer melding %1 av %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Feil mens e-postfilter flytt ble brukt"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Feil mens e-postfilter slett ble brukt"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Feil under endring av e-postfilteret"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Bruker filterregler:</b>"
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filterregler fant et treff.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Begynn filtrering på melding «%1» fra «%2» på «%3» :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrerer meldinger"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "E-post filterlogg slått på"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Klar"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrering i %1"
diff -Nru kmail-19.04.3/po/nb/akonadi_sendlater_agent.po kmail-19.12.3/po/nb/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/nb/akonadi_sendlater_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nb/akonadi_sendlater_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2015-02-07 19:02+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -61,124 +61,124 @@
 msgid "Your emails"
 msgstr "bjornst@skogkatt.homelinux.org"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Til"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Emne"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Send omkring"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Gjentas"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Meldings-ID"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Ingen meldinger venter …"
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Send nå"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Slett"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Ja"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nei"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Fjern elementer"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Fjern meldinger"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Ingen melding funnet."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Ingen melding funnet."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Feil når melding ble hentet."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Kan ikke hente melding. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Kan ikke opprette transport"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Meldinga er ikke en virkelig melding"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Kan ikke sende melding."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Det oppsto en feil. Vil du sende på nytt?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Det oppsto en feil"
diff -Nru kmail-19.04.3/po/nb/kmail.po kmail-19.12.3/po/nb/kmail.po
--- kmail-19.04.3/po/nb/kmail.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nb/kmail.po	2020-03-03 00:34:09.000000000 +0000
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: MAIL\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2015-02-07 22:15+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -189,8 +189,8 @@
 msgstr "Flere krypteringsnøkler per adresse"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -296,27 +296,27 @@
 "KMail kunne ikke fullt ut finne en e-postliste i denne mappa. Vennligst fyll "
 "inn adressene for hånd."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvote"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% full"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 av %2 brukt"
@@ -338,7 +338,7 @@
 "vil bruke som tilknytning til denne mappa.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Maler"
@@ -349,106 +349,106 @@
 msgstr "&Bruk selvvalgte meldingsmaler i denne mappa"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopier globale maler"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vis"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Bruk selvvalgte &ikoner"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Ulest:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Vis sender/mottaker-kolonne i meldingslista"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Vis &kolonne:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Standard"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Avsender"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Mottaker"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Meldingsliste"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Bruk standard sammenstilling"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Sammenstilling"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Bruk standardtema"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Standard meldingsformat"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr ""
@@ -458,130 +458,135 @@
 msgid "Retrieval Options"
 msgstr "Valg for henting av post"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Mottar"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Sender"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Utgående kontoer (legg til minst en):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Vanlige innstillinger"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Bekreft før sending"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Stavekontroller før sending"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Aldri automatisk"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Når e-post blir sjekket manuelt"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Ved alle e-postsjekkinger"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Send nå"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Send senere"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Send &meldingene i utboksmappa:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "S&tandard sendingsmetode:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Klarte ikke å starte kontoveiviseren"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Ta med i manuell e-postsjekk"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Gå til frakoblet modus når KMail avsluttes"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Sjekk e-post ved oppstart"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -638,7 +643,7 @@
 msgid "Fixed Width Font"
 msgstr "Skrift med fast bredde"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Ny melding"
@@ -942,61 +947,61 @@
 "Vi kan ikke opprette en etikett. Det finnes fra før en etikett med samme "
 "navn."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Generelt"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardmaler"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Selvvalgte maler"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Emne"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Tegnsett"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Meldingshoder"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autorettelse"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Automatisk endring av bildestørrelse"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signatur"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1005,12 +1010,12 @@
 "Sett inn automatisk den oppgitte signaturen\n"
 "når en melding blir  påbegynt"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Sett inn signaturen over all sitert tekst"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1020,18 +1025,18 @@
 "(to bindestreker og ett mellomrom på en linje\n"
 "før signaturen"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Ikke siter eksisterende signatur ved svar"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1042,7 +1047,7 @@
 " i stedet for hele meldinga, når det er markert\n"
 " tekst i meldingsvinduet."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1053,17 +1058,17 @@
 "også når en ny linje ble laget ved at et ekstra linjeskift ble satt inn for\n"
 "å linje-bryte teksten."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Slå på automatisk linjebryting ved oppgitt bredde"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Oppgi tekstbredde for automatisk linjebryting"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1074,7 +1079,7 @@
 "i det opprinnelige formatet det ble mottatt i.\n"
 "Hvis ikke krysset av, så blir det svart med ren tekst som standard."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1085,34 +1090,34 @@
 "Halvfet, kursiv og understreket tekst, lister og eksterne\n"
 "referanser er støttet."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "I teksten"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Som vedlegg"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Bestem standard format for videresendte meldinger"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Standard type for videresending:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Adressater"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1122,17 +1127,17 @@
 "Legg inn anmodning om meldingskvittering når en melding påbegynnes.\n"
 "Du kan velge dette for hver melding med \"Valg → Be om meldingskvittering\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Si fra om for mange adressater er angitt"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "oppgi høyeste antall adressater for varsling"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1149,7 +1154,7 @@
 "Merk at det ikke tar hensyn til distribusjonslister eller \n"
 "e-postlister."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1158,18 +1163,18 @@
 "Husk adresser som nylig er skrevet,\n"
 "og tilby dem for adressefullføring."
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Ingen lagring"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Største antall nylige adresser som blir husket:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1178,23 +1183,23 @@
 "Største antall nyskrevne adresser som vil bli husket\n"
 "for fullføring"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Ingen autolagring"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1202,18 +1207,18 @@
 msgstr[0] " minutt"
 msgstr[1] " minutter              "
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Lagre meldinga automatisk etter oppgitt tidsintervall"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Emne&forstavelse ved svar"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1222,59 +1227,59 @@
 "Gjenkjenn følgende prefikser i vilkårlig rekkefølge\n"
 "(det skilles ikke mellom store og små bokstaver i regulære uttrykk):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "L&egg til …"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Fjern"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "En&dre …"
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Oppgi nytt svarprefiks:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Emneforstavelser ved &videresending"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Legg til …"
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Fjern"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Endre …"
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Oppgi ny forstavelse for videresending:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1284,87 +1289,87 @@
 "tegnsett som inneholder alle de nødvendige tegnene."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Endre …"
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Oppgi tegnkoding:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "&Bruk den samme tegnkodinga ved svar eller videresending (hvis mulig)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Denne tegnkodingen er ikke støttet."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Bruk egen endelse som meldings-id"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Bruk din egen endelse for meldings-&id:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Angi egne mime-topptekster:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Navn"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Verdi"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "N&y"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Navn:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Verdi:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Vedleggsnavngivning som samspiller med Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1373,38 +1378,38 @@
 "Slå på dette for å få Microsoft Outlook™ til å forstå navn på vedlegg med "
 "ikke-engelske tegn"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Slå &på melding om manglende vedlegg"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Gjenkjenn disse nøkkelordene som en kommando for å legge til en fil:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Oppgi nytt nøkkelord:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Ingen grense"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1489,7 +1494,7 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr ""
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1602,7 +1607,7 @@
 msgid "Archive Folder"
 msgstr "Arkivmappe"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1668,19 +1673,19 @@
 msgid "Notification"
 msgstr "Varsling"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 vedlegg (%2)"
 msgstr[1] "%1 vedlegg (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Skjul vedlegglista"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Vis vedlegglista"
@@ -1697,329 +1702,329 @@
 msgid "Encoding"
 msgstr "Koding"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Velg ordliste som skal brukes for stavekontroll av denne meldinga"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Velg sendt-mappe der en kopi av denne meldinga vil bli lagret"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Velg utgående konto som skal brukes til å sende denne meldinga"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Velg «Fra:» e-postadressen for denne meldinga"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Oppgi et emne for denne meldinga"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitet:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Ordliste:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Mappe for se&ndt e-post:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "E-pos&t transport:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Fra:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Emne:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Send e-post"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Send e-post via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Send"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Send s&enere"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Send s&enere via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Legg i kø"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Lagre som &kladd"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Lagre e-post i kladdemappa"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Lagre som &mal"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Lagre e-post i malmappa"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Lagre som &fil"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Lagre e-post som en tekst- eller html-fil"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Sett &inn tekstfil …"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Sett inn en nylig brukt tekstfil"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adressebok"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Åpne adresseboka"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Ny melding"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Velg &mottakere …"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Lagre &distribusjonsliste …"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Lim inn som et &vedlegg"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Slett &overflødige mellomrom"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "&Bruk skrift med fast bredde"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Viktig"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Be om meldingskvittering"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Tekstbryting"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Biter"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatisk stavekontroll"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Redigere rik tekst"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rik tekst"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Slå av/på rik tekst-redigering"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Alle felter"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitet"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Ordliste"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Mappe for send&t e-post"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&E-post-transport"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Fra"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Emne"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Legg til s&ignatur"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Legg til s&ignatur foran"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Sett inn signatur der &pekeren står"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Stave&kontroll …"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Krypter melding"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Signer melding"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signer"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Kryptografisk meldingsformat"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Velg et kryptografisk format for denne meldinga"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Oppsett av KMail …"
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2027,60 +2032,60 @@
 msgstr ""
 "<qt>Dette gjemmer menylinja helt. Du kan vise den igjen ved å taste %1.</qt> "
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Skjul menylinje"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linje: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolonne: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Stavekontroll: på"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Stavekontroll: av"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Lagre om igjen  &som mal"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Lagre som &kladd"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "Lagre denne meldinga på nytt i malmappa. Da kan den brukes senere."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2088,82 +2093,82 @@
 msgstr ""
 "Lagre denne meldinga i kladdemappa. Den kan bli redigert og sendt senere."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Vil du slette meldinga eller lagre den til senere?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Lukk meldingsredigeringa"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Klarte ikke autolagre melding"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Det lyktes ikke å sende meldinga"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Legg til som &innebygget bilde"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Legg til som &vedlegg"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Navnet til vedlegget:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Legg URL inn i meldings&tekst"
 msgstr[1] "Legg URL-er inn i meldings&tekst"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Legg til fil som &vedlegg"
 msgstr[1] "Legg til filer som &vedlegg"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Sett inn tekst fra utklippstavla som vedlegg"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "navnløs"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2176,12 +2181,12 @@
 "skal brukes til dette.</p><p>Velg hvilke(n) nøkkel(-er) som skal brukes i "
 "identitetsoppsettet.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Krypteringsnøkkelen er ikke angitt"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2192,12 +2197,12 @@
 "eller S/MIME)-nøkkel du vil bruke. </p><p>I identitetsoppsettet kan du velge "
 "hvilken nøkkel som skal brukes for denne identiteten .</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Signeringsnøkkelen er ikke angitt"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2208,7 +2213,7 @@
 "postadresse for alle identiteter, slik at du ikke må skrive den inn for hver "
 "melding."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2217,59 +2222,59 @@
 "Du må oppgi minst en mottaker, enten i «Til:»-feltet, som kopi eller "
 "blindkopi."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Til: feltet er tomt. Vil du sende meldinga likevel?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Ingen Til: adresse oppgitt"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du oppga ikke et emne. Vil du sende meldinga likevel?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Intet emne er oppgitt"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Send &uten endring"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Oppgi et emne"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Du må oppgi minst en mottaker for å kunne kryptere en kladd."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "I ferd med å sende e-post …"
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Send Bekreftelse"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Send nå"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2278,65 +2283,65 @@
 "Du forsøker å sende e-post til fler enn %1 adressater. Skal meldinga sendes "
 "likevel?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "For mange adressater"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Send &uten endring"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "R&ediger adressater"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "Om du slår av HTML-modus vil teksten miste formatering. Er du sikker?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Miste formatering?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Mist formatering"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Legg til oppmerking Ren tekst"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2344,7 +2349,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr ""
@@ -2419,25 +2424,25 @@
 msgid "External editor was started."
 msgstr "Eksternt skriveprogram ble startet."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2464,11 +2469,6 @@
 msgid "Message will not be encrypted"
 msgstr "Meldinga vil ikke bli kryptert"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Tekstbiter"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2512,27 +2512,27 @@
 msgid "Cannot move messages."
 msgstr "Kan ikke flytte meldinger."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Klarte ikke å hente mappe. Feilen var: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Ingen mappe hentet."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Klarte ikke å hente overliggende mappe. Feilen var: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Klarte ikke å hente mappeliste."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Meldinger arkivert."
@@ -2573,48 +2573,48 @@
 msgid "&Existing identities:"
 msgstr "&Eksisterende identiteter:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr ""
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Rediger identitet"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Generelt"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "Navnet &ditt:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2626,12 +2626,12 @@
 "dette feltet stå tomt, vil ikke navnet ditt komme fram, bare e-postadressen "
 "din.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organisas&jon:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2642,12 +2642,12 @@
 "stå hvis du vil at det skal synes i meldingshodet som sendes ut.</p><p>Det "
 "er greit (og ganske vanlig) å la dette stå tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-postadresse:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2662,12 +2662,12 @@
 "aliaser i feltet nedenfor.</p><p>Hvis dette feltet er tomt, eller adressen "
 "er feil, vil man få problemer med å svare på meldingene dine.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "E-posta&liaser:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2684,12 +2684,12 @@
 "org<br>sost@example.org</td></tr></table><p>Skriv én alias-adresse på hver "
 "linje.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kryptografi"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2699,12 +2699,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-signeringsnøkkel:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2715,12 +2715,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "krypteringsnøkkel for OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2733,12 +2733,12 @@
 "meldinger kryptografisk ved hjelp av S/MIME. Vanlige e-postfunksjoner blir "
 "ikke endret.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME signeringssertifikat:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2752,39 +2752,39 @@
 "men da kan ikke KMail signere utgående meldinger til deg selv kryptografisk "
 "med S/MIME. Vanlige e-postfunksjoner blir ikke endret.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME -krypteringssertifikat:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Foretrukket format:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Signer meldinger automatisk"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr ""
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avansert"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Svaradresse:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2801,12 +2801,12 @@
 "din e-postadresse i <tt>Fra:</tt>-feltet, men alle svar skal gå til en "
 "gruppeadresse.</p><p>Hvis du er i tvil, så la dette feltet stå tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&Kopiadresser:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2822,12 +2822,12 @@
 "p><p>Hvis du skriver inn flere kopi-adresser, så bruk komma mellom hver av "
 "dem.</p><p>Er du i tvil, så la feltet stå tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Blindkopiadresser:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2844,57 +2844,57 @@
 "flere blindkopi-adresser, så bruk komma mellom hver av dem.</p><p>Er du i "
 "tvil, så la feltet stå tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Ordl&iste:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Mappe for sendt e-post:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Kladdemappe:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Malmappe:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Utgående konto:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Legg til mitt vCard til meldingen"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Opprett …"
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Språk for autorettelse:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Tilbakestill til standard domenenavn"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "S&tandarddomene:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2903,33 +2903,33 @@
 "<qt> <p>Standarddomenet settes etter alfakrøllen («@») i ufullstendige "
 "adresser.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Bruk selvvalgte meldingsmaler for denne identiteten"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signaturer"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Bilde"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Ugyldig alias for e-postadresse \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Ugyldig e-postadresse"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2942,7 +2942,7 @@
 "Dette kan føre til advarsler når mottakeren prøver å bekrefte signaturer som "
 "er laget med dette oppsettet."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2951,7 +2951,7 @@
 "En av OpenPGP-krypteringsnøklene som er satt opp inneholder ikke en bruker-"
 "ID med den e-postadressen som er valgt for denne identiteten (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2964,7 +2964,7 @@
 "Dette kan føre til advarsler når mottakeren prøver å bekrefte signaturer "
 "laget med dette oppsettet."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -2973,29 +2973,29 @@
 "En av S/MIME-krypteringssertifikatene som er satt opp inneholder ikke den e-"
 "postadressen som er satt opp for denne identiteten (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-postadressen ble ikke funnet i nøkkel/sertifikater"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Signaturfila er ugyldig"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Endre identiteten «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Rediger …"
@@ -3026,6 +3026,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Klarte ikke å slette vard-fila."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr ""
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3186,7 +3198,7 @@
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Bilde"
@@ -3219,7 +3231,7 @@
 msgstr[0] "Distribusjonslista %2 er tom, den kan ikke brukes."
 msgstr[1] "Distribusjonslistene %2 er tomme, de kan ikke brukes."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Legg til i adresseboka"
@@ -3229,22 +3241,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakt vellykket opprettet"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kan ikke lagre kontakten: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Klarte ikke å lagre kontakten"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Vil du legge ved denne mappa «%1»?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Legg ved mappe"
@@ -3455,14 +3467,14 @@
 msgstr "M&appe"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr ""
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3488,7 +3500,7 @@
 msgstr "&Videresend"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Bruk filter"
@@ -3513,7 +3525,7 @@
 msgstr "&Hjelp"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Hovedverktøylinje"
@@ -3566,12 +3578,12 @@
 msgid "The file does not contain a message."
 msgstr "Fila inneholder ikke en melding."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fila inneholder flere meldinger. Bare den første meldinga blir vist."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3580,32 +3592,32 @@
 "Skal de valgte meldingene videresendes som vedlegg i én melding (som MIME-"
 "samling) eller som enkeltmeldinger?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Send som samling"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Send enkeltvis"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrerer meldinger"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerer melding %1 av %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Flytter meldinger"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Sletter meldinger"
@@ -3634,30 +3646,30 @@
 msgid "Text Direction Toolbar"
 msgstr "Verktøylinje for tekstretning"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail er satt i frakoblet modus. Alle jobber som krever nettverk er satt på "
 "vent"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr ""
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr ""
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail er koblet til igjen. Alle jobber som krever nettverk er gjenopptatt"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3666,41 +3678,41 @@
 "KMail er satt til å være koblet til. Alle jobber som krever nettverk blir "
 "gjenopptatt når en nettverksforbindelse oppdages"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail er i frakoblet modus. Hvordan vil du fortsette?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Tilkoblet/Frakoblet"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Arbeid tilkoblet"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "Nettverksforbindelse er oppdaget, alle jobber som krever nettverk er "
 "gjenopptatt"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Ingen nettverksforbindelse funnet, alle jobber som krever nettverk er satt "
 "på vent"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3709,12 +3721,12 @@
 "Klarte ikke åpne autolagret fil ved %1.\n"
 "Årsak: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Klarte ikke åpne autolagret fil"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3723,7 +3735,7 @@
 msgstr[1] ""
 "Disse %1 identitetene er endret til å bruke standard meldingstransport:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3733,152 +3745,152 @@
 msgstr[1] ""
 "Disse %1 identitetene er endret til å bruke den endrede meldingstransporten:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Sender meldinger"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Starter sendeprosessen …"
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Ressursen %1 er ødelagt."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Postarkiv-agenten var ikke registrert."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Send senere-agenten var ikke registrert."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Agenten for påminnelse om oppfølging var ikke registrert."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-feil"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Klarte ikke å starte importveiviseren"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Klarte ikke starte programmet for PM-oppsettseksport. Kontroller "
-"installasjonen."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Klarte ikke å starte programmet for PIM-oppsettseksport"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr ""
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Det ble funnet et annet e-postprogram på systemet, Vil du importere data fra "
 "dette?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Klarte ikke starte importveiviseren. Kontroller installasjonen."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Intet emne"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(ingen maler)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Denne mappa har ingen innstillinger for foreldede meldinger"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Er du sikker på at du vil slette foreldede meldinger i mappa <b>%1</b>?</"
 "qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Slett foreldede meldinger i mappa"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Foreldet"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Tøm papirkurven"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Flytt til papirkurven"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Er du sikker på at du vil tømme papirkurven?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3887,27 +3899,27 @@
 "<qt>Er du sikker på at du vil flytte alle meldinger fra mappa <b>%1</b> til "
 "papirkurven?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Flytt alle meldingene til papirkurven"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Er du sikker på at du vil slette alle foreldede meldinger?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Slette foreldede meldinger?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Gjør foreldet"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3918,17 +3930,17 @@
 "søppelpost og kan øke risikoen for at systemet ditt blir overtatt av andre "
 "nåværende og framtidige utnyttelser av sikkerhetshull."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Laster eksterne referanser"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3943,531 +3955,531 @@
 "<qt>Er du sikker på at du vil slette de %1 valgte meldingene? <br />Når de "
 "er slettet, kan de ikke gjenopprettes.</qt> "
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Slett meldingene"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Slett melding"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Flytter meldinger …"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Sletter meldinger …"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Meldingene ble vellykket slettet."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Meldingene er flyttet."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Sletting av meldingene feilet."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Sletting av meldinger avbrutt."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Meldingene ble ikke flyttet."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Flytting av meldinger er avbrutt."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Flytt meldinger til mappe"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopierer meldinger …"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Meldingene er kopiert."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Meldingene ble ikke kopiert."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopiering av meldinger er avbrutt."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopier meldinger til mappe"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Flytter meldinger til papirkurven …"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr ""
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Meldingene er flyttet til papirkurven."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr ""
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Meldingene ble ikke flyttet til papirkurven."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Flytting av meldinger til papirkurven er avbrutt."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Hopp til mappe"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "&Lagre som …"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Slett &foreldede meldinger i alle mappene"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Sjekk &e-post"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Sjekk e-post i"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Sjekk e-post"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Send meldingene i &køen"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Tilkoblingsstatus (ukjent)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Send meldinger i køen via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Sertifikathåndterer"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importer meldinger …"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Feilsøk &sieve …"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filter&loggviser …"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Rediger fraværsmeldinger …"
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Tilpass automatisk arkivering …"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Utsatte meldinger …"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Påminnelsesmeldinger om oppfølging …"
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Slett"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "F&lytt tråd til papirkurven"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Flytt tråd til papirkurven"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Slett &tråd"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Finn meldinger …"
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Merk &alle meldinger"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Håndtering av &e-postliste …"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Tilegn snarvei …"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Utløpsinnstillinger"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arkiver mappe …"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Last E&ksterne referanser"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopier meldinger til …"
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Flytt melding til …"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Ny melding …"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Ny"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Melding fra &mal"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Ny melding til &e-post-liste …"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Lag filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filter på &emne …"
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filter på &avsender(e) …"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filter på &mottaker(e) …"
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr ""
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Merk &tråden"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Merk tråden som &lest"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Merk alle meldinger i den valgte tråden som leste"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Merk tråden som &ulest"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Merk alle meldinger i den valgte tråden som uleste"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Merk tråden som v&iktig"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Ta bort trådmerket &Viktig"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Merk tråden som &handlingspunkt"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Ta bort trådmerke for &handlingspunkt"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Overvåk tråd"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorer tråd"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Lagre vedlegg …"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Bruk alle &filtrene"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Fold ut tråden/gruppa"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Fold ut denne tråden eller gruppa"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Fold sammen tråden/gruppa"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Fold sammen denne tråden eller gruppa"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Fold ut &alle tråder"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Fold ut alle trådene i den åpne mappa"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Fold sammen a&lle tråder"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Fold sammen alle trådene i denne mappa"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Vis melding"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Neste melding"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Gå til neste melding"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Neste &uleste melding"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Neste"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Gå til neste uleste melding"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Forrige melding"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Gå til forrige melding"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Fo&rrige uleste melding"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Forrige"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Gå til forrige uleste melding"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Neste uleste &mappe"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Gå til neste mappe med uleste meldinger"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Forrige uleste ma&ppe"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Gå til forrige mappe med uleste meldinger"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Neste uleste &tekst"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Gå til neste uleste tekst"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4476,223 +4488,228 @@
 "Rull nedover den åpne meldinga. Hvis bunnen av meldinga vises, gå til neste "
 "uleste melding."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Tilpass &filtre …"
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Behandle &sieve-skript …"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "L&egg til konto …"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail-&velkomst"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Vis velkomstsiden til KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Oppsett av &påminnelser …"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Oppsett av &KMail …"
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Gjør foreldet …"
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Legg til favorittmappe …"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Abonnement på tjenersiden …"
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr ""
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr ""
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Ny adressebok-kontakt …"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopier melding til mappe"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Hopp til mappe …"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Avbryt denne handlinga"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Flytt fokus til neste mappe"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Flytt fokus til forrige mappe"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Velg mappe med fokus"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Fokus på første mappe"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Fokus på siste mappe"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Flytt fokus til neste melding"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Flytt fokus til forrige melding"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Velg første melding"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Velg siste melding"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Velg melding med fokus"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Sett fokus til hurtigsøk"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Utvid utvalget til forrige melding"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Utvid utvalget til neste melding"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Flytt melding til mappe"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr ""
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr ""
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Legg til favorittmappe"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Tøm papirkurven"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Flytt alle meldingene til &papirkurven"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Slett søk"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Rediger søk …"
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Angre"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Angre: «%1»"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr ""
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4703,12 +4720,12 @@
 "risikoen for at systemet ditt blir overtatt av andre nåværende og framtidige "
 "utnyttelser av sikkerhetshull."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Bruk HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4718,118 +4735,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Starter …"
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Flytt til &papirkurven"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Flytt meldinga til papirkurven"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Kan ikke kopiere element. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Ny melding til …"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Svar til …"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Send videre til …"
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Legg til eksisterende kontakt."
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Åpne i adresseboka"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Sett bokmerke for denne lenka"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Rediger kontakt …"
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Lagre lenke som …"
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Finn i melding …"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Lagre bilde på disk …"
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Vis HTML-format"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Vis i HTML-format når e-post kommer fra denne kontakten"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Last eksterne referanser når e-post kommer fra denne kontakten"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Del bilde …"
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4838,91 +4855,91 @@
 "KMail er nå basert på rammeverket Akonadi styring med personlig informasjon, "
 "noe som fører til mange endringer."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Skyv e-post (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Forbedret søk"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Støtte for å legge til notater (kommentarer) til e-poster"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Mindre frys i brukerflaten, e-postsjekk skjer i bakgrunnen"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr ""
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr ""
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr ""
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr ""
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr ""
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontakt vellykket endret"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nye meldinger i"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Det er ingen uleste meldinger"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4945,8 +4962,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5034,17 +5051,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Velg programtilleggssammendragene som skal vises på sammendragssiden."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontact-sammendrag"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontact-sammendrag"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "© 2004 Tobias Koenig"
@@ -5090,27 +5107,27 @@
 msgid "All"
 msgstr "Alt"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact-sammendrag"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Visning av kontact-sammendrag"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5138,7 +5155,7 @@
 msgid "&Reply"
 msgstr "&Svar"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Svar …"
@@ -5148,12 +5165,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Svar til avsen&der …"
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Svar til &alle …"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Svar til e-post-&lista …"
@@ -5183,7 +5200,7 @@
 msgid "&Edit As New"
 msgstr ""
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5374,113 +5391,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Finn meldinger"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Søk"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&I meldingsteksten …"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Som vedlegg …"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Lage vedlegg …"
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Tøm utvalg"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Hopp til opprinnelig mappe"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 samsvar"
 msgstr[1] "%1 samsvar"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Siste søk"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Du valgte ikke en gyldig mappe."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Du glemte å velge samlinger."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Du glemte å definere betingelse."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Alle mapper som er valgt er tomme, eller ble ikke indeksert."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Du glemte å legge til betingelser."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Inneholder-betingelsen kan ikke brukes med færre enn 4 tegn."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Søker …"
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Kan ikke hente søkeresultat. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Søket mislyktes."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Søk fullført."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Søk stoppet."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5490,21 +5507,21 @@
 "Det oppsto et problem med å omnavne søkemappa. En vanlig grunn for dette er "
 "at det finnes en annen søkemappe fra før, med samme navnet. Feilen var: «%1»."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Kopier melding"
 msgstr[1] "Kopier %1 meldinger"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Klipp ut melding"
 msgstr[1] "Klipp ut %1 meldinger"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr ""
@@ -5638,7 +5655,7 @@
 "bruk)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5646,7 +5663,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5655,26 +5672,26 @@
 "Denne verdien brukes for å avgjøre om du vil vise KMail-introduksjonen."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Vis redigeringslinje for hurtigsøk"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Videresending inni teksten som standard."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Si fra om antall adressater er større enn:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5685,19 +5702,19 @@
 "bekreftelse før e-posten sendes. Varselet kan slås av."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Stavekontroller før send"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Be automatisk om &meldingskvittering"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5713,13 +5730,13 @@
 "meldingskvittering</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Intervall for autolagring:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5731,151 +5748,151 @@
 "Du kan skru av autolagring ved å sette det til 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Vis i redigeringen håndtering av tekstbiter og innsettingspanel."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Når dette er valgt blir sendte meldinger lagret på kryptert form"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "En liste over alle nylig brukte URL-er"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "En liste over alle nylig brukte kodinger"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Vis etikettindikator for krypto"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Valider Send standard-snarvei"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Størrelse på identitetsdialogen (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Bredden på søkevinduet (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Høyden på søkevinduet (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Bredden på KMails oppsettsdialog (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Høyden på KMails oppsettsdialog (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Forhåndsvisningsrute"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Ingen forhåndsvisning av meldinger"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Forhåndsvisning nedenfor meldingslista"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Forhåndsvisning ved siden av meldingslista"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Mappeliste"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lang mappeliste"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kort mappeliste"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Meldingsmal for ny melding"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Meldingsmal for svar"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Meldingsmal for svar til alle"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Meldingsmal for videresending"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Sitattegn"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Oppgir hvilken praksis som brukes når praksis vises"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5883,7 +5900,7 @@
 msgstr "Oppgir bredden på samlingsfeltet i søkevinduet (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5891,7 +5908,7 @@
 msgstr "Oppgir bredden på emnefeltet i søkevinduet (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5899,7 +5916,7 @@
 msgstr "Oppgir bredden på avsenderfeltet i søkevinduet (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5907,7 +5924,7 @@
 msgstr "Oppgir bredden på adressatfeltet i søkevinduet (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5915,7 +5932,7 @@
 msgstr "Oppgir bredden på datofeltet i søkevinduet (bare for internt bruk)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6178,7 +6195,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6214,40 +6231,6 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
-"REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
-"\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Når det hoppes til neste "
-"uleste melding kan det hende at det ikke er flere uleste meldinger under "
-"gjeldende melding.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Ikke gå rundt:</span> Søket stopper ved siste melding i "
-"gjeldende mappe.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Gå rundt i denne mappa:</span> Søket fortsetter fra toppen av "
-"mappa, men går ikke videre til neste mappe.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Gå rundt i alle mapper:</span> Søket fortsetter fra toppen av "
-"mappa. Hvis det ikke er flere uleste meldinger, fortsetter søket til neste "
-"mappe med uleste meldinger./p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Likeså når du søker etter "
-"forrige uleste melding, vil søket bli startet fra bunnen av mappa og "
-"fortsette med forrige mappe, avhengig av hva du har valgt.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Gå rundt i alle merkede mapper: </span>Dette er det samme som "
-"«Gå rundt i alle mapper», unntatt at bare de mappene blir gjennomsøkt som "
-"har mappeegenskapen «Bruk på nye/uleste meldinger i denne mappa».</p></"
-"body></html>"
 
 #. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:64
@@ -6541,7 +6524,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
+msgid "Scan emails for tracking URLs"
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
@@ -7160,6 +7143,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Slå på alle «Ikke spør igjen» advarsler igjen"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
diff -Nru kmail-19.04.3/po/nb/ktnef.po kmail-19.12.3/po/nb/ktnef.po
--- kmail-19.04.3/po/nb/ktnef.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nb/ktnef.po	2020-03-03 00:34:09.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2013-09-27 17:27+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
diff -Nru kmail-19.04.3/po/nds/akonadi_archivemail_agent.po kmail-19.12.3/po/nds/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/nds/akonadi_archivemail_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nds/akonadi_archivemail_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2014-08-13 00:56+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -179,13 +179,13 @@
 "För dissen Orner kannst Du keen tweet Archiev tofögen, man ansteed dat "
 "vörhannen Archiev ännern."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "Dat gifft den Orner nich, prööv bitte de Instellen. Archiev achteranstellt."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Archiveren vun \"%1\" anfangen"
diff -Nru kmail-19.04.3/po/nds/akonadi_followupreminder_agent.po kmail-19.12.3/po/nds/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/nds/akonadi_followupreminder_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nds/akonadi_followupreminder_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2014-09-18 16:42+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -17,99 +17,99 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.4\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Antwoortnaricht-Anstoothölper"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, fuzzy, kde-format
 #| msgid "Follow Up Reminder Agent"
 msgid "Follow Up Reminder"
 msgstr "Antwoortnaricht-Anstoothölper"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, fuzzy, kde-format
 #| msgid "Copyright (C) 2014 Laurent Montel"
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2013, 2014 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Pleger"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Sönke Dibbern"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "s_dibbern@web.de"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Na"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Bedraap"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Frist"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Antwoort"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Kregen"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Anhollen"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Naricht wiesen"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Wegdoon"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Antwoort vun %1 kregen"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Du töövst jümmers noch op en Antwoort op dissen Nettbreef:"
diff -Nru kmail-19.04.3/po/nds/akonadi_mailfilter_agent.po kmail-19.12.3/po/nds/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/nds/akonadi_mailfilter_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nds/akonadi_mailfilter_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mailfilteragent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2014-03-13 16:34+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -24,17 +24,17 @@
 msgid "Filter Log Viewer"
 msgstr "Kieker för Filter-Logbook"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Filtervörgäng na't Logbook schrieven"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -44,23 +44,23 @@
 "Logbook-Indrääg warrt bloots schreven un wiest, wenn disse Optschoon anmaakt "
 "is."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Logbook-Enkelheiten"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Beschrieven för Logmuster"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Filter&regel-Pröven na't Logbook schrieven"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -74,34 +74,34 @@
 "Filterregel na't Logbook schreven; anners warrt bloots dat Resultaat vun all "
 "Regeln binnen een Filter opschreven."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Filtermuster-Pröven na't Logbook schrieven"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Filterakschonen na't Logbook schrieven"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Maximaal Logbookgrött:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " kB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "ahn Grenz"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -114,7 +114,7 @@
 "hier angeven, warrt so lang de öllsten Daten wegdaan, bet dat Logbook lütt "
 "noog is."
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -123,64 +123,64 @@
 "Datei \"%1\" lett sik nich schrieven.\n"
 "De Fehlerbeschrieven is: \"%2\""
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-Fehler"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Naricht %1 vun %2 warrt filtert"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, fuzzy, kde-format
 #| msgid "Error applying mail filter delete"
 msgid "Error applying mail filter move"
 msgstr "Fehler bi't Wegdoon vun den Nettpostfilter"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Fehler bi't Wegdoon vun den Nettpostfilter"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Fehler bi't Ännern vun den Nettpostfilter"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Filterregeln warrt pröövt:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filterregeln hebbt passt.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Filtern vun Naricht \"%1\" vun \"%2\" op \"%3\" fangt an:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Narichten warrt filtert"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Nettpost-Filterlogbook anmaakt"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Praat"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtert warrt binnen \"%1\""
diff -Nru kmail-19.04.3/po/nds/akonadi_sendlater_agent.po kmail-19.12.3/po/nds/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/nds/akonadi_sendlater_agent.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nds/akonadi_sendlater_agent.po	2020-03-03 00:34:09.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2014-08-21 16:35+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -60,57 +60,57 @@
 msgid "Your emails"
 msgstr "s_dibbern@web.de"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Na"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Bedraap"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Loosstüern üm un bi"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Wedderhalen"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Narichten-ID"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Dor töövt keen Naricht..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Nu loosstüern"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Wegdoon"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Jo"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nee"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected items? Do you want to continue?"
 msgid "Do you want to delete the selected item?"
@@ -118,68 +118,68 @@
 msgstr[0] "Wullt Du utsöchte Indrääg wegdoon? Wullt Du wiedermaken?"
 msgstr[1] "Wullt Du utsöchte Indrääg wegdoon? Wullt Du wiedermaken?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Indrääg wegmaken"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Wullt Du Narichten ok wegmaken?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Narichten wegmaken"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Keen Naricht funnen."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Keen Naricht funnen."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Fehler bi't Halen vun Narichten."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Naricht lett sik nich halen. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Överdreegmetood lett sik nich opstellen"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Naricht is keen rejell Naricht"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Naricht lett sik loosstüern."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Naricht loosstüert"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Dat geev en Fehler. Wullt Du dat nochmaal loosstüern?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Fehler funnen"
diff -Nru kmail-19.04.3/po/nds/kmail.po kmail-19.12.3/po/nds/kmail.po
--- kmail-19.04.3/po/nds/kmail.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nds/kmail.po	2020-03-03 00:34:09.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2014-08-15 15:47+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -194,8 +194,8 @@
 msgstr "Mehr Slötels för't Verslöteln per Adress"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -302,27 +302,27 @@
 "KMail hett binnen den Orner keen heel Nettpostlist funnen. Föög de Adressen "
 "bitte per Hand in."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Bruukgrenz"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Bruuk:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% vull"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 vun %2 bruukt"
@@ -345,7 +345,7 @@
 "dissen Orner bruken wullt.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Vörlagen"
@@ -356,108 +356,108 @@
 msgstr "Binnen dissen Orner egen Narichtenvörlagen &bruken"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Globaalvörlagen koperen"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Ansicht"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "&Egen Lüttbiller bruken"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normaal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Nich leest:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Senner/Adressaat-Striep in Narichtenlist wiesen"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Striep &wiesen:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Standard"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Senner"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Adressaat"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Narichtenlist"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Standard-Tosamenstellen bruken"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Tosamenstellen"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Standardmuster bruken"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Muster"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Standard-Narichtenformaat"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "HTML günt Eenfachtext vörtrecken"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &Plain Text to HTML"
 msgid "Prefer text to HTML"
 msgstr "&Eenfachtext günt HTML vörtrecken"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Use Global Setting"
 msgid "Use Global Settings"
@@ -468,104 +468,109 @@
 msgid "Retrieval Options"
 msgstr "Afhaal-Optschonen"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Identiteet"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Afhalen"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Loosstüern"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, fuzzy, kde-format
 #| msgid "IMAP server"
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "IMAP-Server"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Rutgahn Kontos (föög tominnst een to):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Allmeen Optschonen"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Ehr't Loosstüern nafragen"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Schriefwies pröven ehr loosstüert warrt"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nienich automaatsch"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Bi't Kieken vun Hand"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Bi all Kiekvörgäng"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Nu loosstüern"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Later loosstüern"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "N&arichten ut Postutgang loosstüern:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Standardmetood för't Loosstüern:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Konto tofögen"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "Kontoreeg topassen..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -574,30 +579,30 @@
 msgstr ""
 "De Kontohölper lett sik nich starten. Prööv bitte Dien Installatschoon."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Kontohölper lett sik nich starten."
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Bi't Kieken na Nettpost per Hand ok dit Konto pröven"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Bi't Utmaken vun KMail op Afkoppelbedrief wesseln"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Bi Programmstart na Nettpost kieken"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -657,7 +662,7 @@
 msgid "Fixed Width Font"
 msgstr "Fastbreed Schriftoort"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Narichteneditor"
@@ -961,61 +966,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Slötelwoort lett sik nich opstellen. Dat gifft dat Slötelwoort al."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Allmeen"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardvörlagen"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Egen Vörlagen"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Bedraap"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Tekensett"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Koppindrääg"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Bilagen"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Automaatsche Korrektuur"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Bildgrött automaatsch topassen"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Signatuur"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1024,12 +1029,12 @@
 "De instellte Signatuur automaatsch infögen,\n"
 "wenn Du anfangst un schriffst en niege Naricht."
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "De Signatuur baven vun all ziteert Text infögen"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1038,18 +1043,18 @@
 "Den Signatuurtrenner na RFC (twee Streek un en\n"
 "Freeteken) baven de Signatuur infögen"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Bi't Antern en vörhannen Signatuur nich ziteren"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formaat"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1060,7 +1065,7 @@
 "nich de hele Naricht, wenn binnen de Naricht\n"
 "Text markeert is."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1070,17 +1075,17 @@
 "Bi't Antern all ziteert Regen mit Zitaattekens anfangen, ok wenn de\n"
 "Reeg bloots bi't Infögen vun Reegümbröök opstellt wöör."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Automaatsch Reegümbrook bi de angeven Breed anmaken"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "De Textbreed för automaatsche Reegümbröök fastleggen"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1091,7 +1096,7 @@
 "ziteren, mit dat se ankamen is. Wenn nich anmaakt is de Anter\n"
 "standardwies normaal Text."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1102,34 +1107,34 @@
 "Fett, kursiev un ünnerstreken Text, Listen un extern Betöög\n"
 "warrt ünnerstütt."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Inbett"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "As Bilaag"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Dat Standardformaat för wiederleddt Narichten fastleggen"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Standardmetood bi't Wiederledden:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Adressaten"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1140,17 +1145,17 @@
 "Du kannst dat ok för enkelte Narichten maken, wenn Du \"Optschonen -> "
 "Narichtentostand-Bescheed anföddern\" bruukst."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Wohrschoen, wenn dat to vele Adressaten gifft"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "De Hööchsttall vun Adressaten för de Wohrschauen fastleggen"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1168,7 +1173,7 @@
 "vele Lüüd to.\n"
 "Man Verdeel- un Nettpostlisten reekt dat nich extra ut."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1177,18 +1182,18 @@
 "Annerlest ingeven Adressen wohren un\n"
 "bi't Kompletteren vun Adressaten anbeden"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Nich sekern"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Hööchsttall wohrt ingeven Adressen:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1197,25 +1202,25 @@
 "De hööchste Tall vun annerlest ingeven Adressen, de för't\n"
 "Kompletteren wohrt warrt"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Automaatsch Kompletteren instellen…"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Nich automaatsch sekern"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Nich automaatsch sekern"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1223,18 +1228,18 @@
 msgstr[0] " Minuut"
 msgstr[1] " Minuten"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "De Naricht jümmers automaatsch na disse Tiet sekern"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefi&xen för Bedraap in Antwoort-Narichten"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1243,59 +1248,59 @@
 "All vun disse Prefixen verarbeiden\n"
 "(Indrääg sünd regulere Utdrück ahn Groot-/Lüttschriev-Verscheel):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Tofögen..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Wegdoon"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Ä&nnern..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Nieg Antwoort-Prefix ingeven:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefixen för Bedraap in &wiederleddt Narichten"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Tofögen..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Wegdoon"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Ännern..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Nieg Wiederledd-Prefix ingeven:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1305,88 +1310,88 @@
 "warrt en Tekensett, de all bruukte Tekens bargt."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Ä&nnern..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Tekensett ingeven:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "Bi't Antern un Wiederledden &Orginaaltekensett bruken (wenn mööglich)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Disse Tekensett warrt nich ünnerstütt."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Egen Suffix för Naricht-ID bruken"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Egen Suffix för Naricht-&ID:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Egen MIME-Koppregen angeven:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Naam"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Weert"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Nieg"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Naam:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Weert:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "Leeg Datum"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Bilagen kompatibel to Outlook nömen"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1395,39 +1400,39 @@
 "Maak dit an, wenn ok Outlook(tm) de Bilagennaams mit Sünnertekens verstahn "
 "schall."
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Op fehle&n Bilagen pröven"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Na Bilagen söken, wenn sik een vun disse Slötelwöör findt:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Nieg Slötelwoort ingeven:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Hett en Bilaag"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Keen Grenz"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1522,7 +1527,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Narichteneditor"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1640,7 +1645,7 @@
 msgid "Archive Folder"
 msgstr "Orner archiveren"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1706,19 +1711,19 @@
 msgid "Notification"
 msgstr "Bescheed"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 Bilaag (%2)"
 msgstr[1] "%1 Bilagen (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Bilagenlist versteken"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Bilagenlist wiesen"
@@ -1735,334 +1740,334 @@
 msgid "Encoding"
 msgstr "Koderen"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Söök dat Klookschriever-Wöörbook för disse Naricht ut."
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Den Orner för loosstüert Narichten utsöken, binnen den en Kopie vun disse "
 "Naricht wohrt warrt"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Söök dat Loosstüerkonto för disse Naricht ut."
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "De \"Vun\"-Adress för disse Naricht fastleggen"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Bedraap för de Naricht fastleggen"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identiteet:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Wöörbook:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Orner för &loosstüert Narichten:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Nettpost-Överdreeg&metood:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Vun:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Bedraap:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "Nettbreef &loosstüern"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Nettbreef &loosstüern över"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Loosstüern"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "L&ater loosstüern"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "L&ater loosstüern över"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Na Postutgang"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "As \"Nich far&dig\" sekern"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Nettbreef binnen den Orner för nich fardig Nettbreven sekern"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "As &Vörlaag sekern"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Nettbreef binnen Vörlagenorner sekern"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "As &Datei sekern"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Nettbreef as Text- oder HTML-Datei sekern"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Textdatei &infögen…"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Tolest bruukt Textdatei in&fögen"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adressbook"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Adressbook opmaken"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nieg Nettbreef"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Ad&ressaten utsöken…"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "&Verdeellist sekern…"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "As Bilaag infö&gen"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Twischenrüü&m kloormaken"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "&Fastbreed Schriftoort bruken"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Hilt"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Na&richtentostand-Bescheed anföddern"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "Na&richtentostand-Bescheed anföddern"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Reegü&mbrook"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Snippels"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "S&chriefwies automaatsch pröven"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Formaattext bruken"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Formaattext"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Formaattext an- oder utmaken"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "All &Feller"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identiteet"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Wöörbook"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Orner för &loosstüert Narichten"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Nettpost-Öv&erdreegmetood"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Vun"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Be&draap"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Signat&uur anhangen"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Signatuur &vöransetten"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Signatuur bi &Blinkerpositschoon infögen"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Klookschriever..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Klookschriever"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Naricht &verslöteln"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Verslöteln"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Naricht ü&nnerschrieven"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Ünnerschrieven"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Verslötel&formaat"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "En Verslötelformaat för disse Naricht utsöken"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "Naricht &söken..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMail instellen..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2071,53 +2076,53 @@
 "<qt>Dit verstickt den Menübalken heel un deel. Du kannst em mit %1 wedder "
 "wiesen.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Menübalken versteken"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Reeg: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Striep: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "Övr"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "Inf"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Klookschriever: An"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Klookschriever: Ut"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "&Nochmaal as Vörlaag sekern"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "As \"Nich fardig\" &sekern"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2126,7 +2131,7 @@
 "Sekert disse Naricht binnen den Vörlagenorner, Du kannst ehr denn later "
 "bruken."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2135,84 +2140,84 @@
 "Sekert disse Naricht binnen den Orner \"Nich fardig\", Du kannst ehr later "
 "bewerken un loosstüern."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Wullt Du de Naricht för later wohren oder ehr wegsmieten?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Editor tomaken"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Naricht lett sik nich automaatsch sekern."
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Naricht lett sik nich loosstüern."
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Dateiinholt infögen"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "As B&innenreeg-Bild tofögen"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "As &Bilaag tofögen"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Naam vun de Bilaag:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "Leeg Datum"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "URL de Naricht tofögen"
 msgstr[1] "URLs de Naricht tofögen"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Datei as &Bilaag tofögen"
 msgstr[1] "Dateien as &Bilaag tofögen"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Twischenaflaag-Inholt as Bilaag bifögen"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "ahn Naam"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2225,12 +2230,12 @@
 "Verslötelslötel för angeven.</p><p>Söök de Slötels, de Du bruken wullt, "
 "bitte binnen de Identiteet-Instellen ut.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Keen Slötel för't Verslöteln angeven"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2242,12 +2247,12 @@
 "p><p>Söök den Slötel, den Du bruken wullt, bitte binnen de Identiteet-"
 "Instellen ut.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Keen Ünnerschriftslötel angeven"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2258,7 +2263,7 @@
 "Dien Nettpostadressen för all Identiteten fastleggen, denn bruukst Du ehr "
 "nich för elk Naricht nieg ingeven."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2267,37 +2272,37 @@
 "Du muttst tominnst een Adressaat binnen de Feller \"Na:\", \"Kopie:\" oder "
 "\"Blindkopie:\" angeven."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Dat Feld \"Na:\" is leddig. Wullt Du de Naricht liekers loosstüern?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Keen Adressaat angeven"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du hest keen Bedraap angeven. Wullt Du de Naricht liekers loosstüern?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Keen Bedraap angeven"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Ahn Ännern loos&stüern"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Bedraap angeven"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2306,22 +2311,22 @@
 "Du muttst tominnst een Adressaat angeven, dormit Du en nich fardig Naricht "
 "verslöteln kannst."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Naricht warrt nößen loosstüert..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Bescheed loosstüern"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Nu &loosstüern"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2330,22 +2335,22 @@
 "Du stüerst den Nettbreef mehr as %1 Adressaten to. Wullt Du liekers "
 "wiedermaken?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "To vele Adressaten"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Ahn Ännern &loosstüern"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Adressaten &bewerken"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2354,43 +2359,43 @@
 "Wenn Du den HTML-Bedrief utmaakst, kaamt den Text sien Formateren weg. Wullt "
 "Du dat?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Formateren wegmaken?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Formateren wegmaken"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Schriftsatzkode as eenfach Text tofögen"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2398,7 +2403,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2478,27 +2483,27 @@
 msgid "External editor was started."
 msgstr "Extern Editor wöör opropen."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Keen Archievorner angeven. Prööv bitte de Instellen för't Konto „%1“"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Keen Archievorner angeven. Prööv bitte de Instellen för't Konto „%1“"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2526,11 +2531,6 @@
 msgid "Message will not be encrypted"
 msgstr "Naricht warrt nich verslötelt"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Textsnippels"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2575,27 +2575,27 @@
 msgid "Cannot move messages."
 msgstr "Narichten laat sik nich verschuven."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Orner lett sik nich halen. Fehlermellen: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Keen Orner torüchgeven."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Böverorner lett sik nich halen. Fehlermellen: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Ornerlist lett sik nich halen."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Narichten wöörn archiveert"
@@ -2637,50 +2637,50 @@
 msgid "&Existing identities:"
 msgstr "&Vörhannen Identiteten:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Fehler bi't Ümnömen vun den Orner \"%1\""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Nieg Slötelwoort ingeven:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Identiteet bewerken"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Allmeen"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Dien Naam:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2692,12 +2692,12 @@
 "p><p>Wenn Du hier nix angiffst, warrt Dien Reaalnaam nich opduken, bloots de "
 "Nettpostadress.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&satschoon:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2709,12 +2709,12 @@
 "p><p>Dat maakt nix (un is ok normaal), wenn Du dit Feld leddig lettst.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "N&ettpostadress:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2729,12 +2729,12 @@
 "Adressen to.</p><p>Wenn Du dit Feld leddig lettst oder en Fehler maakst, "
 "köönt de Lüüd Di nich antern.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Nettpost-A&liasen:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2750,12 +2750,12 @@
 "tr><tr><th>Aliasen:</th><td>naam@bispill.org<br>tonaam@bispill.org</td></"
 "tr></table><p>Giff een Alias-Adress per Reeg in.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Verslöteln"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2777,12 +2777,12 @@
 "anröögt.</p><p>Mehr Informatschonen över Slötels findt sik op <a>http://www."
 "gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-Ünnerschriftslötel:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2807,12 +2807,12 @@
 "warrt dor nich vun anröögt.</p><p>Mehr Informatschonen över Slötels findt "
 "sik op <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-Slötel för't Verslöteln:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2825,12 +2825,12 @@
 "KMail kann denn Narichten nich digitaal mit S/MIME ünnerschrieven. De "
 "normalen Nettpostfunkschonen warrt dor nich vun anröögt.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-Ünnerschriftzertifikaat:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2846,40 +2846,40 @@
 "MIME verslöteln. De normalen Nettpostfunkschonen warrt dor nich vun anröögt."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-Zertifikaat för't Verslöteln:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Vörtrocken Formaat:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Narichten automaatsch ünnerschrieven"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Narichten jü&mmers verslöteln wenn mööglich"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Verwiedert"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "\"&Antern Na\"-Adress:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2897,12 +2897,12 @@
 "för den Koppel geiht.</p><p>Wenn Du nich seker büst, laat dat Feld leddig.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&Kopie(\"CC\")-Adressen:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2920,12 +2920,12 @@
 "Adressen mit Kommas.</p><p>Wenn Du nich seker büst, laat dat Feld leddig.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Blindkopie(\"BCC\")-Adressen:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2943,57 +2943,57 @@
 "Blindkopie-Adressaat angeven wullt, trenn de Adressen mit Kommas.</p><p>Wenn "
 "Du nich seker büst, laat dat Feld leddig</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Wöörbook:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Orner för &loosstüert Narichten:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Orner för Nich &fardige:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Vörlagenorner:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Loosstüerkonto:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Mien VCard de Naricht bileggen"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Opstellen..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Autom. Korrektuurspraak:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Standard-Domäännaam wedderherstellen"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "S&tandard-Domään:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3002,33 +3002,33 @@
 "<qt><p>Mit de Standarddomään warrt Nettpostadressen vull maakt, de bloots "
 "den Brukernaam bargt.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "För disse Identiteet egen Narichtenvörlagen &bruken"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signatuur"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Bild"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Leeg Nettpost-Alias: \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Leeg Nettpostadress"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3041,7 +3041,7 @@
 "Ünnerschriften, de mit de disse Instellen opstellt warrt, köönt bi de "
 "Adressaten bi't Pröven vun de Ünnerschrift to Wohrschoen föhren."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3050,7 +3050,7 @@
 "Een vun de instellten OpenPGP-Slötels för't Verslöteln bargt keen Bruker-ID "
 "mit de Nettpostadress, de för disse Identiteet (%1) instellt is."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3063,7 +3063,7 @@
 "Ünnerschriften, de mit de disse Instellen opstellt warrt, köönt bi de "
 "Adressaten bi't Pröven vun de Ünnerschrift to Wohrschoen föhren."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3072,22 +3072,22 @@
 "Een vun de instellten S/MIME-Verslötelzertifikaten bargt de Nettpostadress "
 "nich, de för disse Identiteet (%1) instellt is."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Nettpostadress nich in Slötel/Zertifikaat"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "De Signatuurdatei is leeg."
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Identiteet \"%1\" bewerken"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3100,7 +3100,7 @@
 "Narichten nich (mehr), ansteed warrt de Standardorner för nich fardig "
 "Narichten bruukt."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Bewerken..."
@@ -3132,6 +3132,21 @@
 msgid "We cannot delete vCard file."
 msgstr "VCard-Datei lett sik nich wegmaken."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgctxt "@info"
+#| msgid "Do you really want to remove group \"%1\"?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Wullt Du Koppel \"%1\" redig wegmaken?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Bescheed loosstüern"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3297,7 +3312,7 @@
 "Bispelen gifft dat op <a href=\"http://ace.home.xs4all.nl/X-Faces/\">http://"
 "ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Bild"
@@ -3330,7 +3345,7 @@
 msgstr[0] "Verdeellist \"%2\" is leddig un lett sik nich bruken."
 msgstr[1] "Verdeellisten \"%2\" sünd leddig un laat sik nich bruken."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Na Adressbook tofögen"
@@ -3340,22 +3355,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakt mit Spood opstellt"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "De Kontakt lett sik nich sekern: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Kontakt lett sik nich sekern."
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Wullt Du den Orner \"%1\" anfögen?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Orner anfögen"
@@ -3573,7 +3588,7 @@
 msgstr "&Orner"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3581,7 +3596,7 @@
 msgstr "All Fi&ltern för Orner bruken"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current Folder & All Subfolders"
@@ -3608,7 +3623,7 @@
 msgstr "&Wiederledden"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Filter bruken"
@@ -3633,7 +3648,7 @@
 msgstr "&Hülp"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Hööft-Warktüüchbalken"
@@ -3690,12 +3705,12 @@
 msgid "The file does not contain a message."
 msgstr "De Datei bargt keen Naricht."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "De Datei bargt mehr as een Naricht, bloots de eerste warrt wiest."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3704,32 +3719,32 @@
 "Wullt Du de utsöchten Narichten as Bilagen in een Naricht (as MIME-"
 "Tosamenfaten) oder as enkelte Narichten wiederledden?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "As Tosamenfaten"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Enkelte Narichten"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Narichten warrt filtert"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Naricht %1 vun %2 warrt filtert"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Narichten warrt verschaven"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Narichten warrt wegdaan"
@@ -3758,32 +3773,32 @@
 msgid "Text Direction Toolbar"
 msgstr "Textricht-Warktüüchbalken"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail is op Afkoppelbedrief sett, all Nettwarkakschonen sünd torüchstellt."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Naricht warrt nößen loosstüert..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail is op Tokoppelbedrief sett, all Nettwarkakschonen warrt wedder "
 "opnahmen."
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3792,39 +3807,39 @@
 "KMail is op Tokoppelbedrief sett, all Nettwarkakschonen warrt wedder "
 "opnahmen, sodraad en Nettwarkverbinnen opdeckt warrt."
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail is opstunns in Afkoppelbedrief. Wodennig wullt Du wiedermaken?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "To-/Afkoppelt"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Tokoppeln"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Afkoppeln"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "Nettwarkverbinnen opdeckt, all Nettwarkakschonen warrt wedder opnahmen."
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Keen Nettwarkverbinnen opdeckt, all Nettwarkakschonen sünd torüchstellt."
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3833,12 +3848,12 @@
 "Autom. sekert Datei bi %1 lett sik nich opmaken.\n"
 "Oorsaak: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Autom. sekert Datei lett sik nich opmaken."
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3848,7 +3863,7 @@
 msgstr[1] ""
 "Disse %1 Identiteten wöörn ännert, se bruukt nu de Standard-Överdreegmetood:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3858,44 +3873,47 @@
 msgstr[1] ""
 "Disse %1 Identiteten wöörn ännert, se bruukt nu de ännerte Överdreegmetood:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Narichten warrt loosstüert"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Loosstüerperzess warrt torechtmaakt..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Ressource \"%1\" is schaadhaftig."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Nettpost-Archiveerhölper weer nich inmeldt."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Later-Loosstüerhölper weer nich inmeldt"
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Send Later Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr "Later-Loosstüerhölper weer nich inmeldt"
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3904,12 +3922,12 @@
 msgstr ""
 "De Zertifikaatpleger lett sik nich starten, bitte prööv Dien Installatschoon."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-Fehler"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3918,26 +3936,30 @@
 msgstr ""
 "De Importhölper lett sik nich starten. Prööv bitte Dien Installatschoon."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Importhölper lett sik nich starten."
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Dat PIM-Instellen-Exportprogramm lett sik nich starten. Prööv bitte Dien "
 "Installatschoon."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "PIM-Instellen-Exportprogramm lett sik nich starten."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3946,72 +3968,72 @@
 msgstr ""
 "De Importhölper lett sik nich starten. Prööv bitte Dien Installatschoon."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Importhölper lett sik nich starten."
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Op dat Systeem gifft noch en anner Nettpostgrogramm. Wullt Du dor Daten vun "
 "importeren?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "De Importhölper lett sik nich starten. Prööv bitte Dien Installatschoon."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Keen Bedraap"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(keen Vörlagen)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "För dissen Orner is keen Wohrtiet fastleggt"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Büst Du seker, wat Du ole Narichten binnen <b>%1</b> wegdoon wullt?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Ole Narichten ut Orner wegdoon"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Ole Narichten wegdoon"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Affalltünn leddig maken"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Na de Affalltünn verschuven"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Büst Du seker, wat Du den Affall-Orner leddig maken wullt?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4020,27 +4042,27 @@
 "<qt>Büst Du seker, wat Du all Narichten ut den Orner <b>%1</b> na de "
 "Affalltünn verschuven wullt?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "All Narichten na Affalltünn verschuven"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Büst Du seker, wat Du all ole Narichten wegdoon wullt?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Ole Narichten wegdoon?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Wegdoon"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4051,17 +4073,17 @@
 "Warven daalsetten un maakt de Riskanz grötter, dat aktuelle un tokamen "
 "Sekerheitlöcker utnütt un Dien Reekner dor bi schaadt warrt."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Sekerheitwohrschoen"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Extern Dateien laden"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4076,539 +4098,539 @@
 "<qt>Wullt Du de %1 utsöchten Narichten redig wegdoon?<br />Du kannst se denn "
 "nich mehr wedderherstellen.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Narichten wegdoon"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Naricht wegdoon"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Narichten warrt verschaven..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Narichten warrt wegdaan..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Narichten mit Spood wegdaan"
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Narichten mit Spood verschaven."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Wegdoon vun Narichten fehlslaan"
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Wegdoon vun Narichten afbraken"
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Verschuven vun Narichten fehlslaan"
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Verschuven vun Narichten afbraken"
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Narichten na Orner verschuven"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Narichten warrt kopeert..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Narichten mit Spood kopeert."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Koperen vun Narichten fehlslaan."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Koperen vun Narichten afbraken."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Narichten na Orner koperen"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Narichten warrt na de Affalltünn verschaven..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Narichten warrt na de Affalltünn verschaven..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Narichten mit Spood na de Affalltünn verschaven."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Narichten mit Spood na de Affalltünn verschaven."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Verschuven vun Narichten na de Affalltünn fehlslaan."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Verschuven vun Narichten na de Affalltünn fehlslaan."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Verschuven vun Narichten na de Affalltünn afbraken."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Verschuven vun Narichten na de Affalltünn afbraken."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Na Orner jumpen"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Sekern &as..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Ole Narichten ut all Ornern wegdoon"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Na Nett&post kieken"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Na Nettpost kieken binnen"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Na Nettpost kieken"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Narichten ut Postutgang &loosstüern"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Tokoppel-Status (nich begäng)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Narichten ut Postutgang loosstüern över"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Zertifikaatpleger"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "Narichten &importeren..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Fehlersöök för Sieve-Filtern..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filter-&Logbookkieker..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Annerwarts-Bescheden bewerken..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Automaatsch Archiveren &instellen..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "Narichten warrt wegdaan..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "Naricht &söken..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Wegdoon"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Klöönsnack na de Affalltünn versch&uven"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Klöönsnack na de Affalltünn verschuven"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Klöönsnack wegd&oon"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Naricht &söken..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "&All Narichten utsöken"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Nettpost&list-Pleeg..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "T&astkombinatschoon towiesen..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Wo&hrtiet instellen"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Archievorner..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "E&xtern Dateien daalladen"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Naricht koperen na..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Naricht verschuven na..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nieg Naricht..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nieg"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Naricht ut &Vörlaag"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nieg Naricht na Nett&postlist..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Filter opstellen"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Op &Bedraap filtern..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Op &Senner filtern..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Op &Adressaat filtern..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Op &Adressaat filtern..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "&Klöönsnack markeren"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Klöönsnack as &leest markeren"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "All Narichten binnen den utsöchten Klöönsnack as leest markeren"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Klöönsnack as n&ich leest markeren"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "All Narichten binnen den utsöchten Klöönsnack as nich leest markeren"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Klöönsnack as &wichtig markeren"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "&Wichtig-Mark vun Klöönsnack wegmaken"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Klöönsnack as &Akschoon markeren"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "&Akschoon-Mark vun Klöönsnack wegmaken"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Klöönsnack &beluern"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Klöönsnack ö&vergahn"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Bi&lagen sekern..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Indrag koperen na..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "All Fi&ltern bruken"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Klöönsnack oder Koppel &utfoolden"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Dissen Klöönsnack oder Koppel utfoolden"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Klöönsnack oder Koppel &tosamenfoolden"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Dissen Klöönsnack oder Koppel tosamenfoolden"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "All Klöönsnacks ut&foolden"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "All Klöönsnacks binnen dissen Orner utfoolden"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "All Klöönsnacks tosa&menfoolden"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "All Klöönsnacks binnen dissen Orner tosamenfoolden"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Naricht &wiesen"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Nakamen Naricht"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Na de nakamen Naricht gahn"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Nakamen n&ich leest Naricht"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Nakamen"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Na de nakamen nich leest Naricht gahn"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Verleden Naricht"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Na de verleden Naricht gahn"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Ve&rleden nich leest Naricht"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Verleden"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Na de verleden nich leest Naricht gahn"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Nakamen nich leest &Orner"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Na den nakamen Orner mit nich leeste Narichten gahn"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Verleden nich leest O&rner"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Na den verleden Orner mit nich leeste Narichten gahn"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Nakamen nich leest &Text"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Na den nakamen nich leesten Text gahn"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4617,222 +4639,228 @@
 "Binnen de Naricht na nerrn rullen. An't Enn vun de Naricht na de nakamen "
 "nich leeste Naricht gahn."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "&Filtern instellen..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "&Sieve-Skripten plegen..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Konto tofögen"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Inföhren för KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "KMail sien Willkamen-Schirm wiesen"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "&Bescheden instellen..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "KMail &instellen..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Wohrtiet..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Leestekenorner tofögen..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Bestellen op den Server..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "All Fi&ltern bruken"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "KMail-Daten &exporteren..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nieg Adressbook-Kontakt..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Naricht na Orner koperen"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Na Orner jumpen..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Aktuell Akschoon afbreken"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Nakamen Orner"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Verleden Orner"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Aktuell Orner utsöken"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Eerst Orner"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Lest Orner"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Nakamen Naricht"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Verleden Naricht"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Eerst Naricht utsöken"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Lest Naricht utsöken"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Akuelle Naricht utsöken"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Blinker na Fixsöök setten"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Verleden Naricht mit na Köör opnehmen"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Nakamen Naricht mit na Köör opnehmen"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Naricht na Orner verschuven"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message Window"
 msgid "Use Less Bandwidth"
 msgstr "Narichtenfinster"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Instellen"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity account"
+msgid "Restart Account"
+msgstr "Identiteet för dat Konto"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Leestekenorner tofögen"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Affalltünn &leddig maken"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "All Narichten na de &Affalltünn verschuven"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Söök we&gdoon"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Söök bewerken..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Torüchnehmen"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Torüchnehmen: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4840,7 +4868,7 @@
 msgid "Search... <%1>"
 msgstr "Söken...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4851,12 +4879,12 @@
 "un maakt de Riskanz grötter, dat aktuelle un tokamen Sekerheitlöcker utnütt "
 "un Dien Reekner dor bi schaadt warrt."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML bruken"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4866,119 +4894,119 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "&Afbreken"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Oproop..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Na de Affalltünn &verschuven"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Na de Affalltünn"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Naricht na de Affalltünn verschuven"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Indrag lett sik nich koperen. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Niege Naricht na..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Antern na..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Wiederledden na..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Na vörhannen Kontakt tofögen"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "In Adressbook opmaken"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Link de Leestekens tofögen"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Kontakt bewerken..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Link sekern as..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "Binnen Naricht &söken..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Bild op Fastplaat sekern..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "HTML-Formaat wiesen"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Bi Nettbreven vun dissen Kontakt HTML-Formaat bruken"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Bi Nettbreven vun dissen Kontakt extern Dateien daalladen"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Bild delen..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4987,70 +5015,70 @@
 "KMail buut nu op den Akonadi-Pleger för persöönliche Informatschonen op, wat "
 "en helen Barg vun Ännern mit sik bringt."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Nettpost överdregen (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Verbetert Söken"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Nettbreven laat sik Notizen (Anmarken) tofögen"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "De Böversiet freert nich mehr so faken in, dat Kieken na Nettpost löppt in'n "
 "Achtergrund"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "Ünnerstütten för GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "Ehr't Loosstüern Schriefwies pröven"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE-Nettpostprogramm"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "Orner-Egenschappen waart haalt"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Bitte töven"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "afkoppelt"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5064,7 +5092,7 @@
 "Bedrief. Klick <a href=\"kmail:goOnline\">hier</a>, wenn Du Di tokoppeln "
 "wullt…</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5078,22 +5106,22 @@
 "Afkoppel-Bedrief. Klick <a href=\"kmail:goResourceOnline\">hier</a>, wenn Du "
 "dat tokoppeln wullt…</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontakt mit Spood ännert"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nieg Narichten in"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Dat gifft keen nich leeste Narichten."
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5116,8 +5144,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5212,19 +5240,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Kontakten"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5273,28 +5301,28 @@
 msgid "All"
 msgstr "All"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2010, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© 1997-2010, de Schrieverslüüd vun KMail"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5322,7 +5350,7 @@
 msgid "&Reply"
 msgstr "&Antern"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Antern..."
@@ -5332,12 +5360,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Den S&chriever antern..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "A&ll antern..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "De &Nettpostlist antern..."
@@ -5368,7 +5396,7 @@
 msgid "&Edit As New"
 msgstr "Naricht &bewerken"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5566,113 +5594,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Söök fehlslaan. Fehlers opdeckt: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Narichten söken"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Söken"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Inbett..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "As &Bilaag..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Bilagen sekern..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Köör opheven"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Na Orginaalorner jumpen"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 Övereenstimmen"
 msgstr[1] "%1 Övereenstimmen"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Verleden Söök"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Du hest nix utsöcht, dat as Orner gellt."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Du hest keen Sammeln utsöcht."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Du hest keen Bedingen fastleggt."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "All utsöcht Ornern sünd leddig oder nich indizeert."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Du hest keen Bedingen fastleggt."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Bargt-Bedingen lett sik mit weniger as 4 Tekens nich bruken."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Bi to söken..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Söökresultaat lett sik nich halen. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Söök fehlslaan"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Söök afslaten."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Söken anhollen."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5682,21 +5710,21 @@
 "Dien Söökorner lett sik nich ümnömen. Dat bedüüdt faken, dat gifft al en "
 "anner Söökorner mit den sülven Naam. Fehlermellen: \"%1\""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Naricht koperen"
 msgstr[1] "%1 Narichten koperen"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Naricht knippen"
 msgstr[1] "%1 Narichten knippen"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5833,7 +5861,7 @@
 "Gifft an, wat dat Programm dat eerste Maal löppt (bloots för intern Bruuk)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5841,7 +5869,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5850,26 +5878,26 @@
 "Över dissen Weert warrt fastleggt, wat de Inföhren för KMail wiest warrt."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Ingaavreeg för Orner-Fixsöök wiesen"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Inbett wiederledden as Standard bruken"
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Wohrschoen, wenn de Tall vun Adressaten grötter is as:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5881,19 +5909,19 @@
 "utmaken."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Ehr't Loosstüern Schriefwies pröven"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "&Narichttostand-Bescheden automaatsch anföddern"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5909,13 +5937,13 @@
 "<em>Narichttostand-Bescheed anföddern</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Tiet för't automaatsche Sekern"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5927,151 +5955,151 @@
 "Weert 0 maakt de Funkschoon ut."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "De Textsnippel-Pleeg un dat Inföögpaneel binnen den Editor wiesen"
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Wenn anmaakt, warrt loosstüert Narichten verslötelt wohrt"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "All tolest bruukt Adressen oplisten"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "All tolest bruukt Koderen oplisten"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Verslötelnmark wiesen"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Standard-Loosstüertastkombinatschoon beglöven"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "De Grött vun den Identitetendialoog (bloots för intern Bruuk)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "De Söökfinsterbreed (bloots för intern Bruuk)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "De Söökfinsterhööchd (bloots för intern Bruuk)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "De Breed vun den KMail-Instellendialoog (bloots för intern Bruuk)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "De Hööchd vun den KMail-Instellendialoog (bloots för intern Bruuk)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Narichten-Vöransichtpaneel"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Keen Vöransichtpaneel bruken"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Vöransichtpaneel nerrn de Narichtenlist wiesen"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Vöransichtpaneel blang de Narichtenlist wiesen"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Ornerlist"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lang Ornerlist"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kort Ornerlist"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Narichtenvörlaag för nieg Naricht"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Narichtenvörlaag för Antwoort"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Narichtenvörlaag för Antwoort na all"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Narichtenvörlaag för Wiederledden"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Zitaattekens"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Gifft de Regel för't Wiesen vun en Regel an"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6081,7 +6109,7 @@
 "intern Bruuk)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6091,7 +6119,7 @@
 "intern Bruuk)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6101,7 +6129,7 @@
 "intern Bruuk)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6111,7 +6139,7 @@
 "intern Bruuk)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6121,7 +6149,7 @@
 "intern Bruuk)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6392,10 +6420,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6765,10 +6830,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Na Nettpost kieken binnen"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7390,6 +7454,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "All \"Nich nochmaal fragen\"-Wohrschoen wedder anmaken"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7447,6 +7521,14 @@
 msgid "Zoom: %1%"
 msgstr "Ansichtgrött"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Textsnippels"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Na Nettpost kieken binnen"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Ornernaam un -grött, wenn dicht bi de Bruukgrenz"
 
@@ -10169,10 +10251,6 @@
 #~ "><warning>Dat Wegmaken lett sik nich torüchnehmen.</warning>"
 
 #~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Wullt Du Koppel \"%1\" redig wegmaken?"
-
-#~ msgctxt "@info"
 #~ msgid ""
 #~ "Do you really want to remove snippet \"%1\"?<nl/><warning>There is no way "
 #~ "to undo the removal.</warning>"
@@ -11185,9 +11263,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Fastleggen, wat dat Konto de Standard-Identiteet bruukt"
 
-#~ msgid "Identity account"
-#~ msgstr "Identiteet för dat Konto"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "RID-Padd na't Postfach, dat Du op Ännern beluern wullt"
 
diff -Nru kmail-19.04.3/po/nds/ktnef.po kmail-19.12.3/po/nds/ktnef.po
--- kmail-19.04.3/po/nds/ktnef.po	2019-07-09 00:20:25.000000000 +0000
+++ kmail-19.12.3/po/nds/ktnef.po	2020-03-03 00:34:09.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2014-03-27 22:28+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
diff -Nru kmail-19.04.3/po/nl/akonadi_archivemail_agent.po kmail-19.12.3/po/nl/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/nl/akonadi_archivemail_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nl/akonadi_archivemail_agent.po	2020-03-03 00:34:10.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-29 11:40+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -176,12 +176,12 @@
 "Kan geen tweede archief voor deze map toevoegen. Wijzig in plaats daarvan de "
 "bestaande."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Map bestaat niet. controleer instellingen. Archiveren uitgesteld."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Begin met archiveren van %1"
diff -Nru kmail-19.04.3/po/nl/akonadi_followupreminder_agent.po kmail-19.12.3/po/nl/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/nl/akonadi_followupreminder_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nl/akonadi_followupreminder_agent.po	2020-03-03 00:34:10.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-29 11:41+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -17,97 +17,97 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agent voor herinneren aan vervolgactie"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Herinneren aan vervolgactie"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Onderhouder"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Freek de Kruijf - t/m 2019"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "freekdekruijf@kde.nl"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Aan"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Uiterste tijdstip"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Antwoord"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Ontvangen"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "In de wacht"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Bericht tonen"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Wilt u dit geselecteerde item verwijderen?"
 msgstr[1] "Wilt u deze %1 geselecteerde items verwijderen?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Antwoord van %1 ontvangen"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "U wacht nog steeds op een antwoord op dit e-mailbericht:"
diff -Nru kmail-19.04.3/po/nl/akonadi_mailfilter_agent.po kmail-19.12.3/po/nl/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/nl/akonadi_mailfilter_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nl/akonadi_mailfilter_agent.po	2020-03-03 00:34:10.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-09-29 10:12+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -23,17 +23,17 @@
 msgid "Filter Log Viewer"
 msgstr "Viewer voor filterlog"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Delen..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Filteractiviteiten vastleggen"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -42,23 +42,23 @@
 "Hier kunt u het vastleggen van filteractiviteiten aan- of uitzetten. Er "
 "worden alleen gegevens verzameld en getoond wanneer deze optie aan staat. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Logdetails"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Patroonbeschrijving vastleggen"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Evaluatie filte&rregels vastleggen"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -72,34 +72,34 @@
 "over iedere filterregel. U kunt ook instellen dat alleen het resultaat van "
 "alle regels in een afzonderlijk filter wordt vastgelegd."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Evaluatie filterpatronen vastleggen"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Filteracties vastleggen"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Maximale loggrootte:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " kB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "onbeperkt"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -112,7 +112,7 @@
 "wanneer de hoeveelheid gegevens te groot wordt zullen de oudste gegevens "
 "verwijderd worden zodat die grens niet wordt overschreden. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -121,63 +121,63 @@
 "Kon bestand %1 niet schrijven:\n"
 "\"%2\" is de gedetailleerde foutbeschrijving."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail - foutmelding"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Bericht %1 van %2 wordt gefilterd"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Fout bij het toepassen van verplaatsen met e-mailfilter"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Fout bij het toepassen van verwijderen met e-mailfilter"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Fout bij het toepassen van wijzigingen met e-mailfilter"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Filterregels evalueren</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filterregels kwamen overeen.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Filtering beginnen op bericht \"%1\" van \"%2\" op \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Berichten filteren"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "E-mail filterlog ingeschakeld"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Gereed"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filteren in %1"
diff -Nru kmail-19.04.3/po/nl/akonadi_sendlater_agent.po kmail-19.12.3/po/nl/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/nl/akonadi_sendlater_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nl/akonadi_sendlater_agent.po	2020-03-03 00:34:10.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-12-29 11:42+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -59,124 +59,124 @@
 msgid "Your emails"
 msgstr "freekdekruijf@kde.nl"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Aan"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Verzenden omstreeks"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Periodiek"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Bericht-id"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Er wachten geen berichten..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Nu verzenden"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Ja"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nee"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Wilt u het geselecteerde item verwijderen?"
 msgstr[1] "Wilt u de geselecteerde items verwijderen?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Items verwijderen"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Wilt u de berichten ook verwijderen?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Berichten verwijderen"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Geen bericht gevonden."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Geen bericht gevonden."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Fout bij ophalen van bericht."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Kan bericht niet ophalen. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Transport aanmaken lukt niet"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Bericht is geen echt bericht"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Kan bericht niet verzenden."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Bericht verzonden"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Er is een fout gevonden Wilt u het opnieuw verzenden?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Fout gevonden"
diff -Nru kmail-19.04.3/po/nl/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/nl/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/nl/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nl/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:10.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-08 10:37+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Geünificeerde e-mailvak %1 wordt gesynchroniseerd"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Een geünificeerde e-mailbox toevoegen"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Naam:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Pictogram kiezen..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Pictogram:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Postvak in"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Verzonden"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Concepten"
diff -Nru kmail-19.04.3/po/nl/docs/akonadi_archivemail_agent/index.docbook kmail-19.12.3/po/nl/docs/akonadi_archivemail_agent/index.docbook
--- kmail-19.04.3/po/nl/docs/akonadi_archivemail_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/nl/docs/akonadi_archivemail_agent/index.docbook	2020-03-03 00:34:21.000000000 +0000
@@ -41,9 +41,9 @@
 >&FDLNotice;</legalnotice>
 
 <date
->2013-08-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.11</releaseinfo>
+>Applications 19.12</releaseinfo>
 </articleinfo>
 
 <sect1 id="introduction">
@@ -61,9 +61,9 @@
 <para
 >Gebruik <menuchoice
 ><guimenu
->Hulpmiddelen</guimenu
+>Instellingen</guimenu
 ><guimenuitem
->Automatisch archiveren instellen...</guimenuitem
+>Automatisch archiveren configureren...</guimenuitem
 > </menuchoice
 ><action
 > in het leesvenster van &kmail; om een dialoog te openen om automatisch archivering van e-mailmappen in te stellen.</action
@@ -109,7 +109,7 @@
 >, het pad van de geselecteerde map in de mappenlijst van &kmail;, de datum in het format <userinput
 >jaar-maand-dag</userinput
 > en de geselecteerde bestandsextensie &eg; <filename
->Archive_Lokale mappen_postvak-in_2013-09-03.tar.bz2</filename
+>Archive_Local mappen_postvak-in_2019-09-03.tar.bz2</filename
 >. </para
 ></listitem>
 <listitem
@@ -164,6 +164,18 @@
 <para
 >U kunt het keuzevakje links van elk item in de lijst gebruiken om deze taak in of uit te schakelen. </para>
 <para
+>Het is mogelijk om tot deze configuratiedialoog elk moment later toegang te krijgen met <menuchoice
+><guimenu
+>Instellingen</guimenu
+> <guimenuitem
+>&kmail; instellen...</guimenuitem
+></menuchoice
+> selectaar daarna de pagina <guilabel
+>Plug-ins</guilabel
+> in het hoofdventser van &kmail; en druk op de configuratieknop tegen het item <guilabel
+>Mailagent archiveren</guilabel
+>. </para>
+<para
 >Met het contextmenu, dat komt na met &RMB; klikken op een archiveringstaak, kunt u de map openen met de archieven of de archiveringstaak onmiddellijk starten. Dit overschrijft een bestaand eerder op dezelfde dag aangemaakt archief zonder melding. </para>
 
 </sect2>
@@ -176,9 +188,9 @@
 <para
 >&i18n-archivemailagent;</para>
 <para
->Programma copyright 2013 Laurent Montel montel@kde.org </para>
+>Programma copyright 2013-2019 Laurent Montel montel@kde.org </para>
 <para
->Documentatie Copyright &copy; 2013 Laurent Montel montel@kde.org </para>
+>Documentatie Copyright &copy; 2013-2019 Laurent Montel montel@kde.org </para>
 
 &meld.fouten;&vertaling.freek; &underFDL; &underGPL; </sect2>
 
diff -Nru kmail-19.04.3/po/nl/docs/akonadi_followupreminder_agent/index.docbook kmail-19.12.3/po/nl/docs/akonadi_followupreminder_agent/index.docbook
--- kmail-19.04.3/po/nl/docs/akonadi_followupreminder_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/nl/docs/akonadi_followupreminder_agent/index.docbook	2020-03-03 00:34:21.000000000 +0000
@@ -33,9 +33,9 @@
 </copyright>
 
 <date
->2014-06-10</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.14</releaseinfo>
+>Applications 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -46,6 +46,78 @@
 <para
 >&i18n-followupreminderagent; is een akonadi-agent die e-mail voor herinneringen over vervolgacties behandelt </para>
 
+<sect2 id="using-kapp">
+<title
+>&i18n-followupreminderagent; gebruiken</title>
+
+<para
+>De <menuchoice
+><guimenu
+>Opties</guimenu
+><guimenuitem
+>Opvolgherinneraar</guimenuitem
+></menuchoice
+> in het compositievenster van &kmail; om een dialoog te openen die u biedt om een herinnering te maken om aan uw huidige e-mail op een specifieke datum een vervolg te geven.</para>
+
+<screenshot>
+<screeninfo
+>&i18n-followupreminderagent; dialoog</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="add-followup-reminder.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>&i18n-followupreminderagent; dialoog</phrase>
+    </textobject>
+    <caption>
+      <para
+>&i18n-followupreminderagent; dialoog</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+<para
+>Druk op de toets pijltje omlaag tegen het <guilabel
+>Datum</guilabel
+>veld om de datum uit het &kde; agendawidget te selecteren. Het is ook mogelijk uw agenda te kiezen voor de herinnering met de afrollijst <guilabel
+>Taak opslaan in</guilabel
+>.</para>
+<para
+>Om herinneringen die u hebt gepland te verwijderen, gebruik <menuchoice
+><guimenu
+>Instellingen</guimenu
+> <guimenuitem
+>&kmail; configureren...</guimenuitem
+></menuchoice
+> selecteer daarna de pagina <guilabel
+>Plug-ins</guilabel
+> in &kmail; en druk op de configuratieknop tegen het item <guilabel
+>Agent voor herinneren aan vervolgactie</guilabel
+>. Gebruik daarna het contextmenu gestart met een &RMB; klik om een herinneringsitem om de <guimenuitem
+>Verwijderen</guimenuitem
+>actie te selecteren . </para>
+
+<screenshot>
+<screeninfo
+>&i18n-followupreminderagent; configureren</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="followupreminder-configure.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>&i18n-followupreminderagent; configureren</phrase>
+    </textobject>
+    <caption>
+      <para
+>&i18n-followupreminderagent; configureren</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+</sect2>
+
 <sect2 id="credits">
 
 <title
@@ -54,9 +126,9 @@
 <para
 >&i18n-followupreminderagent;</para>
 <para
->Programma copyright 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Programma copyright 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Documentatie Copyright &copy; 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Documentatie Copyright &copy; 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 &meld.fouten;&vertaling.freek; &underFDL; &underGPL; </sect2>
 
diff -Nru kmail-19.04.3/po/nl/docs/akonadi_sendlater_agent/index.docbook kmail-19.12.3/po/nl/docs/akonadi_sendlater_agent/index.docbook
--- kmail-19.04.3/po/nl/docs/akonadi_sendlater_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/nl/docs/akonadi_sendlater_agent/index.docbook	2020-03-03 00:34:21.000000000 +0000
@@ -43,9 +43,9 @@
 </copyright>
 
 <date
->2013-11-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.12</releaseinfo>
+>Applications 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -112,9 +112,13 @@
 ><guimenu
 >Instellingen</guimenu
 > <guimenuitem
->Agent voor later verzenden instellen...</guimenuitem
+>&kmail; configureren...</guimenuitem
 ></menuchoice
-> in &kmail;. </para>
+> en selecteer de pagina <guilabel
+>Plug-ins</guilabel
+> in &kmail; en druk op de configuratieknop tegen het item <guilabel
+>Agent voor later verzenden</guilabel
+>. </para>
 
 <screenshot>
 <screeninfo
@@ -150,9 +154,9 @@
 <para
 >&i18n-sendlateragent;</para>
 <para
->Programma copyright 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Programma copyright 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Documentatie Copyright &copy; 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Documentatie Copyright &copy; 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 &meld.fouten;&vertaling.freek; &underFDL; &underGPL; </sect2>
 
diff -Nru kmail-19.04.3/po/nl/kmail.po kmail-19.12.3/po/nl/kmail.po
--- kmail-19.04.3/po/nl/kmail.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nl/kmail.po	2020-03-03 00:34:10.000000000 +0000
@@ -12,20 +12,20 @@
 # Kristof Bal <kristof.bal@gmail.com>, 2009.
 # Jaap Woldringh <jjh.woldringh@planet.nl>, 2009, 2011.
 # Hannie Dumoleyn <hannie@kde.nl>, 2011.
-# Freek de Kruijf <freekdekruijf@kde.nl>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
+# Freek de Kruijf <freekdekruijf@kde.nl>, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-03-09 12:26+0100\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2020-02-14 13:12+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 18.12.2\n"
+"X-Generator: Lokalize 19.12.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #, kde-format
@@ -124,7 +124,7 @@
 #: aboutdata.cpp:85 aboutdata.cpp:89 aboutdata.cpp:93
 #, kde-format
 msgid "Former core developer"
-msgstr "Voormalig kernontwikkelaar"
+msgstr "Voormalige kernontwikkelaar"
 
 #: aboutdata.cpp:97
 #, kde-format
@@ -201,8 +201,8 @@
 msgstr "Meerdere cryptografische sleutels per adres"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -308,27 +308,27 @@
 "KMail kon geen discussiegroep volledig herkennen in deze map. Vul a.u.b. de "
 "adressen handmatig in."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% vol"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 van %2 gebruikt"
@@ -351,7 +351,7 @@
 "toets(e)n die u aan deze map wilt koppelen.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Sjablonen"
@@ -362,106 +362,106 @@
 msgstr "Aangepaste berichtsjablonen gebr&uiken in deze map"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "Globale sjablonen &kopiëren"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Weergave"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Aangepaste p&ictogrammen gebruiken"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normaal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Ongelezen:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Kolom Afzender/geadresseerde tonen in berichtenlijst"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Kolo&m tonen:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Standaard"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Afzender"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Ontvanger"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Berichtenlijst"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Standaard samenvoeging gebruiken"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Samenvoeging"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Standaard thema gebruiken"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Thema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Standaardopmaak van bericht"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "HTML boven tekst verkiezen"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Voorkeur voor tekst boven HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Globale instellingen gebruiken"
@@ -471,100 +471,105 @@
 msgid "Retrieval Options"
 msgstr "Opties voor ophalen"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identiteiten"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Ontvangen"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Verzenden"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "LDAP-server"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Uitgaande accounts (voeg tenminste één account toe):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Algemene opties"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Ver&zending bevestigen"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Spellingcontrole uitvoeren voor het verzenden"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nooit automatisch"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Bij handmatige berichtencontroles"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Bij alle berichtencontroles"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Nu verzenden"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Later verzenden"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Berichte&n in postvak-uit verzenden:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Standaar&d verzendwijze:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Ongedaan maken activeren"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "E-mailaccount toevoegen..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Eigen account..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -573,30 +578,30 @@
 "De account-assistent kon niet worden gestart. Ga na dat AccountWizard op de "
 "juiste manier is geïnstalleerd."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Account-assistent kon niet worden gestart"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Meenemen in handmatige berichtencontrole"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Offline zetten bij afsluiten van KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Berichten ophalen bij opstarten"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -654,7 +659,7 @@
 msgid "Fixed Width Font"
 msgstr "Vaste letterbreedte"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Opsteller"
@@ -963,61 +968,61 @@
 msgstr ""
 "Er kan geen tag aangemaakt worden. Een tag met dezelfde naam bestaat al."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Algemeen"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standaardsjablonen"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Aangepaste sjablonen"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Tekenset"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Berichtkoppen"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Bijlagen"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autocorrectie"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Afbeeldingsgrootte automatisch wijzigen"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Ondertekening"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1026,12 +1031,12 @@
 "Automatisch de ingestelde ondertekening invoegen\n"
 "bij het starten van het maken van een bericht"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "De ondertekening boven eventueel aangehaalde tekst plaatsen"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1040,18 +1045,18 @@
 "Voeg de scheidingsregel van de ondertekening volgens de RFC-standaard\n"
 "(twee mintekens en een spatie op één regel) in voor de ondertekening"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Haal geen bestaande ondertekening aan bij antwoorden"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Opmaak"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1062,7 +1067,7 @@
 "(in plaats van het gehele bericht), wanneer\n"
 "er tekst is geselecteerd in het berichtenvenster."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1075,17 +1080,17 @@
 "extra\n"
 "regelafbreekteken bij het afbreken van de tekstregel."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Automatische regelafbreking inschakelen op de ingestelde breedte"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "De tekstbreedte voor automatische regelafbreking instellen"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1097,7 +1102,7 @@
 "Indien niet geactiveerd, wordt het antwoord standaard\n"
 "als platte tekst aangemaakt."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1108,34 +1113,34 @@
 "Vet, cursief en onderstreepte tekst, lijsten en externe verwijzingen\n"
 "worden ondersteund."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Inline"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Als bijlage"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "De standaard voor opmaak van een doorgestuurd bericht instellen"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Standaard type voor doorsturen:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Ontvangers"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1146,17 +1151,17 @@
 "U kunt dit op basis van per-bericht doen met \"Opties - Ontvangstbevestiging "
 "vragen\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Waarschuwen als er te veel geadresseerden zijn opgegeven"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Maximum aantal geadresseerden voor de waarschuwing instellen"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1173,7 +1178,7 @@
 "mensen te voorkomen. Denk er echter aan dat dit geen rekening houdt met\n"
 "e-maillijsten."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1182,18 +1187,18 @@
 "Recente ingevoerde adressen herinneren\n"
 "en bied ze aan voor aanvullen van geadresseerden"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Niet opslaan"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Maximum aantal onthouden recente adressen:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1202,23 +1207,23 @@
 "Het maximum aantal recent ingevoerde adressen die onthouden\n"
 "zullen worden voor aanvullen"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Aanvullen instellen..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Automatisch opslaan"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Niet automatisch opslaan"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1226,18 +1231,18 @@
 msgstr[0] " minuut"
 msgstr[1] " min"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Sla het bericht automatisch op op dit ingestelde interval"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "&Onderwerpvoorvoegsel voor beantwoordde berichten"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1246,59 +1251,59 @@
 "De volgende voorvoegsels herkennen\n"
 "(dit zijn hoofdletterongevoelige reguliere expressies):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Toevoegen..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Verwij&deren"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Wijz&igen..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Nieuw antwoordvoorvoegsel invoeren:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Onder&werpvoorvoegsel voor doorgestuurde berichten"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Toevoegen..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Verwijderen"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Wijzigen..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Nieuw voorvoegsel voor doorgestuurde berichten invoeren:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1308,72 +1313,72 @@
 "gezocht naar een tekenset die alle benodigde tekens bevat."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Wijzigen..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Tekenset invoeren:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Originele te&kenset behouden bij beantwoorden en doorsturen (indien mogelijk)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Deze tekenset wordt niet ondersteund."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Aangepast message-id achtervoegsel gebr&uiken"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Aangepast message-&id achtervoegsel:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definieer hier uw eigen mime-velden:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Naam"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Waarde"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "Nieu&w"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Naam:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Waarde:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
@@ -1381,17 +1386,17 @@
 "'Content-Type' is een niet geautoriseerde tekenreeks. Deze header zal niet "
 "worden opgeslagen."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Ongeldige header"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Namen voor bijlagen compatibel met Outlook(tm)"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1400,40 +1405,40 @@
 "Zet deze optie aan om ervoor te zorgen dat Outlook(tm) de namen van bijlagen "
 "begrijpt die niet-West-Europese tekens bevatten"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Detectie van ontbrekende bijlagen activere&n"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Herken een van de volgende trefwoorden als een intentie om een bestand bij "
 "te voegen:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Nieuw trefwoord invoeren:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Maximale grootte van bijlage:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Geen limiet"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1520,8 +1525,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "Tekst-plug-ins voor converteren"
+msgid "Text Conversion Plugins"
+msgstr "Plug-ins voor tekstconversie"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1635,7 +1640,7 @@
 msgid "Archive Folder"
 msgstr "Map archiveren"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1701,19 +1706,19 @@
 msgid "Notification"
 msgstr "Melding"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 bijlage (%2)"
 msgstr[1] "%1 bijlagen (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Lijst van bijlagen verbergen"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Lijst van bijlagen tonen"
@@ -1730,335 +1735,335 @@
 msgid "Encoding"
 msgstr "Codering"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Het te gebruiken woordenboek selecteren waarmee de spelling van dit bericht "
 "wordt gecontroleerd"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "De verzonden-map selecteren waar een kopie van dit bericht zal worden "
 "opgeslagen"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 "Selecteer het te gebruiken uitgaande account voor het verzenden van dit "
 "bericht"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Stel het \"Van:\" e-mailadres in voor dit bericht"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Onderwerp van dit bericht instellen"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identiteit:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "Woor&denboek:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Map voor ver&zonden berichten:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "E-&mailtransport:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Van:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Onderwerp:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "E-mail ver&zenden"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "E-mail verzenden &via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Verzenden"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "&Later verzenden"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "&Later verzenden via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "In wachtrij zetten"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Op&slaan als concept"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "E-mailbericht opslaan in map Concepten"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Opslaan als s&jabloon"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "E-mailbericht opslaan in map sjablonen"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Opslaan naar &bestand"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "E-mailbericht opslaan als tekst of html-bestand"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Tekstbestand &invoegen..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Recent tekstbestand &invoegen"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adresboek"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Adresboek openen"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nieuw bericht"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Gead&resseerden selecteren..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "&Distributielijst opslaan..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Als bijla&ge plakken"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Spaties &comprimeren"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Vast lettertype gebr&uiken"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgent"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Ontvan&gstbevestiging verzoeken"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Afleverbevestiging ve&rzoeken"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Regela&fbreking"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Fragmenten"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatische spellingcontrole"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Bewerking van opgemaakte tekst"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Opgemaakte tekst"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Schakel bewerking van modus opgemaakte tekst om"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Alle vel&den"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identiteit"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "Woor&denboek"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Map met ver&zonden berichten"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "E-&mailtransport"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Van"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Onderwerp"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Handtekening &achteraan toevoegen"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Handtekening &vooraan toevoegen"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Handtekening op c&ursorpositie invoegen"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Spellingcontrole..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Spellingcontrole"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Bericht v&ersleutelen"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Versleutelen"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Bericht onderte&kenen"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Ondertekenen"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Cryptografisch berichtformaat"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Een versleutelingsindeling selecteren voor dit bericht"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Herinneren aan vervolgactie aanmaken..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMail instellen..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2067,53 +2072,53 @@
 "<qt>Hierdoor wordt de menubalk geheel verborgen. U kunt die weer zichtbaar "
 "maken door %1 te typen.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Menubalk verbergen"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Regel: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolom: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INV"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Spellingcontrole: aan"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Spellingcontrole: uit"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Opnieuw opslaan als &sjabloon"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Op&slaan als concept"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2122,7 +2127,7 @@
 "Bericht opnieuw opslaan in de sjabloonmap. Het kan dan op een ander tijdstip "
 "gebruikt worden."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2131,82 +2136,82 @@
 "Bewaar dit bericht in de map Concepten. Deze kunnen nog worden bewerkt en op "
 "een later tijdstip verzonden."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Wilt u het bericht verwerpen of opslaan voor later?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Opsteller afsluiten"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Automatisch opslaan van bericht is mislukt"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Verzenden van bericht is mislukt"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Bestand invoegen"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Als &inline-afbeelding toevoegen"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Als bijl&age toevoegen"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Naam van de bijlage:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Naam van bijlage mag niet leeg zijn"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Ongeldige naam van bijlage"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "URL toevoegen aan bericht"
 msgstr[1] "URL's toevoegen aan bericht als &tekst"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Bestand als bijl&age toevoegen"
 msgstr[1] "Bestanden als bijl&age toevoegen"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Inhoud klembord als bijlage toevoegen"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "naamloos"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2219,12 +2224,12 @@
 "(OpenPGP of S/MIME).</p> <p>Selecteer a.u.b. de te gebruiken sleutel(s) in "
 "de identiteitsinstellingen.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Niet gedefinieerd versleutelingtype"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2235,12 +2240,12 @@
 "MIME-sleutel opgeven die hiervoor kan worden gebruikt.</p> <p>Selecteer a.u."
 "b. de te gebruiken sleutel(s) in de identiteitsinstellingen.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Niet gedefinieerde sleutel voor ondertekening"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2251,7 +2256,7 @@
 "mailadressen voor alle identiteiten instellen, zodat u die niet voor ieder "
 "bericht hoeft in te voeren."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2259,37 +2264,37 @@
 msgstr ""
 "U moet tenminste één geadresseerde opgeven in het veld Aan-, CC- of BCC-veld."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Het Aan:-veld is leeg. Het bericht toch verzenden?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Geen Aan: opgegeven"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Er is geen onderwerp opgegeven. Het bericht toch verzenden?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Geen onderwerp opgegeven"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Zo &verzenden"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Onderwerp opgeven"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2298,22 +2303,22 @@
 "U moet tenminste één geadresseerde opgeven om een concept te kunnen "
 "versleutelen."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Staat op het punt een bericht te verzenden..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Bevestiging verzenden"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Nu ver&zenden"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2322,22 +2327,22 @@
 "U probeert een bericht toe te sturen aan meer dan %1 geadresseerden. Moet "
 "het bericht wel worden verstuurd?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Te veel geadresseerden"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Zo &verzenden"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Geadresseerden b&ewerken"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2346,22 +2351,22 @@
 "HTML-modus uitschakelen veroorzaakt dat de tekst alle opmaak verliest. Echt "
 "doen?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Opmaak verliezen?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Losse opmaak"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Markering als platte tekst toevoegen"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2370,7 +2375,7 @@
 "Voor deze ontvanger zal hoge beveiligingsversleuteling worden gebruikt (de "
 "encryptiesleutel is volledig vertrouwd). Klik op het pictogram voor details."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2380,7 +2385,7 @@
 "(de encryptiesleutel is marginaal vertrouwd). Klik op het pictogram voor "
 "details."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2389,7 +2394,7 @@
 "Voor deze ontvanger zal lage beveiligingsversleuteling worden gebruikt (de "
 "encryptiesleutel wordt niet vertrouwd) Klik op het pictogram voor details."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2400,7 +2405,7 @@
 "beveiliging van de encryptie is onbekend (de encryptiesleutel kon niet "
 "geverifieerd worden). klik op het pictogram voor details."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Plug-in-informatie over bewerker"
@@ -2478,7 +2483,7 @@
 msgid "External editor was started."
 msgstr "Externe editor is gestart."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2487,20 +2492,20 @@
 "Identiteit is niet gevonden. Ga na dat u een juist e-mailtransport zal "
 "gebruiken."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Verzendmap niet gedefinieerd. Stel het in alvorens de e-mail te verzenden."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 "Identiteit is niet gevonden. Ga na dat u een juiste identiteit zal gebruiken."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2529,11 +2534,6 @@
 msgid "Message will not be encrypted"
 msgstr "Het bericht zal niet worden versleuteld"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Tekstfragmenten"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2579,27 +2579,27 @@
 msgid "Cannot move messages."
 msgstr "Kan berichten niet verplaatsen."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Map ophalen is mislukt. Gerapporteerde fout: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Geen map teruggegeven."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Ophalen van bovenliggende map lukt niet. Gerapporteerde fout: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Lijst met mappen teruggeven lukt niet."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Berichten gearchiveerd"
@@ -2640,48 +2640,48 @@
 msgid "&Existing identities:"
 msgstr "&Bestaande identiteiten:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Fout bij genereren van nieuw sleutelpaar: %1 "
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Fout bij aanmaken van sleutel"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Geen sleutel"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Een nieuw sleutelpaar genereren"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Bezig een nieuw sleutelpaar aan te maken..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Identiteit bewerken"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Algemeen"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "N&aam:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2692,12 +2692,12 @@
 "in de kop van de berichten die u verzendt.</p> <p>Als u dit veld leeglaat, "
 "zal uw echte naam niet worden genoemd, maar alleen het e-mailadres.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&satie:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2708,12 +2708,12 @@
 "wilt laten vermelden in de kop van de berichten die u verzendt.</p> "
 "<p>Gewoonlijk wordt dit veld leeg gelaten.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-mailadres:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2729,12 +2729,12 @@
 "leeg laat, of er een onjuist e-mailadres inzet,  kunnen de personen aan wie "
 "u een e-mail stuurt deze niet beantwoorden.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "E-mail&alias:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2751,12 +2751,12 @@
 "th><td>eerste@example.org<br>laatste@example.org</td></tr></table><p>Typ één "
 "aliasadres per regel.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Cryptografie"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2772,12 +2772,12 @@
 "hinder van ondervinden.</p><p>U vindt meer informatie over sleutels op "
 "<a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-ondertekeningssleutel:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2795,12 +2795,12 @@
 "hier geen hinder van ondervinden.</p><p>U vindt meer informatie over "
 "sleutels op <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-versleutelingssleutel:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2813,12 +2813,12 @@
 "maar KMail zal dan niet uw berichten digitaal ondertekenen met S/MIME. "
 "Normale e-mailfuncties zullen hier geen hinder van ondervinden.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-ondertekeningscertificaat:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2834,39 +2834,39 @@
 "berichten naar uzelf te versleutelen met S/MIME. Dit heeft geen invloed op "
 "de overige e-mailfuncties.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-versleutelingscertificaat:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Voorkeursformaat:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Berichten automatisch ondertekenen"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Berichten automatisch versleutelen, indien mogelijk"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Antwoo&rdadres:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2884,12 +2884,12 @@
 "mailadres wordt gestuurd.</p><p>Als u twijfelt, laat dan dit veld leeg.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&Cc-adressen:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2906,12 +2906,12 @@
 "<p>Om meer dan één adres op te geven scheidt u de geadresseerden door een "
 "komma.</p><p>Als u twijfelt, laat dit veld dan leeg.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC-adres:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2930,57 +2930,57 @@
 "geadresseerden gescheiden door een komma.</p><p>Als u twijfelt, laat dit "
 "veld dan leeg.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "W&oordenboek:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Map voor verzonden berich&ten:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Map voor concepten:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Sja&bloonmap:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Uitgaand account:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Mijn vCard in bericht bijvoegen"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Aanmaken..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Autocorrectietaal:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Standaard domeinnaam herstellen"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "S&tandaarddomein:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2989,33 +2989,33 @@
 "<qt> <p>Het standaard domein wordt gebruikt om e-mailadressen die alleen "
 "bestaan uit een gebruikersnaam aan te vullen.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Aangepaste berichtsjablonen gebr&uiken voor deze identiteit"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Handtekening"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Afbeelding"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Ongeldige e-mailalias \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Ongeldig e-mailadres"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3028,7 +3028,7 @@
 "Dit kan leiden tot waarschuwingen aan de kant van de ontvanger wanneer u "
 "probeert om handtekeningen te verifiëren met deze instellingen."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3037,7 +3037,7 @@
 "Één van de ingestelde OpenPGP-sleutels voor versleuteling bevat geen "
 "gebruikers-id met een e-mailadres voor deze identiteit (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3050,7 +3050,7 @@
 "Dit kan leiden tot waarschuwingen aan de kant van de ontvanger wanneer u "
 "probeert om handtekeningen te verifiëren met deze instellingen."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3059,22 +3059,22 @@
 "Één van de ingestelde S/MIME-versleutelingscertificaten bevat geen ingesteld "
 "e-mailadres voor deze identiteit (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-mailadres werd niet gevonden in sleutels/certificaten"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Het handtekeningsbestand is ongeldig"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Identiteit \"%1\" bewerken"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3083,7 +3083,7 @@
 "Enige eigen mappen voor identiteit bestaan niet (meer); in plaats daarvan "
 "zullen de standaard mappen worden gebruikt."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Bewerken..."
@@ -3114,6 +3114,18 @@
 msgid "We cannot delete vCard file."
 msgstr "vCard-bestand verwijderen kan niet."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Wilt u annuleren?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Bevestiging"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3280,7 +3292,7 @@
 "Voorbeelden zijn beschikbaar op <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Afbeelding"
@@ -3314,7 +3326,7 @@
 msgstr[1] ""
 "De distributielijsten %2 zijn leeg, deze kunnen niet worden gebruikt."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Toevoegen aan adresboek"
@@ -3324,22 +3336,22 @@
 msgid "Contact created successfully"
 msgstr "Contactpersoon met succes aangemaakt."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Contactpersoon kan niet opgeslagen worden: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Contactpersoon opslaan is mislukt"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Wilt u deze map '%1' bijvoegen?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Map bijvoegen"
@@ -3553,14 +3565,14 @@
 msgstr "Ma&p"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Filters op map toepassen"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3586,7 +3598,7 @@
 msgstr "&Doorsturen"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "F&ilter toepassen"
@@ -3611,7 +3623,7 @@
 msgstr "&Help"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Hoofdwerkbalk"
@@ -3664,14 +3676,14 @@
 msgid "The file does not contain a message."
 msgstr "Het bestand bevat geen bericht."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "Dit bestand bevat meerdere berichten. Alleen het eerste bericht wordt "
 "weergegeven."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3680,32 +3692,32 @@
 "Wilt u de geselecteerde berichten als bijlagen in één bericht doorsturen "
 "(als een MIME-bundel) of elk bericht apart?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Als bundel versturen"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Individueel versturen"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Berichten filteren"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Bericht %1 van %2 wordt gefilterd"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Berichten worden verplaatst"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Berichten worden verwijderd"
@@ -3734,28 +3746,28 @@
 msgid "Text Direction Toolbar"
 msgstr "Werkbalk voor tekstrichting"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail is ingesteld op de offline-modus. Alle netwerktaken zijn uitgesteld"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "E-mail verzenden"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Verzenden van een e-mail is onmogelijk"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail is ingesteld op de online-modus. Alle netwerktaken worden hervat"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3764,37 +3776,37 @@
 "KMail is ingesteld op de online-modus; alle netwerktaken worden hervat "
 "wanneer een netwerkverbinding wordt gedetecteerd"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail bevindt zich in de offline-modus. Hoe wilt u verdergaan?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Online werken"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Offline werken"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Netwerkverbinding gedetecteerd, alle netwerktaken worden hervat"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Geen netwerkverbinding gedetecteerd, alle netwerktaken zijn uitgesteld"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3803,12 +3815,12 @@
 "Openen van bestand voor automatisch opslaan in %1 is mislukt.\n"
 "Reden: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Openen van het bestand voor automatisch opslaan is mislukt"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3820,7 +3832,7 @@
 "Deze %1 identiteiten zijn veranderd zodat ze gebruik maken van het standaard "
 "transport:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3832,43 +3844,47 @@
 "Deze %1 identiteiten zijn veranderd zodat ze gebruik maken van het "
 "aangepaste transport:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Berichten worden verzonden"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Verzendproces wordt geïnitialiseerd..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Hulpbron %1 is gebroken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Hulpbron %1 is gebroken.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Archiveringsagent voor e-mail was niet geregistreerd"
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Agent voor later verzenden is niet geregistreerd."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Agent voor herinneren aan vervolgactie is niet geregistreerd."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3877,12 +3893,12 @@
 "Het certificaatbeheer kon niet worden gestart; ga na dat Kleopatra op de "
 "juiste manier is geïnstalleerd."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail - foutmelding"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3891,26 +3907,26 @@
 "De assistent voor importeren kon niet worden gestart. Ga na dat ImportWizard "
 "op de juiste manier is geïnstalleerd."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "De assistent voor importeren kon niet worden gestart"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Kon het \"PIM-exportprogramma van instellingen\" niet starten. Controleer uw "
+"Kon het \"PIM-exportprogramma van gegevens\" niet starten. Controleer uw "
 "installatie."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Kon \"PIM-exportprogramma van instellingen\" niet starten"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Kon \"PIM-exportprogramma van gegevens\" niet starten"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3919,71 +3935,71 @@
 "ImportWizard kon niet worden gestart. Ga na dat ImportWizard op de juiste "
 "manier is geïnstalleerd."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "De assistent voor importeren kon niet worden gestart"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Er is een ander e-mailprogramma op uw systeem gevonden. Wilt u de gegevens "
 "ervan importeren?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "De assistent voor importeren kon niet worden gestart. Controleer uw "
 "installatie."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Geen onderwerp"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(geen sjablonen)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Bij deze map zijn geen verloop-opties ingesteld"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Wilt u de map <b>%1</b> laten verlopen?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Map laten verlopen"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "V&erlopen"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Prullenbak legen"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Naar prullenbak verplaatsen"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Wilt u de prullenbak legen?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3992,27 +4008,27 @@
 "<qt>Wilt u alle berichten uit de map <b>%1</b> naar de prullenbak "
 "verplaatsen?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Alle berichten zijn nu in de prullenbak"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Wilt u alle oude berichten laten verlopen?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Oude berichten laten verlopen?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Laten verlopen"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4024,17 +4040,17 @@
 "mailberichten) en vergroot de kans dat uw systeem bloot wordt gesteld aan "
 "huidige en te verwachten beveiligingsrisico's."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Beveiligingswaarschuwing"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Externe referenties ophalen"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4049,534 +4065,534 @@
 "<qt>Wilt u de %1 geselecteerde berichten verwijderen?<br />Eenmaal "
 "verwijderd kunt u ze niet meer terughalen.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Berichten verwijderen"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Bericht verwijderen"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Berichten worden verplaatst..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Berichten worden verwijderd..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "De berichten zijn met succes verwijderd."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "De berichten zijn met succes verplaatst."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Het verwijderen van berichten is mislukt."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Verwijderen van berichten is geannuleerd."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Het verplaatsen van berichten is mislukt."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Verplaatsen van berichten is geannuleerd."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Berichten naar map verplaatsen"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Berichten worden gekopieerd..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "De berichten zijn met succes gekopieerd."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Het kopiëren van berichten is mislukt."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopiëren van berichten is geannuleerd."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Berichten kopiëren naar map"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Berichten worden naar de prullenbak verplaatst..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Berichten verwijderen en verplaatsen naar de prullenbak..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "De berichten zijn met succes naar de prullenbak verplaatst."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr ""
 "De berichten zijn met succes naar de prullenbak verplaatst of verwijderd."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Het verplaatsen van de berichten naar de prullenbak is mislukt."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr ""
 "Verwijderen of verplaatsen van berichten naar de prullenbak is mislukt."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Het verplaatsen van de berichten naar de prullenbak is geannuleerd."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr ""
 "Verwijderen of verplaatsen van berichten naar de prullenbak is geannuleerd."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Naar map gaan"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Opslaan a&ls..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Alle mapp&en laten verlopen"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Berichten ophalen"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "E-mail ophalen vanaf"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Controleren op nieuwe berichten"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Berichten in wachtrij &verzenden"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Online-status (onbekend)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Berichten in wachtrij verzenden via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Certificatenbeheer"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "Berichten &importeren..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Sieve &debuggen..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filter&log..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "Uit een andere e-mailclient &importeren..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Afwezigheidsantwoorden bewerken..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Automatisch archiveren instellen..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Vertraagde berichten..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Berichten van herinneren aan vervolgactie..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Verwij&deren"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Disc&ussie naar prullenbak"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Discussie naar de prullenbak verplaatsen"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Discussie verwij&deren"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Berichten zoe&ken..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "&Alle berichten selecteren"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Discussielijstbe&heer..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Snelt&oets toewijzen..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "V&erloopinstellingen"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Map archiveren..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "E&xterne referenties ophalen"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Bericht kopiëren naar..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Bericht verplaatsen naar..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nieuw bericht..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nieuw"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Berich&t van sjabloon"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nieuw bericht aan discussiegr&oep..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Filter aanmaken"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filteren op &Onderwerp..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filteren op &Van..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filteren op &Aan..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filteren op &Cc..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Dis&cussie markeren"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Discussie ma&rkeren als gelezen"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Alle berichten in de geselecteerde discussie markeren als gelezen"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Discussie markeren als &ongelezen"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Alle berichten in de geselecteerde discussie markeren als ongelezen"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Discussie markeren als belangr&ijk"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Markering voor belangr&ijke discussie verwijderen"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Discussie markeren als &taak"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Markering voor t&aak van discussie verwijderen"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Discussie v&olgen"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "D&iscussie negeren"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Bijlagen op&slaan..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Kopieer ontcijfert naar..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Alle filters toe&passen"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Discussie / groep uitvouw&en"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "De huidige discussie of groep uitvouwen"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Discussie /groep in&vouwen"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "De huidige discussie of groep invouwen"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Alle &discussies uitvouwen"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Alle discussies in de huidige map uitvouwen"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "A&lle discussies invouwen"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Alle discussies in de huidige map invouwen"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Ber&icht tonen"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Volge&nde bericht"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Naar het volgende bericht gaan"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Volgende &ongelezen bericht"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Volgende"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Naar het volgende ongelezen bericht gaan"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Vori&ge bericht"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Naar het vorige bericht gaan"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Vorige ongele&zen bericht"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Vorige"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Naar het vorige ongelezen bericht gaan"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "&Volgende ongelezen map"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Naar de volgende map met ongelezen berichten gaan"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "V&orige ongelezen map"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Naar de vorige map met ongelezen berichten gaan"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Volgende ongelezen &tekst"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Naar de volgende ongelezen tekst gaan"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4585,223 +4601,228 @@
 "In het huidige bericht naar beneden schuiven. Aan het einde van het huidige "
 "bericht naar het volgende ongelezen bericht gaan."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Filters i&nstellen..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "&Sieve-scripts beheren..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Account toevoegen..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Inleiding in KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Welkomstpagina van KMail tonen"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "&Notificaties instellen..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "KMail &instellen..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Verlopen..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Favoriete map toevoegen..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Inschrijving aan de kant van de server..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Alle filters toepassen"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "KMail-gegevens im-/exporteren..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nieuw contactpersoon in adresboek..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Bericht kopiëren naar map"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Naar map gaan..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Huidige sessie afbreken"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Focus op volgende map richten"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Focus op vorige map richten"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Map met focus selecteren"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Focus op eerste map richten"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Focus op laatste map richten"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Focus op volgende bericht richten"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Focus op vorige bericht richten"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Eerste bericht selecteren"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Laatste bericht selecteren"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Bericht met focus selecteren "
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Focus op snelzoeken"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Selectie uitbreiden tot vorig bericht"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Selectie uitbreiden tot volgend bericht"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Bericht verplaatsen naar map"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Minder bandbreedte gebruiken"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Markeer alle berichten als gelezen in deze map en al zijn submappen"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Verwijder dubbelen in deze map en al zijn submappen"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Accountin&stellingen"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Account opnieuw starten"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Favoriete map toevoegen"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Prull&enbak legen"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Alle berichten naar &prullenbak verplaatsen"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Zoekopdracht verwij&deren"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Zoekgegevens bewerken..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Ongedaan maken"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "Ongedaan maken van: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Zoeken naar... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4812,12 +4833,12 @@
 "\" (ongewenste e-mailberichten) en vergroot de kans dat uw systeem gevoelig "
 "wordt voor andere typen van beveiligingsrisico's."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Gebruik HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4832,119 +4853,119 @@
 "U kunt geünificeerde e-mailvakken, eigen vakken aanmaken configureren of\n"
 "de functie geheel in de plug-in-instellingen van KMail uitschakelen."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Geünificeerde e-mailvakken inschakelen?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Geünificeerde e-mailvakken inschakelen"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Bezig met starten..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Naar prullenbak"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Bericht naar de prullenbak verplaatsen"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Kan item niet kopiëren. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nieuw bericht aan..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Antwoord zenden aan..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Doorsturen naar..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Aan bestaande contactpersoon toegevoegd"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Openen in adresboek"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Bladwijzer aanmaken voor deze koppeling"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Contactpersoon bewerken..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Koppeling opslaan als..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "Zoeken in &bericht..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Afbeelding opslaan op schijf..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "HTML-format tonen"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Toon het HTML-format wanneer e-mail van deze contactpersoon komt"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Externe verwijzingen voor dit e-mailbericht ophalen voor deze contactpersoon."
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Afbeelding delen..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4953,64 +4974,64 @@
 "Kmail is nu gebaseerd op het raamwerk Akonadi Persoonlijk informatiebeheer, "
 "hetgeen veel veranderingen met zich meebrengt."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push e-mail (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Verbeterde zoekacties"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 "Ondersteuning voor het toevoegen van notities (annotaties) aan e-mails."
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Minder GUI-vastlopers, het controleren op e-mails gebeurt op de achtergrond"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Ondersteuning van plug-ins"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Nieuwe HTML-renderer (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Controle op phishing-URL toegevoegd"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "De E-mailclient van KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Inhoud van map wordt opgehaald"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Even geduld . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Offline"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5019,7 +5040,7 @@
 "KMail is op het moment in offline-modus. Klik <a href=\"kmail:goOnline"
 "\">hier</a> om online te gaan. . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5028,22 +5049,22 @@
 "Account is op dit moment in offline-modus. Klik <a href=\"kmail:"
 "goResourceOnline\">hier</a> om online te gaan. . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Contactpersoon met succes gewijzigd."
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nieuwe berichten in"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Er zijn geen ongelezen berichten"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5066,8 +5087,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5162,17 +5183,17 @@
 "Selecteer de pluginoverzichten die u op de overzichtspagina wilt laten "
 "weergeven."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontactoverzicht"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5218,27 +5239,27 @@
 msgid "All"
 msgstr "Alles"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact Overzicht"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontactoverzichtsweergave"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2019, de ontwikkelaars van Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5266,7 +5287,7 @@
 msgid "&Reply"
 msgstr "Beantwoo&rden"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Beantwoorden..."
@@ -5276,12 +5297,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Af&zender beantwoorden..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "&Allen beantwoorden..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Beantwoorden aan d&iscussiegroep..."
@@ -5311,7 +5332,7 @@
 msgid "&Edit As New"
 msgstr "Als nieuw b&ewerken"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5503,82 +5524,82 @@
 msgstr ""
 "Zoeken is mislukt er zijn enkele fouten gevondenZoeken: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Berichten zoeken"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Zoeken"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&In bericht zelf..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Als bijlage..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Bijlagen opslaan..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Selectie wissen"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Naar oorspronkelijke map gaan"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "1 overeenkomst"
 msgstr[1] "%1 overeenkomsten"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Laatste zoekopdracht"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "U hebt geen geldige map geselecteerd."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "U bent vergeten verzamelingen te selecteren."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "U bent vergeten een voorwaarde te definiëren."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Alle geselecteerde mappen zijn leeg of zijn niet geïndexeerd."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "U bent vergeten voorwaarden te definiëren."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5586,32 +5607,32 @@
 "Bevat voorwaarde die niet gebruikt kan worden met een aantal tekens minder "
 "dan 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Bezig met zoeken..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Kan geen zoekresultaat krijgen. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Zoekopdracht is mislukt."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Zoeken voltooid."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Zoeken is gestopt."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5622,21 +5643,21 @@
 "hiervoor is dat er al een andere zoekmap bestaat met dezelfde naam. "
 "Teruggegeven fout \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Bericht kopiëren"
 msgstr[1] "%1 berichten kopiëren"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Bericht knippen"
 msgstr[1] "%1 berichten knippen"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "De indexstatus wordt gecontroleerd..."
@@ -5774,7 +5795,7 @@
 "voor intern gebruik)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5785,7 +5806,7 @@
 "naar."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5795,26 +5816,26 @@
 "moet worden."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Snelzoeken voor mappen tonen"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Standaard opgenomen in de tekst doorsturen."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Waarschuwen wanneer het aantal geadresseerden meer is dan:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5826,19 +5847,19 @@
 "gestuurd. Deze waarschuwing kan worden uitgezet."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Spellingcontrole uitvoeren voor verzenden"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Auto&matisch ontvangstbevestigingen vragen"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5854,13 +5875,13 @@
 "em>&gt;<em>Ontvangstbevestiging vragen</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Automatisch opslaan iedere:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5872,151 +5893,151 @@
 "Automatisch opslaan kunt u uitschakelen door hier 0 in te vullen."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Fragmentbeheer en invoegpaneel tonen in opsteller."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Indien geactiveerd worden verzonden berichten versleuteld opgeslagen"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Een lijst met alle recent gebruikte URL's"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Een lijst met alle recent gebruikte coderingen"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Indicator voor cryptolabel tonen"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Valideer standaard sneltoets voor verzenden"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "De grootte van de identiteitsdialoog (alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "De breedte van het zoekvenster (alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "De hoogte van het zoekvenster (alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "De breedte van de dialoog KMail instellen (alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "De hoogte van de dialoog KMail instellen (alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Berichtvoorbeeldvak"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Geen berichtvoorbeeldvak tonen"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Berichtvoorbeeldvak tonen onder de berichtenlijst"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Berichtvoorbeeldvak naast de berichtenlijst tonen"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Mappenlijst"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lange mappenlijst"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Korte mappenlijst"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Berichtsjabloon voor nieuw bericht"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Berichtsjabloon voor antwoorden"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Berichtsjabloon voor allen beantwoorden"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Berichtsjabloon voor doorsturen"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Aanhaaltekens"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Specificeert het gebruikte beleid bij het weergeven van het beleid"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6026,7 +6047,7 @@
 "(alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6036,7 +6057,7 @@
 "(alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6046,7 +6067,7 @@
 "(alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6056,7 +6077,7 @@
 "(alleen voor intern gebruik)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6066,7 +6087,7 @@
 "voor intern gebruik)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6340,7 +6361,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6376,7 +6397,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6710,8 +6731,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "E-mail URL volgen activeren"
+msgid "Scan emails for tracking URLs"
+msgstr "E-mails scannen voor volgen van URL's"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7340,6 +7361,16 @@
 msgstr ""
 "Alle \"Deze vraag niet meer stellen\"-waarschuwingen opnieuw inschakelen"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 seconden"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Verzenden ongedaan maken"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7395,6 +7426,12 @@
 msgid "Zoom: %1%"
 msgstr "Zoomen: %1%"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Tekstfragmenten"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "E-mail URL volgen activeren"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Mapnaam en grootte indien quota bijna bereikt zijn"
 
@@ -10078,12 +10115,6 @@
 #~ msgid "Add Group"
 #~ msgstr "Groep toevoegen"
 
-#, fuzzy
-#~| msgid "Do you really want to remove this group and all its snippets?"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Wilt u deze groep en alle bijbehorende fragmenten verwijderen?"
-
 #~ msgid "&Apply"
 #~ msgstr "&Toepassen"
 
@@ -11122,9 +11153,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Definieer of het account de standaard identiteit gebruikt"
 
-#~ msgid "Identity account"
-#~ msgstr "Identiteit van account"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "RID-pad naar de e-mailbox om wijzigingen te bewaken"
 
diff -Nru kmail-19.04.3/po/nl/kmail-refresh-settings.po kmail-19.12.3/po/nl/kmail-refresh-settings.po
--- kmail-19.04.3/po/nl/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/nl/kmail-refresh-settings.po	2020-03-03 00:34:09.000000000 +0000
@@ -0,0 +1,106 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Freek de Kruijf <freekdekruijf@kde.nl>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-07 11:25+0200\n"
+"Last-Translator: Freek de Kruijf <f.de.kruijf@gmail.com>\n"
+"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 19.04.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Freek de Kruijf - 2019"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "freekdekruijf@kde.nl"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Assistent van KMail voor vernieuwen van instellingen"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Auteur"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Vernieuwen van instellingen van KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Instellingen opschonen"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Voltooien"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Opschonen"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Verouderde \"TipVanDeDag\" instellings verwijderen: gedaan"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Dialooginstellingen in bestand `%1` verwijderen: gedaan"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Filterinstellingen in bestand `%1` verwijderen: gedaan"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Mapinstellingen opschonen in instellingenbestand: `%1`: gedaan"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Dialooggrootte in instellingenbestand `%1` opschonen: gedaan"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "KMail/Kontact sluiten alvorens deze te gebruiken."
+
+#~ msgid "PIM Import Tool"
+#~ msgstr "PIM-hulpprogramma voor importeren"
diff -Nru kmail-19.04.3/po/nl/ktnef.po kmail-19.12.3/po/nl/ktnef.po
--- kmail-19.04.3/po/nl/ktnef.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nl/ktnef.po	2020-03-03 00:34:09.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-19 12:03+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
diff -Nru kmail-19.04.3/po/nn/kmail.po kmail-19.12.3/po/nn/kmail.po
--- kmail-19.04.3/po/nn/kmail.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nn/kmail.po	2020-03-03 00:34:10.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2018-10-07 10:47+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -184,8 +184,8 @@
 msgstr ""
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -289,27 +289,27 @@
 "in the addresses by hand."
 msgstr ""
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvotar"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Bruk:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr ""
@@ -331,7 +331,7 @@
 "tastar som skal knytast til denne mappa.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Malar"
@@ -342,106 +342,106 @@
 msgstr "&Bruk sjølvlaga meldingsmalar i denne mappa"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopier globale malar"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vis"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Bruk sjølvvalte &ikon"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Ulesne:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Vis sendar/mottakar-kolonne i meldingslista"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Vis &kolonne:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Standard"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Avsendar"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Mottakar"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Meldingsliste"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Bruk standard samanstilling"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Samanstilling"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Bruk standardtemaet"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr ""
@@ -451,130 +451,135 @@
 msgid "Retrieval Options"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Mottak"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Sending"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Utgåande kontoar (legg til minst éin):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Vanlege innstillingar"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Sta&dfest før sending"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Aldri automatisk"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Ved manuell e-postsjekking"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Ved alle e-postsjekkingar"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Send no"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Send seinare"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Send &meldingar i utboksmappa:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "S&tandard sendemetode:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Klarte ikkje starta kontovegvisaren"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Set som «fråkopla» når KMail blir avslutta. "
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -630,7 +635,7 @@
 msgid "Fixed Width Font"
 msgstr "Skrift med fast breidd"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Ny melding"
@@ -934,61 +939,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Generelt"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardmalar"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Eigne malar"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Emne"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Teiknkoding"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Meldingshovud"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Vedlegg"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autoretting"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -997,12 +1002,12 @@
 "Set inn valt signatur\n"
 " automatisk når du skriv ein ny e-post."
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1011,18 +1016,18 @@
 "Set inn eit kommentar (RFC-compliant) signatur skilje\n"
 "«-- » før signaturen."
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Ikkje bruk allereie eksisterande signaturar i svar"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1030,7 +1035,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1038,17 +1043,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Bruk automatisk linjebryting ved oppgjeven breidd"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Angi sidebreidd for tekst for automatisk linjebryting."
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1059,7 +1064,7 @@
 "i same formatet som det blei mottatt.\n"
 "Om dette ikkje blir kryssa av, blir svaret sendt som rein tekst."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1070,34 +1075,34 @@
 "Feit, kursiv og understreka tekst, og lister og eksterne kjelder\n"
 "er støtta."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "I teksten"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Som vedlegg"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1108,17 +1113,17 @@
 "Du kan og velja å gjera dette for einskildmeldingar: «Val → Be om "
 "meldingskvittering»"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Åtvar ved for mange mottakarar"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1135,25 +1140,25 @@
 "denne funksjonen vil ikkje samspela med mottakarlister\n"
 "eller med e-postlister. "
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1162,23 +1167,23 @@
 "Kor mange e-postadresser vil du ha tilgjengeleg for\n"
 "automatisk utfylling av adressat. "
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Inga autolagring"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1186,18 +1191,18 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Emneprefiks for sva&r"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1206,59 +1211,59 @@
 "Kjenn att følgjande prefiks i vilkårleg rekkjefølgje\n"
 "(regulære uttrykk, utan omsyn til store/små bokstavar):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Legg til …"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Fjern"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Endra …"
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Skriv inn nytt svarprefiks:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Emneprefiks for &vidaresending"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Legg til …"
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Fjern"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Endra …"
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Skriv inn nytt vidaresendingsprefiks:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1268,87 +1273,87 @@
 "nedst, på jakt etter ei teiknkoding som inneheld alle teikna som er brukte."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Endra …"
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Vel teiknkoding:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "B&ruk opphavleg teiknkoding ved svar og vidaresending (dersom det går)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Teiknkodinga er ikkje støtta."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "B&ruk sjølvvald ending i meldings-ID"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Sjølvvald &ending i meldings-ID:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Legg inn eigne meldingshovudfelt:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Namn"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Verdi"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Ny"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "Na&mn:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Verdi:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "B&ruk vedleggsnamngjeving som er kompatibel med Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1357,38 +1362,38 @@
 "Slå på dette valet for å få Outlook™ til å forstå namn på vedlegg med ikkje-"
 "engelske teikn"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Varsla ved sending av meldingar som manglar vedlegg"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "&Kjenn att desse nøkkelorda som kommandoar for å leggja ved ei fil:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Skriv inn nytt nøkkelord:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Inga grense"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1474,7 +1479,7 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr ""
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1587,7 +1592,7 @@
 msgid "Archive Folder"
 msgstr ""
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1653,19 +1658,19 @@
 msgid "Notification"
 msgstr ""
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr ""
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr ""
@@ -1682,329 +1687,329 @@
 msgid "Encoding"
 msgstr "Teiknkoding"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Vel ordlista som skal brukast til å stavekontrollera denne meldinga"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Vel den mappa for sende e-postar som denne meldinga skal lagrast i"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Vel kva utgåande konto som skal brukast til å senda denne meldinga"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Vel avsendaradresse for denne meldinga"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Vel eit emne for denne meldinga"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitet:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Ordliste:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Mappe for se&nd e-post:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "E-post-&transport:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Frå:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Emne:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Send e-post"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Send e-post via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Send"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Send s&einare"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Send s&einare via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Legg i kø"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Lagra som &kladd"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Lagra som &mal"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Skal e-post bli lagra som rein tekst eller HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adressebok"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Opna adresseboka"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Ny melding"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Vel &mottakarar …"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Lagra &distribusjonsliste …"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Lim inn som &vedlegg"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "R&ensk mellomrom"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "&Bruk skrift med fast breidd"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Hastar"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Be om meldingskvittering"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Tekst&bryting"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Tekstbit"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatisk stavekontroll"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Alle felt"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitet"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Ordliste"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Mappe for sen&d e-post"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&E-post-transport"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Frå"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Emne"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Legg til s&ignatur etter"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Legg til s&ignatur før"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Legg til s&ignatur ved skrivemerke"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Stave&kontroll …"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Stavekontroll"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Krypter melding"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Signer melding"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signer"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Kryptografisk meldingsformat"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Vel eit krypteringsformat for denne meldinga"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Set opp KMail …"
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2012,53 +2017,53 @@
 msgstr ""
 "<qt>Dette vil gøyma menylinja heilt. Du kan visa ho att ved å skriva %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linje: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolonne: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INN"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Stavekontroll: på"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Stavekontroll: av"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Lagra &på nytt som mal"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Lagra som &kladd"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2066,7 +2071,7 @@
 msgstr ""
 "Lagra denne meldinga i malmappa. Du kan då bruka ho på nytt att seinare."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2074,82 +2079,82 @@
 msgstr ""
 "Lagra denne meldinga i kladdmappa. Du kan då redigera og senda ho seinare."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Vil du lagra meldinga eller forkasta ho?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Lukk skrivevindauge"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Set inn fil"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Legg til som &innebygd bilete"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Legg til som &vedlegg"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Namn på vedlegget:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] ""
 msgstr[1] ""
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] ""
 msgstr[1] ""
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Lim inn som vedlegg"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "namnlaus"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2162,12 +2167,12 @@
 "valde identiteten.</p><p>Vel nøkkelen/nøklane du vil bruka i "
 "identitetsoppsettet.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Udefinert krypteringsnøkkel"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2178,12 +2183,12 @@
 "OpenPGP- eller S/MIME-nøkkel du vil bruka.</p> <p>Du kan velja nøkkelen som "
 "skal brukast i identitetsoppsettet.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Udefinert signeringsnøkkel"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2194,66 +2199,66 @@
 "postadressa for alle identitetane, slik at du ikkje treng skriva ho inn for "
 "kvar melding."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "«Til:»-feltet er tomt. Vil du likevel senda meldinga?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Ingen «Til:»-mottakar vald"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du har ikkje oppgjeve noko emne. Vil du likevel senda meldinga?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Inkje emne oppgjeve"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Send &utan endring"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Oppgje emnet"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "I ferd med å senda e-post …"
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Stadfest sending"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Send no"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2262,22 +2267,22 @@
 "Du er i ferd med å senda ei melding til meir enn %1 mottakarar. Er du sikker "
 "på at du vil senda meldinga?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "For mange mottakarar"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Send &utan endring"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Rediger mottakarar"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2286,43 +2291,43 @@
 "Dersom du slår av HTML-modus, forsvinn formateringa i teksten. Er du sikker "
 "på at du vil gjera dette?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Vil du mista formateringa?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Vil du mista formateringa?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2330,7 +2335,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr ""
@@ -2403,25 +2408,25 @@
 msgid "External editor was started."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2448,11 +2453,6 @@
 msgid "Message will not be encrypted"
 msgstr "Meldinga vert ikkje kryptert"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Tekstbitar"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2498,27 +2498,27 @@
 msgid "Cannot move messages."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr ""
@@ -2559,48 +2559,48 @@
 msgid "&Existing identities:"
 msgstr "&Identitetar som finst frå før:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr ""
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Rediger identitet"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Generelt"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Namnet ditt:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2612,12 +2612,12 @@
 "lèt feltet stå tomt, kjem ikkje namnet ditt fram, berre e-postadressa.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organisas&jon:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2629,12 +2629,12 @@
 "visast i meldingshovudet som vert sendt ut.</p><p>Det er greitt (og ganske "
 "vanleg) å la dette feltet stå tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-postadresse:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2644,12 +2644,12 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr ""
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2665,12 +2665,12 @@
 "tr><tr><th>Alias:</th><td>kari.nordmann@døme.no<br>knordmann@eksempel.no</"
 "td></tr></table><p>Skriv inn ei adresse per linje.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kryptografi"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2680,12 +2680,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-signeringsnøkkel:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2696,12 +2696,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-krypteringsnøkkel:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2714,12 +2714,12 @@
 "stand til å signera e-postane dine med S/MIME. Dei vanlege e-postfunksjonane "
 "vil framleis fungera.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-signeringssertifikat:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2734,39 +2734,39 @@
 "i stand til å kryptera kopiar av utgåande meldingar til deg sjølv ved hjelp "
 "av S/MIME. Dei vanlege e-postfunksjonane vil framleis fungera.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-krypteringssertifikat:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr ""
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr ""
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr ""
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avansert"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Svaradresse:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2784,12 +2784,12 @@
 "svar skal gå til ei gruppeadresse.</p><p>Om du er i tvil, så la dette feltet "
 "stå tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr ""
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2800,12 +2800,12 @@
 "blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Blindkopiadresser:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2822,57 +2822,57 @@
 "skilja mottakarane viss du skriv inn meir enn éi adresse.</p><p>La dette "
 "feltet stå tomt dersom du er i tvil.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Ordl&iste:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Mappe for sende meldingar:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Kladdmappe:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Malmappe:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr ""
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr ""
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr ""
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr ""
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr ""
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Sta&ndarddomene:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2881,33 +2881,33 @@
 "<qt><p>Standarddomenet vert lagt til etter krøllalfaen («@») i ufullstendige "
 "adresser.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Bruk sjølvlaga meldingsmalar for denne identiteten"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Signatur"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Bilete"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr ""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Ugyldig e-postadresse"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2920,7 +2920,7 @@
 "Dette kan føre til åtvaringar når mottakaren prøver å kontrollera signaturar "
 "som er laga med dette oppsettet."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2929,7 +2929,7 @@
 "Éin av OpenPGP-krypteringsnøklane som er sett opp inneheld ikkje nokon "
 "brukar-ID med den oppsette e-postadressa for denne identiteten (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2942,7 +2942,7 @@
 "Dette kan føra til åtvaringar når mottakaren prøver å kontrollera signaturar "
 "laga med dette oppsettet."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -2951,29 +2951,29 @@
 "Éin av S/MIME-krypteringssertifikata som er sett opp inneheld ikkje den "
 "oppsette e-postadressa for denne identiteten (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Fann ikkje e-postadresse i nøkkel/sertifikat"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Signaturfila er ugyldig"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Rediger identiteten «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Rediger …"
@@ -3004,6 +3004,18 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr ""
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3161,7 +3173,7 @@
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3194,7 +3206,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Legg i adresseboka"
@@ -3204,22 +3216,22 @@
 msgid "Contact created successfully"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr ""
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr ""
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr ""
@@ -3430,14 +3442,14 @@
 msgstr "M&appe"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr ""
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3463,7 +3475,7 @@
 msgstr "&Vidaresend"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Bruk filter"
@@ -3488,7 +3500,7 @@
 msgstr "&Hjelp"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Hovudverktøylinje"
@@ -3541,12 +3553,12 @@
 msgid "The file does not contain a message."
 msgstr "Fila inneheld ikkje ei melding."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fila inneheld fleire meldingar. Berre den første meldinga vert vist."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3555,32 +3567,32 @@
 "Vil du vidaresenda dei valde meldingane som vedlegg til éi melding (som ei "
 "MIME-samling), eller som einskildmeldingar?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Send som samling"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Send einskildmeldingar"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrerer meldingar"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerer melding %1 av %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Flyttar meldingar"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Slettar meldingar"
@@ -3609,68 +3621,68 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail er sett i fråkoplamodus. Alle jobbar som krev nettverk er sette på "
 "vent."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr ""
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr ""
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail er sett i tilkoplamodus. Alle jobbar som krev nettverk er tekne opp "
 "att."
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr ""
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail er i fråkoplamodus. Korleis vil du halda fram?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Tilkopla/fråkopla"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Arbeid tilkopla"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3679,12 +3691,12 @@
 "Klarte ikkje autolagra fila i «%1».\n"
 "Grunn: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Klarte ikkje opna autolagra fil"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3693,7 +3705,7 @@
 msgstr[1] ""
 "Desse %1 identitetane er endra til å bruka standard overføringsmetode:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3702,150 +3714,152 @@
 msgstr[1] ""
 "Desse %1 identitetane er endra til å bruka ein annan overføringsmetode:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Sender meldingar"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Startar sendeprosessen …"
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Ingen agent for oppfylgingspåminning er registrert. "
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail-feil"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr ""
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Eit annan e-postprogram er oppdaga på systemet. Vil du importere data "
 "derifrå? "
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Utan emne"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(ingen malar)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Denne mappa har ingen innstillingar for forelda meldingar"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Er du sikker på at du vil sletta forelda meldingar i mappa <b>%1</b>?</"
 "qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Slett forelda meldingar i mappa"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Forelda"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Tøm papirkorga"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Flytt til papirkorga"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Er du sikker på at du vil tømma papirkorga?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3854,27 +3868,27 @@
 "<qt>Er du sikker på at du vil flytta alle meldingane frå mappa <b>%1</b> til "
 "papirkorga?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Flytta alle meldingane til papirkorga"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Er du sikker på at du vil sletta alle forelda meldingar?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Slett forelda meldingar?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Gjer forelda"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3885,17 +3899,17 @@
 "mot søppelpost og kan gjera det lettare for uvedkommande å få tilgang til "
 "systemet ved eventuelle tryggleikshol."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Tryggleiksåtvaring"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Last eksterne referansar"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3910,531 +3924,531 @@
 "<qt>Er du sikker på at du vil sletta dei %1 valde meldingane? <br /"
 ">Meldingar som vert sletta kan ikkje gjenopprettast.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Slett meldingar"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Slett melding"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Flyttar meldingar …"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Slettar meldingar …"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Meldingane er sletta."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Meldingane er flytte."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Meldingane vart ikkje sletta."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Sletting av meldingar er avbrote."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Meldingane vart ikkje flytta."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Flytting av meldingar er avbrote."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Flytt meldingar til mappe"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopierer meldingar …"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Meldingane er kopierte."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Meldingane vart ikkje kopierte."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopiering av meldingar er avbroten."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopier meldingar til mappe"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Flyttar meldingar til papirkorga …"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr ""
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Meldingane er flytta til papirkorga."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr ""
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Klarte ikkje flytta meldingar til papirkorga."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Flytting av meldingar til papirkorga er avbroten."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Hopp til mappe"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Lagra &som …"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Slett &forelda meldingar i alle mappene"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Sjekk e-&post"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Sjekk e-post i"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Sjekk e-post"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Send meldingane i &køen"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Tilkoplingsstatus (ukjend)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Send meldingane i køen via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Sertifikathandsaming"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Feilsøk Sieve …"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Filter&loggvisar …"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Rediger vekkemeldingar …"
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr ""
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Slett"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "F&lytt tråd til papirkorga"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Flytt tråd til papirkorga"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Slett &tråd"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Finn meldingar …"
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Merk &alle meldingane"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Handtering av &e-postliste …"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Tilordna snøggtast …"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Foreldingsoppsett"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arkiver mappe …"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Last &eksterne referansar"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopier meldinga til …"
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Flytt meldinga til …"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Ny melding …"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Ny"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Melding frå &mal"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Ny melding til &e-postliste …"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Lag filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtrer på &emne …"
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtrer på &avsendar …"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtrer på &mottakar …"
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr ""
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Merk &tråd"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Merk tråd som &lesen"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Merk alle meldingane i den valde tråden som lesne"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Merk tråd som &ulesen"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Merk alle meldingane i den valde tråden som ulesne"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Merk tråd som &viktig"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Fjern merket for &viktig tråd"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Merk tråd som &handling"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Fjern &handlingselement-merke"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Overvak tråd"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorer tråd"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Lagra vedlegg …"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Bruk alle &filtera"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr ""
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr ""
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr ""
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr ""
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Utvid &alle trådar"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Utvid alle trådane i mappa"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "&Fald saman alle trådar"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Fald saman alle trådane i mappa"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Vis melding"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Neste melding"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Gå til neste melding"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Neste &ulesne melding"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Neste"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Gå til neste ulesne melding"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Førre melding"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Gå til førre melding"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Førre ulesne &melding"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Førre"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Gå til førre ulesne melding"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Neste ulesne &mappe"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Gå til neste mappe med ulesne meldingar"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Førre ulesne ma&ppe"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Gå til førre mappe med ulesne meldingar"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Neste ulesne &tekst"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Gå til neste ulesne tekst"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4443,223 +4457,228 @@
 "Bla nedover i den opne meldinga. Dersom meldinga er slutt, gå vidare til den "
 "neste ulesne meldinga."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Set opp &filter …"
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Handter &Sieve-skript …"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Legg til konto …"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail-&velkomst"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Vis velkomstsida til KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Set opp &varslingar …"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Set opp KMail …"
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Gjer forelda …"
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Legg til favorittmappe …"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Abonnement på tenarsida …"
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr ""
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr ""
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr ""
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopier melding til mappe"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Hopp til mappe …"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Avbryt denne handlinga"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Flytt fokus til neste mappe"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Flytt fokus til førre mappe"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Vel mappe med fokus"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Flytt fokus til neste melding"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Flytt fokus til førre melding"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Vel melding med fokus"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Fokuser på snøggsøk"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Utvid utval til førre mappe"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Utvid utval til neste mappe"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Flytt melding til mappe"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr ""
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr ""
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Legg til favorittmappe"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Tø&m papirkorga"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Flytt alle meldingane til &papirkorga"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Slett søk"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Rediger søk …"
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr ""
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4670,12 +4689,12 @@
 "kan gjera det lettare for uvedkommande å få tilgang til systemet ved "
 "eventuelle tryggleikshol."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Bruk HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4685,211 +4704,211 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Startar …"
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Flytt til &papirkorga"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Flytt til papirkorg"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Flytta melding til papirkorga"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr ""
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Ny melding til …"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Svar til …"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Vidaresend til …"
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr ""
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Opna i adresseboka"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Bokmerk denne lenkja"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr ""
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Lagra lenkje som …"
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Finn i melding …"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr ""
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr ""
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr ""
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "«Ny e-post»-varsling (Push – IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Støtte for bruk av notat i e-post melding"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Om ikkje det grafiske brukar grensesnittet frys, vil e-posttenesta halda "
 "fram å køyra (sjekka for e-post)."
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr ""
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr ""
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr ""
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr ""
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr ""
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Fråkopla"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr ""
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nye meldingar i"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Ingen ulesne meldingar"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4912,8 +4931,8 @@
 msgstr "© 2004–2010 Tobias König"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5005,17 +5024,17 @@
 msgstr ""
 "Vel kva programtillegg for samandrag som skal visast på samandragssida."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontakt-samandrag"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "© 2004 Tobias König"
@@ -5061,27 +5080,27 @@
 msgid "All"
 msgstr "Alle"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontakt-samandrag"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Vising av Kontakt-samandrag"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5108,7 +5127,7 @@
 msgid "&Reply"
 msgstr "&Svar"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Svar …"
@@ -5118,12 +5137,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Svar til &forfattar …"
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Svar til &alle …"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Svar til e-post&liste …"
@@ -5153,7 +5172,7 @@
 msgid "&Edit As New"
 msgstr ""
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5343,113 +5362,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Finn meldingar"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "I meldingsteksten …"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Som vedlegg …"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Lagra vedlegg …"
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Tøm utval"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 treff"
 msgstr[1] "%1 treff"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Førre søk"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Dei merkte mappene er tomme, eller ikkje lagt inn i databasen."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Legg til vilkår."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "«Inneheld»-vilkåra må minst vera fire teikn langt."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Søkjer …"
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5459,21 +5478,21 @@
 "Klare ikkje gi mappa nytt namn. Eit vanleg problem er namne kloning, namnet "
 "er i bruk på ei anna eksisterande søkje mappe. Feilmelding \"%1\""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Kopier melding"
 msgstr[1] "Kopier %1 meldingar"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Klipp ut melding"
 msgstr[1] "Klipp ut %1 meldingar"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr ""
@@ -5603,7 +5622,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5611,7 +5630,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5621,26 +5640,26 @@
 "visast."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Vis snøggsøkfelt for mapper"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Vidaresend i teksten som standard."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5651,19 +5670,19 @@
 "spørja om stadfesting før sending av e-posten. Du kan slå denne åtvaringa av."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr ""
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Be alltid om &meldingskvitteringar"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5679,13 +5698,13 @@
 "meldingskvittering</b>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Tid mellom autolagring:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5697,152 +5716,152 @@
 "automatisk reservekopiering ved å setja denne verdien til 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "Vis panel for innsetjing og handsaming av tekstbitar i skrivevindauget."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Skjekk send standard snarveg"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Storleiken på identitetsvindauget (kun til intern bruk)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Høgda til søkjevindauge (kun til intern bruk)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Breidd for «Set opp» KMail vindauge (kun til intern bruk)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Høgd for «Set opp» KMail vindauge (kun til intern bruk)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Førehandsvising av melding"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Ikkje førehandsvis meldingar"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Førehandsvis meldingar under meldingslista"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Førehandsvis meldingar ved sida av meldingslista"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Mappeliste"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lang mappeliste"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kort mappeliste"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Meldingsmal for ny melding"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Meldingsmal for svar"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Meldingsmal for svar til alle"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Meldingsmal for vidaresending"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Sitatteikn"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Set vilkår for vising av vilkår"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5850,7 +5869,7 @@
 msgstr "Angi breidde for «Samling» felt i søkjevindauge (kun til intern bruk) "
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5858,7 +5877,7 @@
 msgstr "Angi breidde for «Emne» felt i søkjevindauge (kun til intern bruk) "
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5867,7 +5886,7 @@
 "Angi breidde for «Avsendar» felt i søkjevindauge (kun til intern bruk) "
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5876,7 +5895,7 @@
 "Angi breidde for «Mottakar» felt i søkjevindauge (kun til intern bruk) "
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5884,7 +5903,7 @@
 msgstr "Angi breidde for «Dato» felt i søkjevindauge (kun til intern bruk) "
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6140,7 +6159,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6470,7 +6489,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
+msgid "Scan emails for tracking URLs"
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
@@ -7037,6 +7056,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Slå på att alle «Ikkje spør igjen»-åtvaringar"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
diff -Nru kmail-19.04.3/po/nn/ktnef.po kmail-19.12.3/po/nn/ktnef.po
--- kmail-19.04.3/po/nn/ktnef.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/nn/ktnef.po	2020-03-03 00:34:10.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2018-09-07 22:28+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
diff -Nru kmail-19.04.3/po/pa/kmail.po kmail-19.12.3/po/pa/kmail.po
--- kmail-19.04.3/po/pa/kmail.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pa/kmail.po	2020-03-03 00:34:11.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2011-06-29 22:58+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
@@ -188,8 +188,8 @@
 msgstr ""
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "ਕੇਮੇਲ"
@@ -304,28 +304,28 @@
 "in the addresses by hand."
 msgstr "ਕੇਮੇਲ ਇਹ ਫੋਲਡਰ ਵਿੱਚ ਇੱਕ ਮੇਲਿੰਗ ਲਿਸਟ ਖੋਜਣ ਲਈ ਅਸਫ਼ਲ ਹੈ। ਐਡਰੈੱਸ ਖੁਦ ਹੀ ਭਰੋ ਜੀ।"
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "ਕੋਟਾ"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "ਵਰਤੋਂ:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, fuzzy, kde-format
 #| msgid "Status: "
 msgid "Status:"
 msgstr "ਹਾਲਤ: "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 %3 used"
 msgid "%1 of %2 used"
@@ -347,7 +347,7 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "ਟੈਂਪਲੇਟ"
@@ -358,110 +358,110 @@
 msgstr "ਇਸ ਫੋਲਡਰ ਵਿੱਚ ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ ਟੈਪਲੇਟ ਵਰਤੋਂ(&U)"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "ਗਲੋਬਲ ਟੈਂਪਲੇਟ ਨਕਲ ਕਰੋ(&C)"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "ਝਲਕ"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "ਪਸੰਦੀਦਾ ਅਕਾਰ ਵਰਤੋਂ(&i)"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "ਸਧਾਰਨ(&N):"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "ਨਾ-ਪੜ੍ਹੇ(&U):"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "ਕਾਲਮ ਵੇਖੋ(&w):"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "ਡਿਫਾਲਟ"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "ਭੇਜਣ ਵਾਲਾ"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, fuzzy, kde-format
 #| msgid "Delete T&hread"
 msgid "Use default aggregation"
 msgstr "ਮਾਮਲਾ ਹਟਾਓ(&h)"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "ਡਿਫਾਲਟ ਥੀਮ ਵਰਤੋਂ"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "ਥੀਮ"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "ਗ਼ੈਰ-ਸੁਰੱਖਿਅਤ ਸੁਨੇਹਾ ਫਾਰਮੈਟ"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ ਨਾਲੋਂ HTML ਪਸੰਦ ਹੈ"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ ਨਾਲੋਂ &HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -472,104 +472,109 @@
 msgid "Retrieval Options"
 msgstr "ਪ੍ਰਾਪਤੀ ਚੋਣਾਂ"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "ਪਛਾਣ(&I)"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "ਪ੍ਰਾਪਤੀ"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "ਭੇਜਣੇ"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "ਬਾਹਰ ਭੇਜਣ ਵਾਲੇ ਅਕਾਊਂਟ (ਘੱਟੋ-ਘੱਟ ਇੱਕ):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "ਆਮ ਚੋਣਾਂ"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁਸ਼ਟੀ(&b)"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "ਆਟੋਮੈਟਿਕ ਕਦੇ ਨਹੀਂ"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "ਦਸਤੀ ਮੇਲ ਜਾਂਚ ਸਮੇਂ"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "ਸਭ ਪੱਤਰ ਜਾਂਚ ਸਮੇਂ"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "ਹੁਣੇ ਭੇਜੋ"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "ਬਾਅਦ 'ਚ ਭੇਜੋ"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "ਸੁਨੇਹਿਆਂ ਨੂੰ ਬਾਹਰੀ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ(&m):"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "ਡਿਫਾਲਟ ਭੇਜਣ ਢੰਗ(&u):"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "ਅਕਾਊਂਟ ਸ਼ਾਮਲ"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu Foreground color setting"
 #| msgid "Custom..."
 msgid "Custom Account..."
 msgstr "ਕਸਟਮ..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -577,30 +582,30 @@
 "properly installed."
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ।"
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "ਦਸਤੀ ਪੱਤਰ ਜਾਂਚ ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "ਕੇਮੇਲ ਬੰਦ ਕਰਨ ਉੱਤੇ ਆਫਲਾਈਨ ਕਰੋ"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "ਸ਼ੁਰੂ ਵੇਲੇ ਪੱਤਰ ਦੀ ਜਾਂਚ ਕਰੋ"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -658,7 +663,7 @@
 msgid "Fixed Width Font"
 msgstr "ਨਿਸ਼ਚਿਤ ਫੋਂਟ ਚੌੜਾਈ"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "ਕੰਪੋਜ਼ਰ"
@@ -949,94 +954,94 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "ਸਟੈਂਡਰਡ ਟੈਂਪਲੇਟ"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "ਕਸਟਮ ਟੈਂਪਲੇਟ"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "ਵਿਸ਼ਾ"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "ਅੱਖਰ-ਸੈੱਟ"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "ਹੈਂਡਰ"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "ਅਟੈਚਮੈਂਟ"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "ਦਸਤਖਤ"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 #| msgid "Use smaller font for quoted text"
 msgid "Insert the signature above any quoted text"
 msgstr "ਹਵਾਲਾ ਪਾਠ ਲਈ ਛੋਟੇ ਫੋਂਟ ਵਰਤੋਂ"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "ਫਾਰਮੈਟ(&o):"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1044,7 +1049,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1052,17 +1057,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1070,7 +1075,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1078,36 +1083,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "ਇਨ-ਲਾਈਨ"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "ਅਟੈਚਮੈਂਟ ਵਜੋਂ"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Default Forwarding Type:"
 msgid "Default forwarding type:"
 msgstr "ਡਿਫਾਲਟ ਅੱਗੇ ਭੇਜਣ ਟੈਪਲੇਟ:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "All Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "ਸਭ ਪਰਾਪਤ ਕਰਤਾ"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1115,18 +1120,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Maximum number of recipient editor lines."
 msgid "Set the maximum number of recipients for the warning"
 msgstr "ਪਰਾਪਤ ਕਰਤਾ ਐਡੀਟਰ ਲਾਈਨਾਂ ਦੀ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਹੈ।"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1137,52 +1142,52 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "ਆਟੋ-ਸੰਭਾਲ ਨਹੀਂ"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "ਤਾਜ਼ੇ ਸਨੇਹੀ"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "ਪੂਰਨਤਾ ਕਰਮ ਸੰਰਚਨਾ..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "ਆਟੋ-ਸੰਭਾਲ ਨਹੀਂ"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "ਆਟੋ-ਸੰਭਾਲ ਨਹੀਂ"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1191,78 +1196,78 @@
 msgstr[0] " ਮਿੰਟ"
 msgstr[1] " ਮਿੰਟ"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Message Sort Direction"
 msgid "Automatically save the message at this specified interval"
 msgstr "ਸੁਨੇਹਾ ਲੜੀਬੱਧ ਦਿਸ਼ਾ"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "ਜਵਾਬੀ ਵਿਸ਼ਾ ਅਗੇਤਰ(&y)"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "ਸ਼ਾਮਲ(&d)..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "ਹਟਾਓ(&m)"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "ਸੋਧ(&i)..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "ਨਵਾਂ ਜਵਾਬੀ ਅਗੇਤਰ ਦਿਓ:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਵਿਸ਼ਾ ਅਗੇਤਰ(&w)"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "ਸ਼ਾਮਲ..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "ਹਟਾਓ(&v)"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "ਸੋਧ..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "ਨਵਾਂ ਅੱਗੇ ਭੇਜਣ ਅਗੇਤਰ ਦਿਓ:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1270,129 +1275,129 @@
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "ਸੋਧ(&M)..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "ਅੱਖਰ ਸਮੂਹ ਦਿਓ:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "ਜਵਾਬ ਦੇਣ ਜਾਂ ਅੱਗੇ ਭੇਜਣ ਸਮੇਂ ਅਸਲੀ ਅੱਖਰ-ਸਮੂਹ ਰੱਖੋ, ਜੇਕਰ ਸੰਭਵ ਹੋਵੇ(&K)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "ਅੱਖਰ ਸਮੂਹ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "ਨਾਂ"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "ਮੁੱਲ"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "ਨਵਾਂ(&w)"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "ਨਾਂ(&N):"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "ਮੁੱਲ(&V):"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid signature."
 msgid "Invalid header"
 msgstr "ਗਲਤ ਦਸਤਖਤ ਹਨ।"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "ਗੁੰਮ ਅਟੈਚ ਦੀ ਖੋਜ ਯੋਗ(&n)"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "ਨਵਾਂ ਸ਼ਬਦ ਦਿਓ:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "ਅਟੈਚਮੈਂਟ ਹੈ"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, fuzzy, kde-format
 #| msgid " MB"
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " MB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, fuzzy, kde-format
 #| msgid "Log size limit:"
 msgid "No limit"
 msgstr "ਲਾਗ ਸਾਈਜ਼ ਲਿਮਟ:"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1481,7 +1486,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "ਕੰਪੋਜ਼ਰ"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1597,7 +1602,7 @@
 msgid "Archive Folder"
 msgstr "ਅਕਾਇਵ ਫੋਲਡਰ"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgctxt "Start of the filename for a mail archive file"
 #| msgid "Archive"
@@ -1668,7 +1673,7 @@
 msgid "Notification"
 msgstr "ਨਵਾਂ ਪੱਤਰ ਸੂਚਨਾ"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, fuzzy, kde-format
 #| msgid "Attachment: %1"
 msgid "1 attachment (%2)"
@@ -1676,13 +1681,13 @@
 msgstr[0] "ਅਟੈਚਮੈਂਟ: %1"
 msgstr[1] "ਅਟੈਚਮੈਂਟ: %1"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, fuzzy, kde-format
 #| msgid "Hide attachment list."
 msgid "Hide attachment list"
 msgstr "ਅਟੈਚਮੈਂਟ ਲਿਸਟ ਓਹਲੇ"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, fuzzy, kde-format
 #| msgid "Hide attachment list."
 msgid "Show attachment list"
@@ -1700,458 +1705,458 @@
 msgid "Encoding"
 msgstr "ਇੰਕੋਡਿੰਗ"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "ਕੇਮੇਲ"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "ਇਹ ਸੁਨੇਹੇ ਲਈ ਵਿਸ਼ਾ ਸੈੱਟ ਕਰੋ"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "ਪਛਾਣ(&I):"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "ਡਿਕਸ਼ਨਰੀ(&D):"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "ਭੇਜੇ-ਪੱਤਰ ਫੋਲਡਰ(&S):"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "ਮੇਲ ਟਰਾਂਸਪੋਰਟ(&M):"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "ਵਲੋਂ(&F):"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "ਵਿਸ਼ਾ(&u):"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "ਮੇਲ ਭੇਜੋ(&S)"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "ਮੇਲ ਇੰਞ ਭੇਜੋ(&S)"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "ਭੇਜੋ"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "ਬਾਅਦ 'ਚ ਭੇਜੋ(&L)"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "ਬਾਅਦ ਵਿੱਚ ਇੰਝ ਭੇਜੋ(&L)"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "ਕਤਾਰ"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸੰਭਾਲੋ(&D)"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, fuzzy, kde-format
 #| msgid "Search in &all local folders"
 msgid "Save email in Draft folder"
 msgstr "ਸਭ ਲੋਕਲ ਫੋਲਡਰਾਂ ਵਿੱਚ ਖੋਜ(&A)"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "ਟੈਂਪਲੇਟ ਵਾਂਗ ਸੰਭਾਲੋ(&T)"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, fuzzy, kde-format
 #| msgid "Save as &Template"
 msgid "Save email in Template folder"
 msgstr "ਟੈਂਪਲੇਟ ਵਾਂਗ ਸੰਭਾਲੋ(&T)"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, fuzzy, kde-format
 #| msgid "Save to File"
 msgid "Save as &File"
 msgstr "ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "...ਟੈਕਸਟ ਫਾਇਲ ਸ਼ਾਮਲ(&I)"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "ਤਾਜ਼ਾ ਟੈਕਸਟ ਫਾਇਲ ਸ਼ਾਮਲ(&I)"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ(&A)"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "Open Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "ਨਵਾਂ ਕੰਪੋਜ਼ਰ(&N)"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "ਸੁਨੇਹੀ ਚੁਣੋ(&R)..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "ਵੰਡ ਲਿਸਟ ਸੰਭਾਲੋ(&D)..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "ਅਟੈਚਮੈਂਟ ਵਾਂਗ ਚੇਪੋ(&h)"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "ਖਾਲੀ ਥਾਂ ਸਾਫ਼(&e)"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "ਸਥਿਰ ਫੋਂਟ ਵਰਤੋਂ(&x)"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "ਜ਼ਰੂਰੀ(&U)"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "ਸ਼ਬਦ ਸਮੇਟੋ(&W)"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "ਸਨਿੱਪਟ(&S)"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "ਆਟੋਮੈਟਿਕ ਸ਼ਬਦ-ਜੋੜ ਜਾਂਚ(&A)"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Rich Text Editing"
 msgstr "ਫਾਰਮੈਟ ਖਤਮ ਕਰੋ"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "ਸਭ ਖੇਤਰ(&A)"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "ਪਛਾਣ(&I)"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "ਡਿਕਸ਼ਨਰੀ(&D)"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "ਭੇਜੇ-ਪੱਤਰ ਫੋਲਡਰ(&S)"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "ਮੇਲ ਟਰਾਂਸਪੋਰਟ(&M)"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "ਵੱਲੋਂ(&F)"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "ਵਿਸ਼ਾ(&u)"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "ਦਸਤਖਤ ਅੰਤ 'ਚ ਸ਼ਾਮਲ(&i)"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "ਦਸਤਖਤ ਪਹਿਲਾਂ ਸ਼ਾਮਲ(&i)"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, fuzzy, kde-format
 #| msgid "Set Cursor Position"
 msgid "Insert Signature At C&ursor Position"
 msgstr "ਕਰਸਰ ਸਥਿਤੀ ਸੈੱਟ ਕਰੋ"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "ਸਪੈਲ ਚੈੱਕਰ(&S)..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "ਸਪੈਲਿੰਗ-ਚੈੱਕਰ"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟ(&E)"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "ਇੰਕ੍ਰਿਪਟ"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "ਸੁਨੇਹਾ ਸਾਈਨ(&S)"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "ਸਾਈਨ"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "ਕਰਿਪਟੋਗਰਾਫਿਕਸ ਸੁਨੇਹਾ ਫਾਰਮੈਟ(&C)"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "ਸੁਨੇਹੇ ਖੋਜ(&F)..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "ਕੇ-ਮੇਲ ਸੰਰਚਨਾ..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " ਲਾਈਨ: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " ਕਾਲਮ: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "ਸਪੈੱਲ-ਚੈੱਕ: ਚਾਲੂ"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "ਸਪੈੱਲ-ਚੈੱਕ: ਬੰਦ"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "ਟੈਪਲੇਟ ਵਜੋਂ ਮੁੜ-ਸੰਭਾਲੋ(&s)"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "ਡਰਾਫਟ ਵਾਂਗ ਸਾਂਭੋ(&S)"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr "ਇਸ ਸੁਨੇਹਾ ਡਰਾਫਟ ਫੋਲਡਰ ਵਿੱਚ ਸੰਭਾਲੋ। ਇਸ ਨੂੰ ਬਾਅਦ 'ਚ ਸੋਧਿਆ ਤੇ ਭੇਜਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸੁਨੇਹੇ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਲਈ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ ਜਾਂ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "ਕੰਪੋਜ਼ਰ ਬੰਦ ਕਰੋ"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Autosave Message Failed"
 msgstr "ਆਟੋ-ਸੰਭਾਲਣ ਫੇਲ੍ਹ"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "ਫਾਇਲ ਸਮੱਗਰੀ ਸ਼ਾਮਲ"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "ਇਨ-ਲਾਈਨ ਚਿੱਤਰ ਵਜੋਂ ਸ਼ਾਮਲ(&I)"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "ਅਟੈਚਮੈਂਟ ਵਾਂਗ ਸ਼ਾਮਲ(&A)"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "ਅਟੈਚਮੈਂਟ ਦਾ ਨਾਂ:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid signature."
 msgid "Invalid Attachment Name"
 msgstr "ਗਲਤ ਦਸਤਖਤ ਹਨ।"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Add URL into Message &Text"
 #| msgid_plural "Add URLs into Message &Text"
@@ -2160,24 +2165,24 @@
 msgstr[0] "ਟੈਕਸਟ ਸੁਨੇਹੇ ਵਿੱਚ URL ਸ਼ਾਮਲ ਕਰੋ(&T)"
 msgstr[1] "ਸੁਨੇਹਾ ਟੈਕਸਟ ਵਿੱਚ URL ਸ਼ਾਮਲ ਕਰੋ(&T)"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "ਫਾਇਲ ਅਟੈਚਮੈਂਟ ਵਾਂਗ ਸ਼ਾਮਲ(&A)"
 msgstr[1] "ਫਾਇਲਾਂ ਅਟੈਚਮੈਂਟ ਵਾਂਗ ਸ਼ਾਮਲ(&A)"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "ਕਲਿੱਪਬੋਰਡ ਟੈਕਸਟ ਅਟੈਚਮੈਂਟ ਵਜੋਂ ਸ਼ਾਮਲ"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "ਬੇਨਾਮ"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2186,12 +2191,12 @@
 "identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "ਨਾ-ਪਰਿਭਾਸ਼ਤ ਇੰਕ੍ਰਿਪਟ ਕੁੰਜੀ"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2199,12 +2204,12 @@
 "in the identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "ਨਾ-ਪਰਿਭਾਸ਼ਤ ਦਸਤਖਤੀ ਕੁੰਜੀ"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2212,7 +2217,7 @@
 "for each message."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2221,37 +2226,37 @@
 "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸੁਨੇਹੀ ਤਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ, ਭਾਵੇਂ ਵੱਲ: ਖੇਤਰ ਵਿੱਚ, ਜਾਂ ਨਕਲ  (CC) ਜਾਂ ਲੁਕਵੀ "
 "ਨਕਲ (BCC) ਦੇ ਰੂਪ ਵਿੱਚ।"
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "ਵੱਲ: ਖੇਤਰ ਖਾਲੀ ਹੈ। ਕੀ ਸੁਨੇਹਾ ਕਿਸੇ ਵੀ ਤਰ੍ਹਾਂ ਭੇਜਣਾ ਹੈ?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "ਵੱਲ: ਨਹੀਂ ਦਿੱਤਾ"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "ਤੁਸੀਂ ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ ਹੈ। ਕੀ ਸੁਨੇਹਾ ਇੰਜ ਹੀ ਭੇਜਣਾ ਹੈ?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "ਇੰਞ ਭੇਜੋ(&e)"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "ਵਿਸ਼ਾ ਦਿਓ(&S)"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2263,88 +2268,88 @@
 "ਤੁਹਾਨੂੰ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਸੁਨੇਹੀ ਤਾਂ ਦੇਣਾ ਚਾਹੀਦਾ ਹੈ, ਭਾਵੇਂ ਵੱਲ: ਖੇਤਰ ਵਿੱਚ, ਜਾਂ ਨਕਲ ਜਾਂ ਲੁਕਵੀ ਨਕਲ ਦੇ ਰੂਪ "
 "ਵਿੱਚ।"
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "ਈ-ਮੇਲ ਭੇਜਣ ਬਾਰੇ..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "ਭੇਜਣ ਬਾਰੇ ਪੁਸ਼ਟੀ"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "ਹੁਣੇ ਭੇਜੋ(&S)"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr "ਤੁਸੀਂ %1 ਤੋਂ ਵੱਧ ਪ੍ਰਾਪਤ ਕਰਤਾ ਨੂੰ ਮੇਲ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਹੇ ਹੋ। ਕੀ ਸੁਨੇਹਾ ਭੇਜਣਾ ਹੈ?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "ਬਹੁਤੇ ਪ੍ਰਾਪਤਕਰਤਾ"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "ਇੰਞ ਭੇਜੋ(&S)"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "ਪ੍ਰਾਪਤ ਕਰਤਾ ਸੋਧ(&E)"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "HTML ਮੋਡ ਬੰਦ ਕਰਨ ਨਾਲ ਟੈਕਸਟ ਦਾ ਫਾਰਮੈਟ ਖਤਮ ਹੋ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਇੰਝ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "ਫਾਰਮੈਟ ਖਤਮ ਕਰਨਾ ਹੈ?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "ਫਾਰਮੈਟ ਖਤਮ ਕਰੋ"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "ਪਲੇਨ ਟੈਕਸਟ ਵਾਂਗ ਸੁਨੇਹਾ"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2352,7 +2357,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2432,25 +2437,25 @@
 msgid "External editor was started."
 msgstr "ਬਾਹਰੀ ਸੰਪਾਦਕ"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2477,11 +2482,6 @@
 msgid "Message will not be encrypted"
 msgstr "ਸੁਨੇਹਾ ਇੰਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾਵੇਗਾ"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "ਸਨਿੱਪਟ ਟੈਕਸਟ"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2530,31 +2530,31 @@
 msgid "Cannot move messages."
 msgstr "ਸੁਨੇਹੇ %1 ਵਿੱਚ ਕਾਪੀ ਕਰੋ ਜਾਂ ਭੇਜੋ"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ ਚੁਣਿਆ"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "ਫੋਲਡਰ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Unable to retrieve folder list."
 msgid "Unable to return list of folders."
 msgstr "ਫੋਲਡਰ ਲਿਸਟ ਲੈਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।"
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgctxt ""
 #| "@info:tooltip Formats to something like 'Messages received Yesterday'"
@@ -2601,50 +2601,50 @@
 msgid "&Existing identities:"
 msgstr "ਮੌਜੂਦਾ ਪਛਾਣ(&E):"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "ਫੋਲਡਰ %1 ਦਾ ਨਾਂ ਬਦਲਣ ਵਿੱਚ ਗਲਤੀ"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "ਨਵਾਂ ਸ਼ਬਦ ਦਿਓ:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "ਪਛਾਣ ਸੋਧ"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "ਸਧਾਰਨ"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "ਤੁਹਾਡਾ ਨਾਂ(&Y):"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2656,12 +2656,12 @@
 "ਲੋਕਾਂ ਨੂੰ ਵਿਖਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ,</p> <p>ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਤੁਹਾਡਾ ਅਸਲੀ ਨਾਂ "
 "ਵਿਖਾਇਆ ਨਹੀਂ ਜਾਵੇਗਾ, ਸਿਰਫ਼ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿਖਾਈ ਦੇਵੇਗਾ।</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "ਸੰਗਠਨ(&z):"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2678,12 +2678,12 @@
 "ਲੋਕਾਂ ਨੂੰ ਵਿਖਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ,</p> <p>ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਛੱਡ ਦਿੱਤਾ ਤਾਂ, ਤੁਹਾਡਾ ਅਸਲੀ ਨਾਂ "
 "ਵਿਖਾਇਆ ਨਹੀਂ ਜਾਵੇਗਾ, ਸਿਰਫ਼ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਵਿਖਾਈ ਦੇਵੇਗਾ।</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "ਈ-ਮੇਲ ਐਡਰੈੱਸ(&E):"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2693,12 +2693,12 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "ਈਮੇਲ ਏਲੀਆਸ(&l):"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2709,12 +2709,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "ਕਰਿਪਟੋਗਰਾਫ਼ੀ"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2724,12 +2724,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP ਦਸਤਖਤੀ ਕੁੰਜੀ:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2740,12 +2740,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2754,12 +2754,12 @@
 "not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME ਦਸਤਖਤੀ ਸਰਟੀਫਿਕੇਟ:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2769,42 +2769,42 @@
 "functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME ਇੰਕ੍ਰਿਪਸ਼ਨ ਸਰਟੀਫਿਕੇਟ:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, fuzzy, kde-format
 #| msgid "Preferred crypto message format:"
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "ਕਰਪੀਟ ਸੁਨੇਹੇ ਫਾਰਮੈਟ ਪਸੰਦ:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "ਆਟੋਮੈਟਿਕ ਦਸਤਖਤ ਸੁਨੇਹੇ(&A)"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "ਜਦੋਂ ਵੀ ਸੰਭਵ ਹੋਵੇ ਤਾਂ ਸੁਨੇਹੇ ਆਟੋਮੈਟਿਕ ਹੀ ਇੰਕ੍ਰਿਪਟ ਕਰੋ(&m)"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "ਤਕਨੀਕੀ"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "ਜਵਾਬ ਐਡਰੈੱਸ(&R):"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2815,13 +2815,13 @@
 "address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, fuzzy, kde-format
 #| msgid "&BCC addresses:"
 msgid "&CC addresses:"
 msgstr "&BCC ਸਿਰਨਾਵੀਂ:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2832,12 +2832,12 @@
 "blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC ਸਿਰਨਾਵੀਂ:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2848,94 +2848,94 @@
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "ਡਿਕਸ਼ਨਰੀ(&i):"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "ਭੇਜੇ-ਪੱਤਰ ਫੋਲਡਰ(&f):"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "ਡਰਾਫਟ ਫੋਲਡਰ(&D):"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "ਟੈਂਪਲੇਟ ਫੋਲਡਰ(&T):"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, fuzzy, kde-format
 #| msgid "Configure Account"
 msgid "Outgoing Account:"
 msgstr "ਅਕਾਊਂਟ ਸੰਰਚਨਾ"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Attach my vCard to message"
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ 'ਹੈਂਡਰ' ਸ਼ਾਮਿਲ ਕਰੋ"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, fuzzy, kde-format
 #| msgid "Rename..."
 msgid "Create..."
 msgstr "ਨਾਂ ਬਦਲੋ..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr ""
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "ਡਿਫਾਲਟ ਡੋਮੇਨ(&t):"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "ਡਿਫਾਲਟ ਡੋਮੇਨ(&t):"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "ਇਹ ਪਛਾਣ ਲਈ ਵਿੱਚ ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ ਟੈਪਲੇਟ ਵਰਤੋਂ(&U)"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "ਦਸਤਖਤ"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "ਤਸਵੀਰ"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "ਗਲਤ ਈ-ਮੇਲ ਏਲੀਆਸ \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "ਗਲਤ ਈ-ਮੇਲ ਐਡਰੈੱਸ"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2944,14 +2944,14 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
 "with the configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2960,36 +2960,36 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "ਕੁੰਜੀ/ਸਰਟੀਫਿਕੇਟ ਵਿੱਚ ਕੋਈ ਈ-ਮੇਲ ਐਡਰੈੱਸ ਨਹੀਂ ਮਿਲਿਆ"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "ਦਸਤਖਤ ਫਾਇਲ ਜਾਇਜ਼ ਨਹੀਂ ਹੈ"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "ਪਛਾਣ \"%1\" ਸੋਧ"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "ਸੋਧ..."
@@ -3027,6 +3027,21 @@
 msgid "We cannot delete vCard file."
 msgstr "maildir ਫੋਲਡਰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgctxt "@info"
+#| msgid "Do you really want to execute <filename>%1</filename>?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "ਕੀ ਤੁਸੀਂ <filename>%1</filename> ਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? "
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "ਭੇਜਣ ਬਾਰੇ ਪੁਸ਼ਟੀ"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3181,7 +3196,7 @@
 "ਉਦਾਹਰਨਾਂ <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">http://www.xs4all.nl/"
 "~ace/X-Faces/</a> ਉੱਤੇ ਉਪਲੱਬਧ ਹਨ।"
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3215,7 +3230,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਸ਼ਾਮਲ"
@@ -3226,24 +3241,24 @@
 msgid "Contact created successfully"
 msgstr "ਸੁਨੇਹੇ ਸਫਲਤਾਪੂਰਕ ਹਟਾਏ ਗਏ ਹਨ।"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Failed to store contact"
 msgstr "ਅਟੈਚ ਸੋਧਣ ਤੋਂ ਅਸਮੱਰਥ"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਫੋਲਡਰ ਨੂੰ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Archive Folder"
 msgid "Attach Folder"
@@ -3465,7 +3480,7 @@
 msgstr "ਫੋਲਡਰ(&o)"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3473,7 +3488,7 @@
 msgstr "ਸਭ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ(&y)"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current Folder & All Subfolders"
@@ -3500,7 +3515,7 @@
 msgstr "ਅੱਗੇ(&F)"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "ਫਿਲਟਰ ਲਾਗੂ(&p)"
@@ -3525,7 +3540,7 @@
 msgstr "ਮੱਦਦ(&H)"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "ਮੇਨ ਟੂਲਬਾਰ"
@@ -3580,44 +3595,44 @@
 msgid "The file does not contain a message."
 msgstr "ਫਾਇਲ ਵਿੱਚ ਇੱਕ ਸੁਨੇਹਾ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "ਫਾਇਲ ਵਿੱਚ ਕਈ ਸੁਨੇਹੇ ਹਨ। ਸਿਰਫ਼ ਪਹਿਲਾਂ ਸੁਨੇਹਾ ਹੀ ਵੇਖਾਇਆ ਜਾਵੇਗਾ।"
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "ਡਿਜ਼ੀਟ ਵਾਂਗ ਭੇਜੋ"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "ਵੱਖ ਵੱਖ ਭੇਜੋ"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "ਸੁਨੇਹੇ ਫਿਲਟਰ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "%2 ਵਿੱਚੋਂ %1 ਸੁਨੇਹੇ ਫਿਲਟਰ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "ਸੁਨੇਹੇ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ"
@@ -3646,29 +3661,29 @@
 msgid "Text Direction Toolbar"
 msgstr "ਟੈਕਸਟ ਦਿਸ਼ਾ ਟੂਲਬਾਰ"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "ਕੇਮੇਲ ਆਫਲਾਇਨ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਸਭ ਨੈੱਟਵਰਕ ਜਾਬ ਸਸਪੈਂਡ ਕੀਤੇ ਗਏ।"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "ਈ-ਮੇਲ ਭੇਜਣ ਬਾਰੇ..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "ਕੇਮਲ ਆਨ-ਲਾਇਨ ਸੈੱਟ ਕੀਤਾ ਗਿਆ, ਸਭ ਨੈੱਟਵਰਕ ਜਾਬ ਚਾਲੂ ਕੀਤੇ ਗਏ।"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3676,51 +3691,51 @@
 "connection is detected"
 msgstr "ਕੇਮਲ ਆਨ-ਲਾਇਨ ਸੈੱਟ ਕੀਤਾ ਗਿਆ, ਸਭ ਨੈੱਟਵਰਕ ਜਾਬ ਚਾਲੂ ਕੀਤੇ ਗਏ।"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "ਕੇ-ਮੇਲ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਹੈ। ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "ਆਨਲਾਇਨ/ਆਫਲਾਇਨ"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "ਆਨਲਾਇਨ ਜਾਓ"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "ਆਫਲਾਇਨ ਹੀ ਚੱਲੋ"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
 msgstr "ਕੇਮਲ ਆਨ-ਲਾਇਨ ਸੈੱਟ ਕੀਤਾ ਗਿਆ, ਸਭ ਨੈੱਟਵਰਕ ਜਾਬ ਚਾਲੂ ਕੀਤੇ ਗਏ।"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "ਕੇਮੇਲ ਆਫਲਾਇਨ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਸਭ ਨੈੱਟਵਰਕ ਜਾਬ ਸਸਪੈਂਡ ਕੀਤੇ ਗਏ।"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "ਆਟੋ-ਸੰਭਾਲਣ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3728,7 +3743,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3736,43 +3751,45 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "...ਭੇਜਣ ਕਾਰਵਾਈ ਸ਼ੁਰੂ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3780,12 +3797,12 @@
 "properly installed."
 msgstr "ਸਰਟੀਫਕੇਟ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ।"
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "ਕੇ-ਮੇਲ ਗਲਤੀ"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -3793,27 +3810,27 @@
 "properly installed."
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ।"
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start import wizard"
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ।"
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -3821,96 +3838,96 @@
 "properly installed."
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ।"
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start ImportWizard"
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "ਅਕਾਊਂਟ ਸਹਾਇਕ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ। ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ।"
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(ਟੈਪਲੇਟ ਨਹੀਂ)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "ਇਹ ਫੋਲਡਰ ਲਈ ਕੋਈ ਮਿਆਦ ਚੋਣ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਹੈ।"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਫੋਲਡਰ ਦੀ ਮਿਆਦ ਪੂਰੀ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "ਫੋਲਡਰ ਮਿਆਦ"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "ਮਿਆਦ(&E)"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਫੋਲਡਰ ਨੂੰ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr "<qt>ਕੀ ਤੁਸੀਂ <b>%1</b> ਫੋਲਡਰ ਤੋਂ ਸਭ ਸੁਨੇਹੇ ਰੱਦੀ 'ਚ ਭੇਜਣ ਲਈ ਸਹਿਮਤ ਹੋ?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਰੱਦੀ 'ਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸਭ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ ਖਤਮ ਕਰਨੀ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "ਕੀ ਪੁਰਾਣੇ ਸੁਨੇਹਿਆਂ ਦੀ ਮਿਆਦ ਪੁੱਗੀ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "ਮਿਆਦ"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3918,17 +3935,17 @@
 "compromised by other present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "ਬਾਹਰੀ ਹਵਾਲਾ ਲੋਡ"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3943,410 +3960,410 @@
 "<qt>ਕੀ ਤੁਸੀਂ ਚੁਣੇ %1 ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਚਾਹੁੰਦੇ ਹੋ?<br />ਇੱਕ ਵਾਰ ਹਟਾਏ ਤਾਂ ਇਹਨਾਂ ਨੂੰ ਸਟੋਰ ਨਹੀਂ ਕੀਤਾ "
 "ਜਾ ਸਕਦਾ।</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "ਸੁਨੇਹੇ ਹਟਾਓ"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "ਸੁਨੇਹਾ ਹਟਾਓ"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "ਸੁਨੇਹੇ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "ਸੁਨੇਹੇ ਸਫਲਤਾਪੂਰਕ ਹਟਾਏ ਗਏ ਹਨ।"
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "ਸੁਨੇਹੇ ਸਫਲਤਾਪੂਰਕ ਭੇਜੇ ਗਏ"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਅਸਫ਼ਲ ਹੈ।"
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "ਸੁਨੇਹੇ ਹਟਾਉਣੇ ਰੱਦ ਕੀਤੇ ਗਏ ਹਨ।"
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣਾ ਅਸਫਲ ਹੈ।"
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "ਸੁਨੇਹੇ ਭੇਜਣਾ ਰੱਦ ਕੀਤਾ ਹੈ।"
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "ਸੁਨੇਹੇ ਕਾਪੀ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "ਸੁਨੇਹੇ ਸਫਲਤਾਪੂਰਕ ਕਾਪੀ ਕੀਤੇ ਗਏ"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "ਸੁਨੇਹੇ ਕਾਪੀ ਕਰਨਾ ਅਸਫਲ ਹੈ।"
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "ਸੁਨੇਹੇ ਕਾਪੀ ਕਰਨੇ ਰੱਦ ਕੀਤੇ।"
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "ਸੁਨੇਹੇ ਫੋਲਡਰ 'ਚ ਕਾਪੀ ਕਰੋ"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "ਸੁਨੇਹੇ ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "ਸੁਨੇਹੇ ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "ਸੁਨੇਹੇ ਰੱਦੀ ਵਿੱਚ ਭੇਜੇ ਗਏ।"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "ਸੁਨੇਹੇ ਰੱਦੀ ਵਿੱਚ ਭੇਜੇ ਗਏ।"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "ਸੁਨੇਹੇ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "ਸੁਨੇਹੇ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "ਸੁਨੇਹੇ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣੇ ਰੱਦ ਕੀਤੇ"
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "ਸੁਨੇਹੇ ਰੱਦੀ ਵਿੱਚ ਭੇਜਣੇ ਰੱਦ ਕੀਤੇ"
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ(&A)..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "ਸਭ ਫੋਲਡਰਾਂ ਦੀ ਮਿਆਦ ਖਤਮ(&E)"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "ਮੇਲ ਚੈੱਕ ਕਰੋ(&M)"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "ਮੇਲ ਚੈੱਕ ਕਰੋ"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "ਮੇਲ ਚੈੱਕ ਕਰੋ"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "ਕਤਾਰਬੱਧ ਸੁਨੇਹੇ ਭੇਜੋ(&S)"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "ਆਨ-ਲਾਈਨ ਹਾਲਤ (ਅਣਜਾਣ)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "ਕਤਾਰਬੱਧ ਸੁਨੇਹੇ ਇਸ ਰਾਹੀ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਮੈਨੇਜਰ"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages"
 msgid "&Import Messages..."
 msgstr "ਸੁਨੇਹੇ ਇੰਪੋਰਟ(&I)"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Sieve ਡੀਬੱਗ(&D)..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "ਫਿਲਟਰ ਲਾਗ ਦਰਸ਼ਕ(&L)..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "\"ਦਫ਼ਤਰੋਂ ਬਾਹਰ\" ਜਵਾਬ ਸੋਧ..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਸੰਰਚਨਾ(&N)..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "ਸੁਨੇਹੇ ਹਟਾਏ ਜਾ ਰਹੇ ਹਨ..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "ਸੁਨੇਹੇ ਖੋਜ(&F)..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "ਹਟਾਓ(&D)"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "ਮਾਮਲਾ ਰੱਦੀ 'ਚ ਭੇਜੋ(&o)"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "ਮਾਮਲਾ ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "ਮਾਮਲਾ ਹਟਾਓ(&h)"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "ਸੁਨੇਹੇ ਖੋਜ(&F)..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਚੁਣੋ(&A)"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਪਰਬੰਧ(&M)..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "ਸ਼ਾਰਟਕੱਟ ਦਿਓ(&A)..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "ਮਿਆਦ ਸੈਟਿੰਗ(&E)"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "ਅਕਾਇਵ ਫੋਲਡਰ(&A)..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "ਬਾਹਰੀ ਹਵਾਲਾ ਲੋਡ(&x)"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "ਸੁਨੇਹਾ ਕਾਪੀ ਕਰੋ... ਵਿੱਚ"
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "ਸੁਨੇਹਾ ਭੇਜੋ... ਵਿੱਚ"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "ਨਵਾਂ ਸੁਨੇਹਾ(&N)..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "ਨਵਾਂ"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "ਟੈਂਪਲੇਟ ਤੋਂ ਸੁਨੇਹਾ(&T)"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਲਈ ਨਵਾਂ ਸੁਨੇਹਾ(&o)..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "ਫਿਲਟਰ ਬਣਾਓ(&C)"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "ਵਿਸ਼ੇ ਉੱਤੇ ਫਿਲਟਰ(&S)..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "ਵਲੋਂ ਉੱਤੇ ਫਿਲਟਰ(&F)..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "ਵੱਲ ਉੱਤੇ ਫਿਲਟਰ(&T)..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "ਵੱਲ ਉੱਤੇ ਫਿਲਟਰ(&T)..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "ਥਰਿੱਡ ਮਾਰਕ ਕਰੋ(&T)"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "ਥਰਿੱਡ ਪੜ੍ਹਿਆ ਮਾਰਕ ਕਰੋ(&R)"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "ਚੁਣੇ ਮਾਮਲੇ ਵਿੱਚ ਸਭ ਸੁਨੇਹੇ ਪੜ੍ਹੇ ਬਣਾਓ"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "ਮਾਮਲਾ ਨਾ-ਪੜ੍ਹਿਆ ਬਣਾਓ(&U)"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "ਚੁਣੇ ਮਾਮਲੇ ਵਿੱਚ ਸਭ ਸੁਨੇਹਿਆਂ ਨੂੰ ਨਾ-ਪੜ੍ਹੇ ਬਣਾਓ"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "ਥਰੈੱਡ ਖਾਸ ਵਾਂਗ ਮਾਰਕ ਕਰੋ(&I)"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "ਖਾਸ ਥਰਿੱਡ (ਮਾਮਲਾ) ਨਿਸ਼ਾਨ ਹਟਾਓ(&I)"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "ਮਾਮਲੇ ਨੂੰ ਐਕਸ਼ਨ ਆਈਟਮ ਵਜੋਂ ਨਿਸ਼ਨਾਬੱਧ(&A)"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 #| msgid "Remove &Important Message Mark"
 msgid "Remove &Action Item Thread Mark"
 msgstr "ਖਾਸ ਸੁਨੇਹਾ ਮਾਰਕ ਹਟਾਓ(&M)"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "ਮਾਮਲਾ ਵੇਖੋ(&W)"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "ਮਾਮਲਾ ਅਣਡਿੱਠਾ(&I)"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੋ(&t)..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Message To..."
 msgid "Copy Decrypted To..."
 msgstr "ਸੁਨੇਹਾ ਕਾਪੀ ਕਰੋ... ਵਿੱਚ"
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "ਸਭ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ(&y)"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4354,13 +4371,13 @@
 msgid "&Expand Thread / Group"
 msgstr "ਮਾਮਲਾ ਫੈਲਾਓ(&E)"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "ਮੌਜੂਦਾ ਮਾਮਲਾ ਫੈਲਾਓ"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4368,123 +4385,123 @@
 msgid "&Collapse Thread / Group"
 msgstr "ਮਾਮਲਾ ਸਮੇਟੋ(&C)"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "ਮੌਜੂਦਾ ਮਾਮਲਾ ਸਮੇਟੋ"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "ਸਭ ਮਾਮਲੇ ਫੈਲਾਓ(&p)"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚਲੇ ਮਾਮਲੇ ਫੈਲਾਓ"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "ਸਭ ਮਾਮਲੇ ਸਮੇਟੋ(&o)"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "ਮੌਜੂਦਾ ਫੋਲਡਰ ਵਿੱਚ ਸਭ ਮਸਲੇ ਸਮੇਟੋ"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "ਸੁਨੇਹੇ ਵੇਖੋ(&D)"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "ਅੱਗੇ ਸੁਨੇਹਾ(&N)"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "ਅਗਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ(&N)"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "ਅੱਗੇ"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "ਅਗਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "ਪਿੱਛੇ ਸੁਨੇਹਾ(&P)"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "ਪਿਛਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "ਪਿਛਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ(&M)"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "ਪਿੱਛੇ"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "ਪਿਛਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਫੋਲਡਰ(&F)"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਨਾਲ ਅਗਲੇ ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "ਪਿੱਛੇ ਨਾ-ਪੜ੍ਹਿਆ ਫੋਲਡਰ(&o)"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹਿਆਂ ਨਾਲ ਪਿਛਲੇ ਫੋਲਡਰ ਵਿੱਚ ਜਾਓ"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜ੍ਹਿਆ ਪਾਠ(&T)"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "ਅੱਗੇ ਨਾ-ਪੜੇ ਪਾਠ ਤੇ ਜਾਓ"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4492,236 +4509,242 @@
 msgstr ""
 "ਮੌਜੂਦਾ ਸੁਨੇਹੇ ਦੇ ਹੇਠਾਂ ਜਾਓ। ਜੇਕਰ ਮੌਜੂਦਾ ਸੁਨੇਹਾ ਖਤਮ ਹੋ ਗਿਆ ਹੋਵੇ ਤਾਂ ਅਗਲੇ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ ਜਾਓ।"
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "ਫਿਲਟਰ ਸੰਰਚਨਾ(&F)..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "ਸਿਈਵੀ ਸਕ੍ਰਿਪਟ ਪਰਬੰਧ(&S)..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "ਅਕਾਊਂਟ ਸ਼ਾਮਲ"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "ਕੇ-ਮੇਲ ਜਾਣ ਪਛਾਣ(&I)"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "ਕੇਮੇਲ ਦਾ ਜੀ ਆਇਆਂ ਨੂੰ ਪੇਜ਼ ਵੇਖੋ"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਸੰਰਚਨਾ(&N)..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "ਕੇਮੇਲ ਸੰਰਚਨਾ(&C)..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "ਮਿਆਦ..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "ਪਸੰਦੀਦਾ ਫੋਲਡਰ ਸ਼ਾਮਲ..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, fuzzy, kde-format
 #| msgid "Subscription..."
 msgid "Serverside Subscription..."
 msgstr "ਮੈਂਬਰੀ..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "ਸਭ ਫਿਲਟਰ ਲਾਗੂ ਕਰੋ(&y)"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "ਕੇਮੇਲ ਸੰਰਚਨਾ(&C)..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, fuzzy, kde-format
 #| msgid "Open in Address Book"
 msgid "New AddressBook Contact..."
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ 'ਚ ਨਕਲ"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "ਮੌਜੂਦਾ ਕਾਰਵਾਈ ਅਧੂਰੀ ਛੱਡੋ"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "ਅਗਲੇ ਫੋਲਡਰ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "ਪਿਛਲੇ ਫੋਲਡਰ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "ਚੁਣੋ ਫੋਲਡਰ ਨਾਲ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "ਅਗਲੇ ਫੋਲਡਰ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "ਅਗਲੇ ਫੋਲਡਰ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "ਅਗਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "ਪਿਛਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਫੋਕਸ"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਚੁਣੋ(&A)"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਚੁਣੋ(&A)"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "ਕੇਂਦਰ ਨਾਲ ਸੁਨੇਹੇ ਚੁਣੋ"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "ਤੁਰੰਤ ਖੋਜ ਉੱਤੇ ਫੋਕਸ ਸੈੱਟ ਕਰੋ"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "ਪਿਛਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਚੋਣ ਵਧਾਓ"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "ਅਗਲੇ ਸੁਨੇਹੇ ਉੱਤੇ ਚੋਣ ਵਧਾਓ"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "ਸੁਨੇਹੇ ਨੂੰ ਫੋਲਡਰ 'ਚ ਭੇਜੋ"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message Window"
 msgid "Use Less Bandwidth"
 msgstr "ਸੁਨੇਹਾ ਵਿੰਡੋ"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "ਸੈਟਿੰਗ(&S)"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "ਪਛਾਣ ਨਾਂ"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "ਪਸੰਦ ਫੋਲਡਰ ਸ਼ਾਮਲ"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "ਰੱਦੀ ਖਾਲੀ ਕਰੋ(&m)"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਰੱਦੀ 'ਚ ਭੇਜੋ(&M)"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "ਖੋਜ ਹਟਾਓ(&D)"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "ਸਕ੍ਰਿਪਟ ਸੋਧ..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "ਫਿਲਟਰ %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "ਸ਼ੁਰੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4729,12 +4752,12 @@
 "present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML ਵਰਤੋਂ"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4744,194 +4767,194 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ(&a)"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "ਸ਼ੁਰੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ(&M)"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "ਰੱਦੀ"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "ਸੁਨੇਹਾ ਰੱਦੀ ਵਿੱਚ ਭੇਜੋ"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Copy or Move Messages to %1"
 msgid "Cannot copy item. %1"
 msgstr "ਸੁਨੇਹੇ %1 ਵਿੱਚ ਕਾਪੀ ਕਰੋ ਜਾਂ ਭੇਜੋ"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "... ਨੂੰ ਨਵਾਂ ਸੁਨੇਹਾ"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "... ਨੂੰ ਜਵਾਬ"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "... ਨੂੰ ਅੱਗੇ ਭੇਜੋ"
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Add to Existing Contact"
 msgstr "ਅਟੈਚ ਸੋਧਣ ਤੋਂ ਅਸਮੱਰਥ"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "ਐਡਰੈੱਸ ਬੁੱਕ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "ਇਹ ਲਿੰਕ ਬੁੱਕਮਾਰਕ ਕਰੋ"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit Note..."
 msgid "Edit contact..."
 msgstr "...ਨੋਟ ਸੋਧ"
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "ਲਿੰਕ ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਖੋਜ(&F)..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "ਲਿੰਕ ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Show HTML stat&us bar"
 msgid "Show HTML Format"
 msgstr "HTML ਹਾਲਤ ਪੱਟੀ ਵੇਖੋ(&u)"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 #| msgid "Load external references from the Internet for this message."
 msgid "Load external reference when mail comes for this contact"
 msgstr "ਇਹ ਸੁਨੇਹੇ ਲਈ ਇੰਟਰਨੈੱਟ ਤੋਂ ਬਾਹਰੀ ਹਵਾਲਾ ਲੋਡ ਕਰੋ।"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "ਲਿੰਕ ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "ਪੁਸ਼ ਮੇਲ (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG ਸਹਿਯੋਗ"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁਸ਼ਟੀ(&b)"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE ਈ-ਮੇਲ ਕਲਾਇਟ"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folderlist"
 msgid "Retrieving Folder Contents"
 msgstr "ਫੋਲਡਰ-ਲਿਸਟ ਲਈ ਜਾ ਰਹੀ ਹੈ"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "ਉਡੀਕੋ ਜੀ"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "ਆਫਲਾਇਨ ਹੀ ਚੱਲੋ"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -4944,7 +4967,7 @@
 "<h2 style='margin-top: 0px;'>ਆਫਲਾਇਨ</h2><p>ਕੇ-ਮੇਲ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਹੈ। "
 "ਆਨਲਾਇਨ ਜਾਣ ਲਈ <a href=\"kmail:goOnline\">ਇੱਥੇ</a> ਕਲਿੱਕ ਕਰੋ. . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -4957,23 +4980,23 @@
 "<h2 style='margin-top: 0px;'>ਆਫਲਾਇਨ</h2><p>ਕੇ-ਮੇਲ ਇਸ ਸਮੇਂ ਆਫਲਾਇਨ ਮੋਡ ਵਿੱਚ ਹੈ। "
 "ਆਨਲਾਇਨ ਜਾਣ ਲਈ <a href=\"kmail:goOnline\">ਇੱਥੇ</a> ਕਲਿੱਕ ਕਰੋ. . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully."
 msgid "Contact modified successfully"
 msgstr "ਸੁਨੇਹੇ ਸਫਲਤਾਪੂਰਕ ਭੇਜੇ ਗਏ"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "ਨਵਾਂ ਸੁਨੇਹੇ ਹਨ"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "ਕੋਈ ਵੀ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ ਨਹੀਂ ਹੈ"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4996,8 +5019,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5091,19 +5114,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "ਸੰਪਰਕ"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5152,28 +5175,28 @@
 msgid "All"
 msgstr "ਸਭ"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2009, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) ੧੯੯੭-੨੦੦੯, ਕੇਮੇਲ ਡਿਵੈਲਪਰ"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5201,7 +5224,7 @@
 msgid "&Reply"
 msgstr "ਜਵਾਬ(&R)"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "ਜਵਾਬ(&R)..."
@@ -5211,12 +5234,12 @@
 msgid "Reply to A&uthor..."
 msgstr "ਲੇਖਕ ਨੂੰ ਜਵਾਬ(&u)..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ(&A)..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "ਮੇਲਿੰਗ ਲਿਸਟ ਨੂੰ ਜਵਾਬ(&L)..."
@@ -5247,7 +5270,7 @@
 msgid "&Edit As New"
 msgstr "ਸੁਨੇਹਾ ਸੋਧ(&E)"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5451,115 +5474,115 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "ਸੁਨੇਹੇ ਖੋਜ"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "ਖੋਜ(&S)"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "ਲਾਈਨ ਵਿੱਚ(&I)..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "ਅਟੈਚਮੈਂਟ ਵਾਂਗ(&A)..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "ਅਟੈਚਮੈਂਟ ਸੰਭਾਲੋ..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "ਚੋਣ ਸਾਫ਼ ਕਰੋ"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "ਫੋਲਡਰ ਉੱਤੇ ਜਾਓ"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 ਮੇਲ਼"
 msgstr[1] "%1 ਮੇਲ਼"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "ਆਖਰੀ ਖੋਜ"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 #| msgid "Could not sync maildir folder."
 msgid "You did not selected a valid folder."
 msgstr "maildir ਫੋਲਡਰ ਸਮਕਾਲੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "ਸ਼ੁਰੂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Copy or Move Messages to %1"
 msgid "Cannot get search result. %1"
 msgstr "ਸੁਨੇਹੇ %1 ਵਿੱਚ ਕਾਪੀ ਕਰੋ ਜਾਂ ਭੇਜੋ"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "ਖੋਜ ਰੱਦ ਕੀਤੀ"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgctxt "@info:status Number of emails retrieved."
 #| msgid " completed"
 msgid "Search complete."
 msgstr " ਮੁਕੰਮਲ"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgctxt ""
 #| "@info/plain Displayed grayed-out inside the textbox, verb to search"
@@ -5567,7 +5590,7 @@
 msgid "Search stopped."
 msgstr "ਖੋਜ"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5575,21 +5598,21 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "ਸੁਨੇਹਾ ਕਾਪੀ ਕਰੋ"
 msgstr[1] "%1 ਸੁਨੇਹੇ ਕਾਪੀ ਕਰੋ"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "ਸੁਨੇਹਾ ਕੱਟੋ"
 msgstr[1] "%1 ਸੁਨੇਹੇ ਕੱਟੋ"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5714,7 +5737,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5722,7 +5745,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5730,19 +5753,19 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "ਫੋਲਡਰ ਤੇਜ਼ ਖੋਜ ਲਾਈਨ ਸੋਧ ਵੇਖੋ"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "ਅੱਗੇ ਭੇਜਣ ਇਨ-ਲਾਈਨ ਵਜੋਂ ਡਿਫਾਲਟ ਰੱਖੋ।"
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Warn if the number of recipients is more than:"
@@ -5750,7 +5773,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5759,21 +5782,21 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਪੁਸ਼ਟੀ(&b)"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, fuzzy, kde-format
 #| msgid "Message Sort Direction"
 msgid "Automatically request &message disposition notifications"
 msgstr "ਸੁਨੇਹਾ ਲੜੀਬੱਧ ਦਿਸ਼ਾ"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5784,13 +5807,13 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "ਆਟੋ-ਸੰਭਾਲ ਇੰਟਰਵਲ:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5799,151 +5822,151 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "ਜੇ ਚੋਣ ਕੀਤੀ ਗਈ, ਤਾਂ ਭੇਜੇ ਗਏ ਸੁਨੇਹਿਆਂ ਨੂੰ ਇੰਕ੍ਰਿਪਟ ਕੀਤੇ ਰੂਪ ਵਿੱਚ ਸਟੋਰ ਕੀਤਾ ਜਾਵੇਗਾ"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "ਸਭ ਤਾਜ਼ਾ ਵਰਤੇ URL ਦੀ ਲਿਸਟ ਹੈ"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "ਪਛਾਣ ਡਾਈਲਾਗ ਦਾ ਆਕਾਰ (ਕੇਵਲ ਅੰਦਰੂਨੀ ਵਰਤੋਂ ਲਈ ਹੀ)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "ਖੋਜ ਵਿੰਡੋ ਦੀ ਚੌੜਾਈ (ਕੇਵਲ ਅੰਦਰੂਨੀ ਵਰਤੋਂ ਲਈ ਹੀ)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "ਖੋਜ ਵਿੰਡੋ ਦੀ ਉਚਾਈ (ਕੇਵਲ ਅੰਦਰੂਨੀ ਵਰਤੋਂ ਲਈ ਹੀ)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "ਸੰਰਚਨਾ ਕੇਮੇਲ ਡਾਈਲਾਗ ਦੀ ਚੌੜਾਈ (ਅੰਦਰੂਨੀ ਵਰਤੋਂ ਲਈ ਹੀ)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "ਸੰਰਚਨਾ ਕੇਮੇਲ ਡਾਈਲਾਗ ਦੀ ਉਚਾਈ (ਅੰਦਰੂਨੀ ਵਰਤੋਂ ਲਈ ਹੀ)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਬਾਹੀ"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "ਸੁਨੇਹਾ ਝਲਕ ਬਾਹੀ ਨਾ ਵੇਖਾਓ"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਦੇ ਹੇਠਾਂ ਸੁਨੇਹਾ ਝਲਕ ਬਾਹੀ ਵੇਖੋ"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "ਸੁਨੇਹਾ ਲਿਸਟ ਦੇ ਅੱਗੇ ਸੁਨੇਹਾ ਝਲਕ ਬਾਹੀ ਵੇਖੋ"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "ਫੋਲਡਰ ਲਿਸਟ"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "ਲੰਮੀ ਫੋਲਡਰ ਲਿਸਟ"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "ਛੋਟੀ ਫੋਲਡਰ ਲਿਸਟ"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "ਨਵੇਂ ਸੁਨੇਹੇ ਲਈ ਸੁਨੇਹਾ ਟੈਂਪਲੇਟ"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "ਜਵਾਬ ਲਈ ਸੁਨੇਹਾ ਟੈਂਪਲੇਟ"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "ਸਭ ਨੂੰ ਜਵਾਬ ਲਈ ਸੁਨੇਹਾ ਟੈਂਪਲੇਟ"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "ਅੱਗੇ ਭੇਜਣ ਲਈ ਸੁਨੇਹਾ ਟੈਂਪਲੇਟ"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "ਹਵਾਲਾ ਅੱਖਰ"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, fuzzy, kde-format
 #| msgid "The width of the Configure KMail dialog (for internal use only)"
 msgid ""
@@ -5952,7 +5975,7 @@
 msgstr "ਸੰਰਚਨਾ ਕੇਮੇਲ ਡਾਈਲਾਗ ਦੀ ਚੌੜਾਈ (ਅੰਦਰੂਨੀ ਵਰਤੋਂ ਲਈ ਹੀ)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5960,7 +5983,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5968,7 +5991,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, fuzzy, kde-format
 #| msgid "The width of the search window (for internal use only)"
 msgid ""
@@ -5977,7 +6000,7 @@
 msgstr "ਖੋਜ ਵਿੰਡੋ ਦੀ ਚੌੜਾਈ (ਕੇਵਲ ਅੰਦਰੂਨੀ ਵਰਤੋਂ ਲਈ ਹੀ)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5985,7 +6008,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6246,7 +6269,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6559,10 +6582,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "ਮੇਲ ਚੈੱਕ ਕਰੋ"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7077,6 +7099,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "ਸਭ \"ਮੁੜ ਨਾ ਪੁੱਛੋ\" ਚੇਤਾਵਨੀਆਂ ਮੁੜ-ਯੋਗ"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7139,6 +7171,14 @@
 msgid "Zoom: %1%"
 msgstr ""
 
+#~ msgid "Text Snippets"
+#~ msgstr "ਸਨਿੱਪਟ ਟੈਕਸਟ"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "ਮੇਲ ਚੈੱਕ ਕਰੋ"
+
 #~ msgid "&Reply to:"
 #~ msgstr "ਜਵਾਬ(&R):"
 
@@ -8898,13 +8938,6 @@
 #~ msgid "Add Group"
 #~ msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ"
 
-#, fuzzy
-#~| msgctxt "@info"
-#~| msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "ਕੀ ਤੁਸੀਂ <filename>%1</filename> ਨੂੰ ਚਲਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? "
-
 #~ msgid "&Apply"
 #~ msgstr "ਲਾਗੂ ਕਰੋ(&A)"
 
@@ -9725,11 +9758,6 @@
 #~ msgstr "ਡਿਫਾਲਟ ਪਛਾਣ ਵਰਤੋਂ(&D)"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "ਪਛਾਣ ਨਾਂ"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "ਸਰਵਰ ਸਹਾਇਕ ਸਿਈਵੀ(&S)"
diff -Nru kmail-19.04.3/po/pl/akonadi_archivemail_agent.po kmail-19.12.3/po/pl/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/pl/akonadi_archivemail_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pl/akonadi_archivemail_agent.po	2020-03-03 00:34:11.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-02-03 07:11+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -179,12 +179,12 @@
 "Nie można dodać drugiego archiwum dla tego katalogu. Zamiast tego zmień już "
 "to istniejące."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Katalog nie istnieje. Proszę sprawdzić ustawienia. Archiwum odłożono."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Rozpocznij archiwizowanie %1"
diff -Nru kmail-19.04.3/po/pl/akonadi_followupreminder_agent.po kmail-19.12.3/po/pl/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/pl/akonadi_followupreminder_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pl/akonadi_followupreminder_agent.po	2020-03-03 00:34:11.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2019-02-03 07:11+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -18,85 +18,85 @@
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 19.03.70\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Usługa przypomnienia o kontynuacji"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Przypomnienie o kontynuacji"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Opiekun"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Łukasz Wojniłowicz"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "lukasz.wojnilowicz@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Do"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Temat"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Termin ostateczny"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Odpowiedź"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Odebrano"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Wstrzymano"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Pokaż wiadomość"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Usuń"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
@@ -104,12 +104,12 @@
 msgstr[1] "Czy chcesz usunąć te %1 zaznaczone elementy?"
 msgstr[2] "Czy chcesz usunąć tych %1 zaznaczonych elementów?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Otrzymano odpowiedź od %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Nadal oczekujesz na odpowiedź na tę wiadomość:"
diff -Nru kmail-19.04.3/po/pl/akonadi_mailfilter_agent.po kmail-19.12.3/po/pl/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/pl/akonadi_mailfilter_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pl/akonadi_mailfilter_agent.po	2020-03-03 00:34:11.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2019-02-21 20:55+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -24,17 +24,17 @@
 msgid "Filter Log Viewer"
 msgstr "Przeglądarka dziennika filtrów"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Udostępnij..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Zapisuj działania fi&ltrów"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -44,23 +44,23 @@
 "Oczywiście, dane są zbierane i wyświetlane tylko wtedy, gdy zapisywanie jest "
 "włączone. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Szczegóły zapisywania"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Zapisuj opis wzorca"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Zapisuj wynik stosowania warunków filt&rów"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -74,34 +74,34 @@
 "filtrowania. W przeciwnym razie zapisany będzie jedynie łączny wynik "
 "zastosowania wszystkich reguł danego filtra."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Zapisuj wynik stosowania wzorców"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Zapisuj działania filtrów"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Ograniczenie rozmiaru dziennika:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "nieograniczony"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -114,7 +114,7 @@
 "Jeśli rozmiar dziennika przekroczy tę wielkość, najstarsze dane zostaną "
 "usunięte. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -123,63 +123,63 @@
 "Nie można zapisać pliku %1:\n"
 "\"%2\" jest szczegółowym opisem błędu."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Błąd KMaila"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrowanie wiadomości %1 z %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Błąd stosowania filtra poczty przeniesienia"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Błąd stosowania filtra poczty usunięcia"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Błąd stosowania filtra poczty modyfikacji "
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Wykonywanie reguł filtra:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Dopasowano reguły filtra.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Rozpocznij filtrowanie wiadomości \"%1\" z \"%2\" z \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrowanie wiadomości"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Dziennik filtrowania poczty jest włączony"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Gotowe"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrowanie w %1"
diff -Nru kmail-19.04.3/po/pl/akonadi_sendlater_agent.po kmail-19.12.3/po/pl/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/pl/akonadi_sendlater_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pl/akonadi_sendlater_agent.po	2020-03-03 00:34:11.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2019-02-03 07:11+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -61,57 +61,57 @@
 msgid "Your emails"
 msgstr "lukasz.wojnilowicz@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Do"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Temat"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Roześlij"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Powtarzając się"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID wiadomości"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Brak oczekujących wiadomości..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Wyślij teraz"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Usuń"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Tak"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nie"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
@@ -119,67 +119,67 @@
 msgstr[1] "Czy chcesz usunąć wybrane elementy?"
 msgstr[2] "Czy chcesz usunąć wybrane elementy?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Usuń elementy"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Czy chcesz usunąć również wiadomości?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Usuń wiadomości"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Nie znaleziono wiadomości."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Nie znaleziono wiadomości."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Błąd przy pobieraniu wiadomości."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Nie można pobrać wiadomości. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Nie można utworzyć przekazywania"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Wiadomość nie jest rzeczywista"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Nie można wysłać wiadomości."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Znaleziono błąd. Czy chcesz wysłać ponownie?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Znaleziono błąd"
diff -Nru kmail-19.04.3/po/pl/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/pl/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/pl/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pl/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:11.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-13 20:17+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -53,37 +53,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Synchronizowanie połączonej skrzynki pocztowej %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Dodaj połączoną skrzynkę pocztową"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Wybierz ikonę..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Skrzynka odbiorcza"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Wysłane"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Robocze"
diff -Nru kmail-19.04.3/po/pl/kmail.po kmail-19.12.3/po/pl/kmail.po
--- kmail-19.04.3/po/pl/kmail.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pl/kmail.po	2020-03-03 00:34:11.000000000 +0000
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-06-21 06:09+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-12-06 11:22+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
 "Language: pl\n"
@@ -189,8 +189,8 @@
 msgstr "Wiele kluczy szyfrowania na adres"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -296,27 +296,27 @@
 "KMail nie był w stanie wykryć żadnej listy dyskusyjnej w tym katalogu. Wpisz "
 "adresy ręcznie."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Przydział"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Wykorzystanie:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Stan: "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% całości"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "Użyto %1 z %2"
@@ -339,7 +339,7 @@
 "lub kombinację.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Szablony"
@@ -350,106 +350,106 @@
 msgstr "&Użyj własnych szablonów w tym katalogu"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopiuj szablony globalne"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Widok"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Użyj własnych &ikon"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Zwykły:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Nieprzeczytany:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Pokaż kolumnę Nadawca/Adresat w liście wiadomości"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Pokaż &kolumnę:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Domyślna"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Nadawca"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Adresat"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Spis wiadomości"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Użyj domyślnego grupowania"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Grupowanie"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Użyj domyślnego wystroju"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Wygląd"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Domyślny format wiadomości"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "HTML zamiast tekstu"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Zwykły tekst zamiast HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Użyj ustawień globalnych"
@@ -459,100 +459,105 @@
 msgid "Retrieval Options"
 msgstr "Opcje pobierania"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Tożsamości"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Odbieranie"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Wysyłanie"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Serwer LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Konta poczty wychodzącej (dodaj co najmniej jedno):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opcje wspólne"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Po&twierdź przed wysłaniem"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Sprawdź pisownię przed wysłaniem"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nigdy samoczynnie"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Przy ręcznym sprawdzaniu poczty"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Przy każdym sprawdzaniu poczty"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Wyślij teraz"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Wyślij później"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Wyślij wiado&mości z katalogu 'do wysłania':"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "D&omyślna sposób wysyłania:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Włącz wycofywanie wiadomości"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Dodaj konto pocztowe..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Własne konto..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -561,30 +566,30 @@
 "Nie można wywołać pomocnika konta. Upewnij się, że masz PomocnikaKonta w "
 "systemie."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Nie można wywołać pomocnika konta"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Uwzględnij przy ręcznym sprawdzaniu poczty"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Odłącz KMaila od sieci przed jego zamknięciem"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Sprawdź pocztę po uruchomieniu"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -642,7 +647,7 @@
 msgid "Fixed Width Font"
 msgstr "Czcionka stałej szerokości"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Tworzenie wiadomości"
@@ -946,61 +951,61 @@
 msgstr ""
 "Nie możemy utworzyć znacznika. Znacznik o tej samej nazwie już istnieje."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Ogólne"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardowe szablony"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Własne szablony"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Temat"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Zestaw znaków"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Nagłówki"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Załączniki"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Samoczynne poprawianie"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Autoskalowanie obrazów"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Podpis"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1009,12 +1014,12 @@
 "Samoczynnie wstaw ustawiony podpis\n"
 "przy rozpoczynaniu tworzenia wiadomości"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Wstaw podpis nad cytowanym tekstem"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1023,18 +1028,18 @@
 "Wstaw rozdzielnik dla podpisu zgodny z RFC\n"
 "(dwa daszki  i odstęp w wierszu) przed podpisem"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Nie cytuj żadnego z istniejących podpisów przy odpowiadaniu"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1045,7 +1050,7 @@
 "(zamiast całej wiadomości), \n"
 "jeśli w oknie wiadomości znajduje się jakiś zaznaczony tekst."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1057,17 +1062,17 @@
 "nawet, jeśli dany wiersz został stworzony poprzez złamanie wiersza podczas\n"
 "przenoszenia słowa do nowej linii. "
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Zawijaj słowa do danej szerokości"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Ustaw szerokość tekstu dla samoczynnego zawijania słów"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1078,7 +1083,7 @@
 "w oryginalnym formacie, w takim w jakim zostały one otrzymane.\n"
 " Gdy niezaznaczone, domyślnie odpowiadaj zwykłym tekstem."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1089,34 +1094,34 @@
 "Wspierane są: wytłuszczenie, pochylenie i podkreślony tekst,\n"
 "listy i odniesienia zewnętrzne."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "W treści"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Jako załączniki"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Ustaw domyślny format wiadomości przesyłanych dalej"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Domyślny rodzaj przesyłania dalej:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Adresaci"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1127,17 +1132,17 @@
 "Możesz to wybrać na poziomie wiadomości przy użyciu \"Opcje - Żądaj "
 "powiadomienia o losie wiadomości\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Ostrzeż, jeśli podano zbyt wielu odbiorców"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
-msgstr "Ustaw maksymalną liczba adresatów dla ostrzeżenia."
+msgstr "Ustaw graniczną liczbę adresatów dla ostrzeżenia"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1155,7 +1160,7 @@
 "ludzi. Jednakże zauważ, że zasada nie stosuje się\n"
 "do list dystrybucyjnych i dyskusyjnych."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1164,43 +1169,43 @@
 "Zapamiętaj ostatnio wpisywane adresy,\n"
 "i podsuwaj je przy wypełnianiu adresatów"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Bez zapisu"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
-msgstr "Maksymalnie przechowywanych ostatnich adresów:"
+msgstr "Graniczna liczba ostatnich adresatów:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
-"Maksymalna liczba ostatnich adresów, które zostaną\n"
-"zapamiętane do uzupełniania"
+"Graniczna liczba ostatnio wpisanych, które zostaną\n"
+"zapamiętane do późniejszego podpowiadania"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
-msgstr "Ustawienia uzupełniania..."
+msgstr "Ustawienia podpowiadania..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
-msgstr "Samoczynny zapis"
+msgstr "Samozapis"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Bez okresowego zapisu"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1209,18 +1214,18 @@
 msgstr[1] " minuty"
 msgstr[2] " minut"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
-msgstr "Samoczynnie zapisz wiadomość z określoną częstością"
+msgstr "Zapisuj wiadomość w podanych odstępach czasu"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Przed&rostki w temacie uznawane jako odpowiedź"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1229,59 +1234,59 @@
 "Uznawaj następujące przedrostki (wpisy są traktowane jako\n"
 "wyrażenia regularne, w których nie ma znaczenia wielkość liter):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Dodaj..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "U&suń"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Zm&ień..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Podaj nowy przedrostek odpowiedzi:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Przedrostki w temacie uzna&wane jako przesłane dalej"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Dodaj..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Usuń"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Zmień..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Podaj nowy przedrostek przesłania dalej:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1291,73 +1296,73 @@
 "zestaw, który zawiera wszystkie znaki użyte w wiadomości wychodzącej."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Z&mień..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Podaj zestaw znaków:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
-"Zachowaj pierwotny zestaw zna&ków przy odpowiadaniu lub przesyłaniu "
-"dalej(jeśli to możliwe)"
+"Zachowaj pierwotny zestaw zna&ków przy odpowiadaniu lub przekierowywaniu "
+"(jeśli to możliwe)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Ten zestaw znaków nie jest obsługiwany."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
-msgstr "&Użyj własnego przyrostka identyfikatora wiadomości"
+msgstr "&Użyj własnego przyrostka dla identyfikatora wiadomości"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
-msgstr "Własny przyrostek &identyfikatora wiadomości:"
+msgstr "Własny przyrostek dla &identyfikatora wiadomości:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
-msgstr "Zdefiniuj własne pola MIME:"
+msgstr "Określ własne pola nagłówka MIME:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nazwa"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Wartość"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Nowy"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nazwa:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Wartość:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
@@ -1365,17 +1370,17 @@
 "'Content-Type' nie jest dozwolony rodzajem ciągu znaków. Nagłówek nie "
 "zostanie zapisany."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Nieprawidłowy nagłówek"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nazewnictwo załączników zgodne z Outlookiem"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1384,38 +1389,38 @@
 "Włącz tę opcję, aby Outlook zrozumiał nazwy załączników zawierające nie-"
 "Angielskie znaki"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Włącz wykrywanie &brakujących załączników"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Następujące słowa kluczowe wskazują na zamiar załączenia pliku:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Podaj nowe słowo kluczowe:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Graniczny rozmiar załącznika:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Bez ograniczenia"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1501,7 +1506,7 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Wtyczki przekształcania tekstu"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1617,7 +1622,7 @@
 msgid "Archive Folder"
 msgstr "Katalog archiwum"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1683,7 +1688,7 @@
 msgid "Notification"
 msgstr "Powiadomienie"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1691,12 +1696,12 @@
 msgstr[1] "%1 załączniki (%2)"
 msgstr[2] "%1 załączników (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Ukryj wykaz załączników"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Pokaż wykaz załączników"
@@ -1713,333 +1718,333 @@
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Wybierz słownik, jaki ma zostać użyty podczas sprawdzania poprawności tekstu "
 "tej wiadomości"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Wybierz katalog wysłanych wiadomości, gdzie zachowywana będzie kopia tej "
 "wiadomości"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Wybierz konto, które ma zostać użyte do wysłania wiadomości"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Ustaw adres poczty elektronicznej \"Od:\" dla tej wiadomości"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Ustaw temat wiadomości"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Tożsamość:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Słownik:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Katalog wy&słanych:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Serwer pocztowy:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Od:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Te&mat:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Wyślij pocztę"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Wyślij pocztę przez"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Wyślij"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Wyślij &później"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Wyślij &później przez"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Do kolejki"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Zapisz jako &roboczą"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Zapisz wiadomość w katalogu roboczych"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Zapisz jako sza&blon"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Zapisz wiadomość w katalogu szablonów"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Zapisz jako &plik"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Zapisz wiadomość jako plik tekstowy lub html"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Wstaw pl&ik tekstowy..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Wstaw ostatni pl&ik tekstowy"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Książka &adresowa"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Otwórz książkę adresową"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nowa wiadomość"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Wybierz ad&resatów..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Zapisz listę &dystrybucyjną..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Wklej jako &załącznik"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Usuń &odstępy"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Czcionka &stałej szerokości"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Pilna"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Żądaj powiadomienia o losie wiadomości"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "&Żądaj powiadomienia o losie wiadomości"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Zawijanie wierszy"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "W&stawki"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "S&amopoprawianie pisowni"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Edytowanie formatowanego tekstu"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Formatowany tekst"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Przełącz tryb edytowania wzbogaconego tekstu"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Wszystkie pol&a"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Tożsamość"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Słownik"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Katalog wy&słanych"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Serwer pocztowy"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Od"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Te&mat"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Dołącz podp&is"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Poprzedź podpis&em"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Wstaw podpis na pozycji k&ursora"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Sprawdzanie pisowni..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Sprawdzanie pisowni"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Zaszy&fruj wiadomość"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Zaszyfruj"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Podpi&sz wiadomość"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Podpisz"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Format zaszy&frowanej wiadomości"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Wybierz format szyfrowania dla tej wiadomości"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Usługa przypominania o kontynuacji..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Ustawienia KMaila..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2048,53 +2053,53 @@
 "<qt>Spowoduje to całkowite ukrycie paska menu. Możesz pokazać go wpisując %1."
 "</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Ukryj pasek menu"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Wiersz: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolumna: %1"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "NAD"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "WST"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Sprawdzanie pisowni: włączone"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Sprawdzanie pisowni: wyłączone"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Zapi&sz ponownie jako szablon"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Zapi&sz jako roboczą"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2102,7 +2107,7 @@
 msgstr ""
 "Zapisz tę wiadomość w katalogu Szablony. Można ją będzie później zmienić."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2111,58 +2116,58 @@
 "Zapisz tę wiadomość w katalogu Robocze. Można ją będzie później zmienić i "
 "wysłać."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Porzucić czy zachować tę wiadomość na później?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Zamykanie edytora"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
-msgstr "Nieudany samoczynny zapis wiadomości"
+msgstr "Nie udało się zapisać wiadomości"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Nieudane wysyłanie wiadomości"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Wstaw plik"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Dodaj jako &wewnętrzny obraz"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Dodaj jako &załącznik"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nazwa załącznika:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Nazwa załącznika nie może być pusta"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Nieprawidłowa nazwa załącznika"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2170,7 +2175,7 @@
 msgstr[1] "Dodaj adresy URL do wiadomości"
 msgstr[2] "Dodaj adresy URL do wiadomości"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2178,17 +2183,17 @@
 msgstr[1] "Dodaj pliki jako z&ałącznik"
 msgstr[2] "Dodaj pliki jako z&ałącznik"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Wstaw tekst ze schowka jako załącznik"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "nienazwana"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2200,12 +2205,12 @@
 "ma przypisanego klucza (OpenPGP lub S/MIME), używanego do tego celu.</p><p>W "
 "ustawieniach tożsamości przypisz klucz(e) dla szyfrowania.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Brak klucza do szyfrowania"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2216,12 +2221,12 @@
 "(OpenPGP lub S/MIME), używany do tego celu.</p><p>W ustawieniach tożsamości "
 "przypisz klucz(e) dla szyfrowania.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Brak klucza do podpisu"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2231,7 +2236,7 @@
 "Musisz wpisać swój adres w polu Od:. Powinieneś także ustalić swój adres dla "
 "poszczególnych tożsamości, aby uniknąć wpisywania go za każdym razem."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2240,37 +2245,37 @@
 "Musisz określić co najmniej jednego adresata, albo w polu Do: lub jako DW "
 "lub jako UDW"
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Pole 'Do:' jest puste. Wysłać mimo to?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Nie podano pola 'Do:'"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nie podałeś tematu. Wysłać mimo wszystko?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nie podano tematu"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Wyślij &tak"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Nie, podam temat"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2279,22 +2284,22 @@
 "Musisz wpisać adres co najmniej jednego adresata, aby móc szyfrować kopię "
 "roboczą."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Wiadomość zaraz zostanie wysłana..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Potwierdzenie wysłania"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Wyślij &teraz"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2303,22 +2308,22 @@
 "Próbujesz wysłać wiadomość do więcej niż %1 odbiorców. Wysłać wiadomość mimo "
 "to?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Zbyt wielu adresatów"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Wyślij &tak"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Edytuj adresatów"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2326,22 +2331,22 @@
 msgstr ""
 "Wyłączenie trybu HTML spowoduje utratę  formatowania. Na pewno kontynuować?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Czy utracić formatowanie?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Utrać formatowanie"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Dodaj ozdoby do zwykłego tekstu"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2351,7 +2356,7 @@
 "bezpieczeństwa (klucz szyfrowania jest w pełni zaufany). Naciśnij na ikonę "
 "po szczegóły."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2361,7 +2366,7 @@
 "bezpieczeństwa (klucz szyfrowania jest w połowie zaufany). Naciśnij na ikonę "
 "po szczegóły."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2371,7 +2376,7 @@
 "bezpieczeństwa (klucz szyfrowania jest w niezaufany) Naciśnij na ikonę po "
 "szczegóły."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2382,7 +2387,7 @@
 "nieznany (nie można sprawdzić klucza szyfrującego). Naciśnij na ikonę po "
 "szczegóły."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Informacje o edytorze wtyczek"
@@ -2459,7 +2464,7 @@
 msgid "External editor was started."
 msgstr "Został otwarty zewnętrzny edytor."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2468,19 +2473,19 @@
 "Nie znaleziono serwera pocztowego. Sprawdz czy używasz poprawnego sewera "
 "pocztowego."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Nie ustawiono katalogu do wysyłania. Ustaw go przed wysłaniem wiadomości."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Nie znaleziono tożsamości. Sprawdz czy używasz poprawnej tożsamości."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2507,11 +2512,6 @@
 msgid "Message will not be encrypted"
 msgstr "Wiadomość nie będzie szyfrowana."
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Wstawki tekstowe"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2557,27 +2557,27 @@
 msgid "Cannot move messages."
 msgstr "Nie można przenieść wiadomości."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Nie można pobrać katalogu. Zgłoszony błąd: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Nie zwrócono katalogu."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Nie można pobrać katalogu rodzica. Zgłoszony błąd: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Nie można zwrócić listy katalogów."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Zarchiwizowano wiadomości"
@@ -2618,48 +2618,48 @@
 msgid "&Existing identities:"
 msgstr "Istniejąc&e tożsamości:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Błąd tworzenia nowej pary kluczy: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Błąd tworzenia klucza"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Brak klucza"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Utwórz nową parę kluczy"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Tworzenie nowej pary kluczy..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Edytuj tożsamość"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Ogólne"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Twoje imię i nazwisko:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2671,12 +2671,12 @@
 "wiadomości.</p><p>Jeśli to pole jest puste, w nagłówkach twoich wiadomości "
 "pojawi się jedynie twój adres poczty elektronicznej.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zacja:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2687,12 +2687,12 @@
 "wyświetlaną w nagłówku wysyłanych przez ciebie wiadomości.</p><p>Można "
 "spokojnie pozostawić to pole puste.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Adr&es e-mail:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2708,12 +2708,12 @@
 "poniżej.</p><p>Jeżeli pozostawisz je puste, lub źle je wypełnisz, ludzie "
 "będą mieli problem, żeby tobie odpowiedzieć.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "A&liasy e-mail:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2730,12 +2730,12 @@
 "td></tr><tr><th>Aliasy:</th><td>pierwszy@przykład.org<br>ostatni@przykład."
 "org</td></tr></table><p>Wpisz jeden alias adresu na wiersz.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kryptografia"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2750,12 +2750,12 @@
 "funkcje pocztowe będą działały bez zmian.</p> <p>Więcej informacji o "
 "kluczach można znaleźć pod adresem <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Klucz podpisu OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2773,12 +2773,12 @@
 "informacji o kluczach można znaleźć pod adresem <a>https://www.gnupg.org</"
 "a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Klucz szyfrowania OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2791,12 +2791,12 @@
 "wiadomości za pomocą S/MIME. Zwykłe funkcje pocztowe będą działały bez zmian."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certyfikat podpisu S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2811,39 +2811,39 @@
 "szyfrować kopii wiadomości dla ciebie za pomocą S/MIME. Zwykłe funkcje "
 "pocztowe będą działały bez zmian.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certyfikat szyfrowania S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Wybierany format:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Zawsze podpisuj wiadomości"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Samoczynnie odszyfrowuj wiadomości, jeśli to możliwe"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Adres zw&rotny:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2860,12 +2860,12 @@
 "adres, ale odpowiedzi powinny być kierowane na ogólny adres grupy. </p> <p>W "
 "razie wątpliwości zostaw to pole puste.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adresy &DW:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2881,12 +2881,12 @@
 "<p>Jeśli podajesz więcej niż jeden adres, rozdziel je przecinkami</"
 "p><p>Jeżeli nie przesyłasz kopii, zostaw to pole puste.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Adresy &UDW:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2903,57 +2903,57 @@
 "niż jeden adres, rozdziel je przecinkami</p><p>Jeżeli nie przesyłasz kopii, "
 "zostaw to pole puste.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Słown&ik:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Katalog wy&słanych:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Katalog &roboczych:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Ka&talog szablonów:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Konto wychodzące:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Dołącz moją wizytówkę do wiadomości"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Utwórz..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Język samoczynnego poprawiania:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Przywróć domyślną nazwę domeny"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "&Domyślna domena:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2962,33 +2962,33 @@
 "<qt><p>Domyślna domena jest używana do uzupełniania adresu złożonego jedynie "
 "z nazwy użytkownika.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Użyj własnych szablonów dla tej tożsamości"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Podpis"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Obraz"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Nieprawidłowy alias poczty elektronicznej \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Nieprawidłowy adres pocztowy"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3001,7 +3001,7 @@
 "ostrzeżenia u adresata wiadomości, kiedy będzie on próbował sprawdzić podpis "
 "wykonany przy tym ustawieniu."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3010,7 +3010,7 @@
 "Jeden z kluczy szyfrujących OpenPGP nie zawiera identyfikatora użytkownika z "
 "adresem e-mail dla tej tożsamości (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3023,7 +3023,7 @@
 "Może to spowodować wyświetlenie ostrzeżenia u adresata wiadomości, kiedy "
 "będzie on próbował sprawdzić podpis wykonany przy tym ustawieniu."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3032,22 +3032,22 @@
 "Jeden z certyfikatów szyfrowania S/MIME nie zawiera adresu e-mail dla tej "
 "tożsamości (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Nie znaleziono adresu poczty elektronicznej w kluczu/certyfikacie"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Ten plik podpisu jest niepoprawny."
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Edytuj tożsamość \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3056,7 +3056,7 @@
 "Własny katalog na tożsamości już nie istnieje. Wykorzystany zostanie "
 "domyślny katalog."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Zmień..."
@@ -3087,6 +3087,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Nie można usunąć pliku wizytówki."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Czy na pewno chcesz zaniechać?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Potwierdzenie"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3250,7 +3262,7 @@
 "Przykłady są dostępne pod adresem <a href=\"https://ace.home.xs4all.nl/X-"
 "Faces/\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Obraz"
@@ -3284,7 +3296,7 @@
 msgstr[1] "Listy dystrybucyjne %2 są puste, nie można ich użyć."
 msgstr[2] "Listy dystrybucyjne %2 są puste, nie można ich użyć."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Dodaj do książki adresowej"
@@ -3294,22 +3306,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakt został pomyślnie utworzony"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Nie można zachować kontaktu: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Nieudane zachowanie kontaktu"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Czy chcesz załączyć ten katalog \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Załącz katalog"
@@ -3520,14 +3532,14 @@
 msgstr "Katal&og"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Zastosuj filtry na katalogu"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3553,7 +3565,7 @@
 msgstr "&Prześlij dalej"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Zastosuj &filtr"
@@ -3578,7 +3590,7 @@
 msgstr "Pomo&c"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Główny pasek narzędzi"
@@ -3632,12 +3644,12 @@
 msgid "The file does not contain a message."
 msgstr "Ten plik nie zawiera wiadomości."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Plik zawiera wiele wiadomości. Wyświetlono tylko pierwszą."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3646,32 +3658,32 @@
 "Czy przekazać wiadomości jako załączniki w jednej wiadomości jako raport "
 "MIME, czy jako osobne wiadomości?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Wyślij jako kondensat"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Wyślij osobno"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrowanie wiadomości"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrowanie wiadomości %1 z %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Przenoszenie wiadomości"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Usuwanie wiadomości"
@@ -3700,31 +3712,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Pasek narzędzi kierunku tekstu"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail został odłączony od sieci, wszystkie zadania sieciowe zostały "
 "wstrzymane"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Wyślij wiadomość"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Nie można wysłać wiadomości"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail jest ustawiony w tryb z siecią, wszystkie zadania sieciowe zostały "
 "wznowione"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3733,38 +3745,38 @@
 "KMail jest ustawiony w tryb z siecią; wszystkie zadania sieciowe zostaną "
 "wznowione, gdy zostanie wykryte połączenie sieciowe"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "W tej chwili KMail jest ustawiony w tryb z siecią. Co zrobić?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Z siecią/Bez sieci"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Podłącz do sieci"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Odłącz od sieci"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Wykryto połączenie sieciowe, wznowiono wszystkie zadania sieciowe"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Nie wykryto połączenia sieciowego, wstrzymano wszystkie zadania sieciowe"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3773,12 +3785,12 @@
 "Błąd otwierania pliku okresowego zapisu w %1.\n"
 "Powód: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Nie udało się otwarcie pliku okresowego zapisu"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3788,7 +3800,7 @@
 msgstr[2] ""
 "Tych %1 tożsamości będzie teraz używać domyślnego serwera pocztowego:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3798,43 +3810,47 @@
 msgstr[2] ""
 "Tych %1 tożsamości będzie teraz używać zmienionego serwera pocztowego:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Wysyłanie wiadomości"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Inicjalizacja procesu wysyłania..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Zasób %1 jest uszkodzony."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Zasób %1 jest uszkodzony.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Usługa archiwizacji poczty nie została zarejestrowana."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Usługa późniejszego wysyłania nie została zarejestrowana."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
-msgstr "Usługa przypominania o ponagleniu nie została zarejestrowana."
+msgstr "Usługa przypominania nie została zarejestrowana."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3843,12 +3859,12 @@
 "Nie można przejść do zarządzania certyfikatami. Upewnij się, że masz "
 "Kleopatrę w systemie."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Błąd KMaila"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3857,26 +3873,25 @@
 "Nie można wywołać pomocnika importowania. Upewnij się, że masz "
 "PomocnikaImportowania w systemie."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Nie można wywołać pomocnika importowania"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Nie można uruchomić \"Eksportera ustawień ZIO\". Proszę sprawdzić swoją "
-"instalację."
+"Nie można uruchomić \"Eksportera danych ZIO\". Sprawdź swoją instalację."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Nie można uruchomić \"Eksportera ustawień ZIO\"."
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Nie można uruchomić \"Eksportera danych ZIO\""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3885,68 +3900,68 @@
 "Nie można wywołać pomocnika importowania. Upewnij się, że masz "
 "PomocnikaImportowania w systemie."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Nie można wywołać pomocnika importowania"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Znaleziono inny program pocztowy w systemie. Czy zaimportować z niego dane?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Nie można wywołać pomocnika importowania. Proszę sprawdzić instalację."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Brak tematu"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(brak szablonu użytkownika)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "W tym katalogu nie ustawiono opcji usuwania starej poczty"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Na pewno usunąć stare wiadomości z katalogu <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Przedawnij katalog"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Prz&edawnij"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Opróżnij kosz"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Przenieś do Kosza"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Czy na pewno chcesz opróżnić kosz?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3955,27 +3970,27 @@
 "<qt>Czy na pewno chcesz przenieść wszystkie wiadomości z katalogu <b>%1</b> "
 "do kosza?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Przeniesiono wszystkie wiadomości do kosza"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Czy na pewno usunąć wszystkie stare wiadomości?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Cz usunąć stare wiadomości?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Przedawnij"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3986,17 +4001,17 @@
 "\"spam\" i zwiększy prawdopodobieństwo skutecznego zaatakowania systemu "
 "przez wykorzystanie istniejących lub przyszłych dziur w jego bezpieczeństwie."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Ostrzeżenie o niebezpieczeństwie"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Wczytuj zewnętrzne odnośniki"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4014,531 +4029,531 @@
 "<qt>Czy na pewno usunąć %1 wybranych wiadomości?<br/>Nie będzie można ich "
 "odtworzyć.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Usuń wiadomości"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Usuń wiadomość"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Przenoszenie wiadomości..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Usuwanie wiadomości..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Pomyślnie usunięto wiadomości."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Pomyślnie przeniesiono wiadomości."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Usuwanie wiadomości nie powiodło się."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Porzucono usuwanie wiadomości."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Przenoszenie wiadomości nie powiodło się."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Porzucono przenoszenie wiadomości."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Przenieś wiadomości do katalogu"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopiowanie wiadomości..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Pomyślnie skopiowano wiadomości."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Kopiowanie wiadomości nie powiodło się."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Porzucono kopiowanie wiadomości."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopiuj wiadomość do katalogu"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Przenoszenie wiadomości do kosza..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Usuwanie i przenoszenie wiadomości do kosza..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Pomyślnie przeniesiono wiadomości do kosza."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Pomyślnie przeniesiono wiadomości do kosza lub usunięto."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Przenoszenie wiadomości do kosza nie powiodło się."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Usuwanie lub przenoszenie wiadomości do kosza nie powiodło się."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Porzucono przenoszenie wiadomości do kosza."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Porzucono usuwanie lub przenoszenie wiadomości do kosza."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Skocz do katalogu"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Zapisz j&ako..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Prz&edawnij wszystkie katalogi"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Sprawdź pocztę"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Sprawdź pocztę w"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Sprawdź pocztę"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Wyślij z kolejki"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Stan sieci (nieznany)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Wyślij z kolejki przez"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Zarządzanie certyfikatami"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importuj wiadomości..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Debuguj Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Przeg&lądarka dziennika filtrów..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importuj z innego klienta pocztowego..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Edycja odpowiedzi \"Nieobecny\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Ustawienia okresowego ar&chiwizowania..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Opóźnione wiadomości..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
-msgstr "Wiadomości ponaglającego przypominania..."
+msgstr "Wiadomości przypomnienia..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "U&suń"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Przenieś &wątek do kosza"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Przenieś wątek do kosza"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Usuń &wątek"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Wyszukaj wiadomości..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Zaznacz &wszystkie wiadomości"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Zarządzanie &listą dyskusyjną..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Przypisz skrót..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Opcje usuwania starych wiadomości"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Archiwizuj katalog..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "&Wczytaj zewnętrzne odnośniki"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopiuj wiadomość do..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Przenieś wiadomość do..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nowa wiadomość..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nowa"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Wiadomość z sza&blonu"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nowa wiadomość na &listę dyskusyjną..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Utwórz filtr"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Odfiltruj po &tematach..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Odfiltruj po &nadawcach..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Odfiltruj po adresa&tach..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Odfiltruj po &DW..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Oznacz wą&tek"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Oznacz wątek jako p&rzeczytany"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Oznacz wszystkie wiadomości w wybranym wątku jako przeczytane"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Oznacz wątek jako nieprze&czytany"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Oznacz wszystkie wiadomości w wybranym wątku jako nieprzeczytane"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Oznacz wątek jako w&ażny"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Usuń oznaczenie wątku jako w&ażny"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Oznacz wątek jako &działanie"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Usuń oznaczenie wątku jako dział&anie"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Obserwuj wątek"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Pom&iń wątek"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Zapisz załączniki..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Kopiuj szyfrowaną do..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Zastosuj wszystkie filtr&y"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "R&ozwiń wątek/grupę"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Rozwiń obecny wątek lub grupę"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Zwiń wątek/grupę"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Zwiń obecny wątek lub grupę"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Rozwiń &wszystkie wątki"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Rozwiń wszystkie wątki w obecnym katalogu"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Zw&iń wszystkie wątki"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Zwiń wszystkie wątki w obecnym katalogu"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Wyświetl wiadomość"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Następna wiadomość"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Idź do następnej wiadomości"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Następna ni&eprzeczytana wiadomość"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Następna"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Idź do następnej nieprzeczytanej wiadomości"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Poprzednia wiadomość"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Idź do poprzedniej nieprzeczytanej wiadomości"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "P&oprzednia nieprzeczytana wiadomość"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Poprzednia"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Idź do poprzedniej nieprzeczytanej wiadomości"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Następny nieprzeczytany &katalog"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Idź do następnego katalogu z nieprzeczytanymi wiadomościami"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Poprzedni nieprzeczytany katal&og"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Idź do poprzedniego katalogu z nieprzeczytanymi wiadomościami"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Następny nieprze&czytany tekst"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Idź do następnego nieprzeczytanego tekstu"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4547,224 +4562,229 @@
 "Przewiń obecną wiadomość. Jeżeli to koniec wiadomości, przejdź do następnej "
 "nieprzeczytanej."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Ustawienia &filtrów..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Zarządzanie skryptami &Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Dodaj konto..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Wprowadzenie do programu KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Wyświetl stronę powitalną programu KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Ustawie&nia powiadomień..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Ustawienia KMaila..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Przedawnij..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Dodaj ulubiony katalog..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Subskrybowanie na serwerze..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Zastosuj wszystkie filtry"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importowanie/Eksportowanie danych KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nowy kontakt książki adresowej..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopiuj wiadomość do katalogu"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Przejdź do katalogu..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Przerwij obecną operację"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Uaktywnij następny katalog"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Uaktywnij poprzedni katalog"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Wybierz katalog z uaktywnieniem"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Uaktywnij pierwszy katalog"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Uaktywnij ostatni katalog"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Uaktywnij następną wiadomość"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Uaktywnij poprzednią wiadomość"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Zaznacz pierwszą wiadomości"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Zaznacz ostatnią wiadomości"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Zaznacz wiadomość z uaktywnieniem"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Uaktywnij pole szybkiego wyszukiwania"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Zaznacz także poprzednią wiadomość"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Zaznacz także następną wiadomość"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Przenieś wiadomość do katalogu"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Niska szybkości łącza"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 "Oznacz wszystkie wiadomości jako przeczytana w tym i podległych katalogach"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Usuń powielenia w tym katalogu i wszystkich jego podkatalogach"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "U&stawienia konta"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Uruchom konto ponownie"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Dodaj ulubiony katalog"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Opróżnij kosz"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Przenieś wszystkie wiadomości do &kosza"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Usuń wyszukiwanie"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Edytuj wyszukiwane..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Cofnij"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Cofnij: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtr %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Znajdź...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4775,12 +4795,12 @@
 "i zwiększy prawdopodobieństwo skutecznego zaatakowania systemu przed obecne "
 "lub przyszłe programy wykorzystujące dziury w jego bezpieczeństwie."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Użyj HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4796,118 +4816,118 @@
 "Możesz ustawić połączone skrzynki pocztowe, tworzyć własne lub wyłączyć tę\n"
 " możliwość całkowicie w ustawieniach wtyczek w KMailu."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Czy włączyć połączone skrzynki pocztowe?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Włącz połączone skrzynki pocztowe"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Zaniechaj"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Uruchamianie..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Przenieś do &kosza"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Kosz"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Przenieś wiadomość do kosza"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Nie można skopiować elementu. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nowa wiadomość do..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Odpowiedz..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Prześlij dalej do..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Dodaj do istniejącego kontaktu"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Otwórz w książce adresowej"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Dodaj zakładkę do tego odnośnika"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Edytuj kontakt..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Zapisz łącze jako..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Wyszukaj w wiadomości..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Zapisz obraz na dysku..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Pokaż format HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Pokaż format HTML, otrzymując pocztę od tego kontaktu"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Wczytaj zewnętrzny odnośnik, gdy poczta przychodzi od tego kontaktu"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Współdziel obraz..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4916,62 +4936,62 @@
 "KMail od teraz oparto na szkielecie zarządzania informacją osobistą Akonadi, "
 "która wnosi wiele zmian w każdym miejscu."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Popychanie poczty elektronicznej (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Ulepszone znajdywania"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Obsługa dodawania notatek (przypisów) do wiadomości"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Mniej zwieszeń GUI, sprawdzanie poczty odbywa się w tle"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Obsługa wtyczek"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Nowe wyświetlanie HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Dodano sprawdzenie adresu url na phishing"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Program pocztowy KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Pobieranie zawartości katalogu"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Proszę czekać ..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Niedostępny"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4980,7 +5000,7 @@
 "KMail jest obecnie odłączony od sieci. Naciśnij <a href=\"kmail:goOnline"
 "\">tutaj</a>, aby połączyć go ponownie z siecią...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4989,22 +5009,22 @@
 "Konto jest obecnie odłączone od sieci. Naciśnij <a href=\"kmail:"
 "goResourceOnline\">tutaj</a>, aby połączyć je ponownie z siecią...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Pomyślnie zmieniono kontakt"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nowe wiadomości w"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Brak nieprzeczytanych wiadomości"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5028,8 +5048,8 @@
 msgstr "Prawa autorskie © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5122,17 +5142,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Wybierz podsumowania wtyczek do pokazania na stronie podsumowań."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Kontact - Podsumowanie"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c) 2004 Tobias Koenig"
@@ -5178,27 +5198,27 @@
 msgid "All"
 msgstr "Wszystko"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact - Podsumowanie"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Widok podsumowania Kontactu"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2019 Programiści Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5225,7 +5245,7 @@
 msgid "&Reply"
 msgstr "&Odpowiedz"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "O&dpowiedz..."
@@ -5235,12 +5255,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Odpowiedz a&utorowi..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Odpowiedz &wszystkim..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Odpowiedz na li&stę dyskusyjną..."
@@ -5270,7 +5290,7 @@
 msgid "&Edit As New"
 msgstr "&Edytuj jako nową"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5303,7 +5323,7 @@
 #: messageactions.cpp:193
 #, kde-format
 msgid "Add Followup Reminder..."
-msgstr "Usługa przypominania o ponagleniu..."
+msgstr "Usługa przypomnienie..."
 
 #: messageactions.cpp:197
 #, kde-format
@@ -5461,45 +5481,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Wyszukiwanie nie udało się, bo: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Wyszukiwanie wiadomości"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Szukaj"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "W treśc&i..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Jako z&ałącznik..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Zapisz załączniki..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Wyczyść wybór"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Skocz do pierwotnego katalogu"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5507,69 +5527,69 @@
 msgstr[1] "%1 pasujące"
 msgstr[2] "%1 pasujących"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Ostatnie wyszukiwanie"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Nie wybrałeś prawidłowego katalogu."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Nie wybrano katalogu do wyszukiwania."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Nie określono warunków wyszukiwania."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Wszystkie wybrane katalogi są puste lub nie zostały zaindeksowane."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Nie dodano warunków wyszukiwania."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 "Warunek \"zawiera\" nie może zostać użyty z liczbą znaków mniejszą niż 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Poszukiwanie..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Nie można uzyskać wyników znajdywania. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Nieudane wyszukiwanie."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Ukończono wyszukiwanie."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Zatrzymano znajdywanie."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5580,7 +5600,7 @@
 "powodem jest to, że istnieje już inny katalog wyszukiwania o takiej nazwie. "
 "Zwrócony błąd \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5588,7 +5608,7 @@
 msgstr[1] "Kopiuj %1 wiadomości"
 msgstr[2] "Kopiuj %1 wiadomości"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5596,7 +5616,7 @@
 msgstr[1] "Wytnij %1 wiadomości"
 msgstr[2] "Wytnij %1 wiadomości"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Sprawdzanie postępu indeksowania..."
@@ -5728,7 +5748,7 @@
 "Określa czy to pierwsze uruchomienie programu (tylko do użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5739,7 +5759,7 @@
 "jest jednorazowe."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5748,26 +5768,26 @@
 "Ta wartość jest używana do określania, czy KMail ma wyświetlić Wprowadzenie."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Pokaż pole szybkiego wyszukiwania katalogów"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Domyślnie przesyłaj wiadomości dalej jako w treści."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Ostrzeż, jeśli liczba adresatów jest większa niż:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5778,19 +5798,19 @@
 "poprosi o potwierdzenie wysłania wiadomości. Ostrzeżenie można wyłączyć."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Sprawdź pisownię przed wysłaniem"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Zawsze żądaj potwierdzenia losu wiado&mości"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5807,13 +5827,13 @@
 "qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
-msgstr "Okressamozapisu:"
+msgstr "Okres samozapisu:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5825,7 +5845,7 @@
 "tutaj. Możesz wyłączyć samoczynny zapis ustawiając go na wartość 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5833,148 +5853,148 @@
 "wiadomości."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "Gdy odhaczone, wysłane wiadomości będą przechowywane w formie zaszyfrowanej"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Spis wszystkich ostatnio używanych adresów URL"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Spis wszystkich ostatnio używanych kodowań"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Pokaż wskaźnik etykiety kryptograficznej"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Potwierdź skrót domyślnego wysyłania"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Rozmiar okna dialogowego tożsamości (tylko do użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Szerokość okna znajdywania (tylko do użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Wysokość okna znajdywania (tylko do użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "Szerokość okna dialogowego ustawień KMail (tylko do użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "Wysokość okna dialogowego ustawień KMail (tylko do użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Widok podglądu wiadomości"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Nie pokazuj podglądu wiadomości"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Pokaż podgląd wiadomości pod spisem wiadomości"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Pokaż podgląd wiadomości obok spisu wiadomości"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Spis katalogów"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Długi spis katalogów"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Krótki spis katalogów"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Szablon dla nowej wiadomości"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Szablon dla odpowiedzi"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Szablon dla odpowiedzi do wszystkich"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Szablon dla przesyłania dalej"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Znaki cytowania"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Określa zasady wykorzystywane przy wyświetlaniu zasad"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5984,7 +6004,7 @@
 "użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5994,7 +6014,7 @@
 "użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6004,7 +6024,7 @@
 "użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6014,7 +6034,7 @@
 "użytku wewnętrznego)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6024,7 +6044,7 @@
 "wewnętrznego)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6127,9 +6147,7 @@
 msgid ""
 "When encrypting emails, always also encr&ypt to the certificate of my own "
 "identity"
-msgstr ""
-"Podczas szyfrowania wiadomości, zawsze szyfruj z certyfikatem mojej "
-"tożsamości"
+msgstr "Szyfrując wiadomość, szyfruj ją także cert&yfikatem mojej tożsamości"
 
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mStoreEncrypted)
 #: ui/composercryptoconfiguration.ui:33
@@ -6165,7 +6183,7 @@
 #: ui/composercryptoconfiguration.ui:44
 #, kde-format
 msgid "Store sent messages encry&pted"
-msgstr "Zapisz wiadomości zaszy&frowane"
+msgstr "&Po wysłaniu wiadomości, przechowuj ją jako zaszyfrowaną"
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowKeyApprovalDlg)
 #: ui/composercryptoconfiguration.ui:54
@@ -6185,13 +6203,13 @@
 #: ui/composercryptoconfiguration.ui:57
 #, kde-format
 msgid "Always show the encryption keys &for approval"
-msgstr "Zawsze pokaż &klucze szyfrujące do potwierdzenia"
+msgstr "Pokaż klucze szy&frujące celem potwierdzenia"
 
 #. i18n: ectx: property (text), widget (QCheckBox, mAlwaysEncryptWhenSavingInDrafts)
 #: ui/composercryptoconfiguration.ui:64
 #, kde-format
 msgid "When sa&ving as draft, sign/encrypt as indicated"
-msgstr "Przy zapisy&waniu roboczej, podpisz/zaszyfruj tak jak to wskazano"
+msgstr "&Zapisując roboczą, podpisz/zaszyfruj tak jak to wskazano"
 
 #. i18n: ectx: property (text), widget (QCheckBox, mShowEncSignIndicator)
 #: ui/composercryptoconfiguration.ui:71
@@ -6293,7 +6311,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6329,7 +6347,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6426,7 +6444,7 @@
 #: ui/miscpagemaintab.ui:133
 #, kde-format
 msgid "Mar&k selected message as read after"
-msgstr "Oznacz zaznaczoną wiadomość ja&ko przeczytaną po"
+msgstr "Oznacz podświetloną wiadomość ja&ko przeczytaną po"
 
 #. i18n: ectx: property (suffix), widget (QSpinBox, mDelayedMarkTime)
 #: ui/miscpagemaintab.ui:143
@@ -6450,7 +6468,7 @@
 #: ui/miscpagemaintab.ui:173
 #, kde-format
 msgid "Open this folder on &startup:"
-msgstr "Po uruchomieniu otwórz tu w&skazany katalog:"
+msgstr "Po uruchomieniu otwórz katalog w miej&scu:"
 
 #. i18n: ectx: property (text), widget (QCheckBox, mDeleteMessagesWithoutConfirmation)
 #: ui/miscpagemaintab.ui:180
@@ -6658,8 +6676,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Sprawdź śledzenie URL poczty"
+msgid "Scan emails for tracking URLs"
+msgstr "Szukaj śledzących adresów URL w wiadomościach"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -6800,7 +6818,7 @@
 #: ui/smimeconfiguration.ui:20
 #, kde-format
 msgid "&Validate certificates using CRLs"
-msgstr "Pot&wierdzaj certyfikaty przy pomocy CRL"
+msgstr "&Sprawdź certyfikaty przy użyciu CRL"
 
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, OCSPRB)
 #: ui/smimeconfiguration.ui:30
@@ -6852,7 +6870,7 @@
 #: ui/smimeconfiguration.ui:91
 #, kde-format
 msgid "Ignore service URL of certificates"
-msgstr "Pomijaj usługę adresu URL certyfikatów"
+msgstr "Pomiń adres URL usług certyfikatów"
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, doNotCheckCertPolicyCB)
 #: ui/smimeconfiguration.ui:101
@@ -6879,14 +6897,14 @@
 "If this option is checked, Certificate Revocation Lists are never used to "
 "validate S/MIME certificates."
 msgstr ""
-"Jeśli ta opcja jest włączona, spis unieważnień certyfikatów (CRL) nie będziy "
-"używane do sprawdzania poprawności certyfikatów S/MIME."
+"Po zaznaczeniu tego pola, wykaz unieważnionych certyfikatów (CRL) nie będzie "
+"brany pod uwagę przy sprawdzaniu certyfikatów S/MIME."
 
 #. i18n: ectx: property (text), widget (QCheckBox, neverConsultCB)
 #: ui/smimeconfiguration.ui:114
 #, kde-format
 msgid "Never consult a CRL"
-msgstr "Nigdy nie sprawdzaj CRL"
+msgstr "Nie bierz pod uwagę CRL"
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, fetchMissingCB)
 #: ui/smimeconfiguration.ui:121
@@ -6895,14 +6913,14 @@
 "If this option is checked, missing issuer certificates are fetched when "
 "necessary (this applies to both validation methods, CRLs and OCSP)"
 msgstr ""
-"Jeśli ta opcja jest włączona, brakujące informacje o wystawcy certyfikatu "
-"będą pobierane (dotyczy to obu metod sprawdzania, CRL i OCSP)"
+"Po zaznaczeniu tego pola, zostaną pobrane certyfikaty wystawcy, gdy będą "
+"potrzebne (dotyczy to obu metod sprawdzania, CRL i OCSP)"
 
 #. i18n: ectx: property (text), widget (QCheckBox, fetchMissingCB)
 #: ui/smimeconfiguration.ui:124
 #, kde-format
 msgid "Fetch missing issuer certificates"
-msgstr "Pobierz brakującą informację o wystawcy certyfikatu"
+msgstr "Pobierz brakujące certyfikaty wydawcy"
 
 #. i18n: ectx: attribute (title), widget (QWidget, tabHTTP)
 #: ui/smimeconfiguration.ui:135
@@ -6920,7 +6938,7 @@
 #: ui/smimeconfiguration.ui:144
 #, kde-format
 msgid "Do not perform any HTTP requests"
-msgstr "Nie realizuj żadnych żądań HTTP"
+msgstr "Nie wykonuj żadnych żądań HTTP"
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreHTTPDPCB)
 #: ui/smimeconfiguration.ui:151
@@ -6932,17 +6950,17 @@
 "used.  With this option all entries using the HTTP scheme are ignored when "
 "looking for a suitable DP."
 msgstr ""
-"Kiedy poszukiwany jest adres CRL, testowany certyfikat zwykle zawiera adresy "
-"URL prowadzące do punktów dystrybucji CRL (list unieważnień certyfikatów). "
-"Używany jest pierwszy znaleziony URL. Jeśli ta opcja jest włączona, "
-"wszystkie adresy używające HTTP zostaną zignorowane przy poszukiwaniu "
-"odpowiedniego punktu."
+"W czasie szukania położenia CRL, certyfikat do sprawdzenia zazwyczaj zawiera "
+"wpisy \"Punkt rozprowadzania CRL\", które składają się z adresów URL "
+"opisujących sposób dostępu do adresu URL. Brany jest pierwszy znaleziony "
+"adres URL. Po zaznaczeniu tego pola, wszystkie wpisy używające schematu HTTP "
+"są pomijane przy szukaniu odpowiedniego punktu."
 
 #. i18n: ectx: property (text), widget (QCheckBox, ignoreHTTPDPCB)
 #: ui/smimeconfiguration.ui:154
 #, kde-format
 msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr "Pomijaj HTTP punktów dystrybucyjnych CRL dla certyfikatów"
+msgstr "Pomiń punkt rozprowadzania certyfikatów CRL poprzez HTTP"
 
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, honorHTTPProxyRB)
 #: ui/smimeconfiguration.ui:176
@@ -6977,7 +6995,7 @@
 "nowhere.com:3128."
 msgstr ""
 "Podaj adres lokalnego pośrednika HTTP, który ma być używany do żądań HTTP "
-"związanych z S/MIME. Składnia to serwer:port, na przykład mojposrednik."
+"związanych z S/MIME. Składnia to gospodarz:port, na przykład mojposrednik."
 "nigdzie.com:3128."
 
 #. i18n: ectx: attribute (title), widget (QWidget, tabLDAP)
@@ -6996,7 +7014,7 @@
 #: ui/smimeconfiguration.ui:227
 #, kde-format
 msgid "Do not perform any LDAP requests"
-msgstr "Nie realizuj żadnych żądań LDAP"
+msgstr "Nie wykonuj żadnych żądań LDAP"
 
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreLDAPDPCB)
 #: ui/smimeconfiguration.ui:234
@@ -7008,23 +7026,23 @@
 "used.  With this option all entries using the LDAP scheme are ignored when "
 "looking for a suitable DP."
 msgstr ""
-"Kiedy poszukiwany jest adres CRL, testowany certyfikat zwykle zawiera adresy "
-"URL prowadzące do punktów dystrybucji CRL (list unieważnień certyfikatów). "
-"Używany jest pierwszy znaleziony URL. Jeśli ta opcja jest włączona, "
-"wszystkie adresy używające LDAP zostaną zignorowane przy poszukiwaniu "
-"odpowiedniego punktu."
+"W czasie szukania położenia CRL, certyfikat do sprawdzenia zazwyczaj zawiera "
+"wpisy \"Punkt rozprowadzania CRL\", które składają się z adresów URL "
+"opisujących sposób dostępu do adresu URL. Brany jest pierwszy znaleziony "
+"adres URL. Po zaznaczeniu tego pola, wszystkie wpisy używające schematu LDAP "
+"są pomijane przy szukaniu odpowiedniego punktu."
 
 #. i18n: ectx: property (text), widget (QCheckBox, ignoreLDAPDPCB)
 #: ui/smimeconfiguration.ui:237
 #, kde-format
 msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr "Pomijaj LDAP dla punktów dystrybucji CRL dla certyfikatów"
+msgstr "Pomiń punkt rozprowadzania certyfikatów CRL poprzez LDAP"
 
 #. i18n: ectx: property (text), widget (QLabel, customLDAPLabel)
 #: ui/smimeconfiguration.ui:246
 #, kde-format
 msgid "Primary host for LDAP requests:"
-msgstr "Podstawowy host dla żądań LDAP:"
+msgstr "Główny gospodarz dla żądań LDAP:"
 
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, customLDAPProxy)
 #: ui/smimeconfiguration.ui:257
@@ -7043,7 +7061,7 @@
 "wszelkich informacji o serwerach i portach, będących częścią URL dla LDAP. "
 "Inne serwery będą używany tylko wówczas, gdy połączenie z wybranym serwerem "
 "nie powiedzie się.\n"
-"Składnia to \"serwer\" lub \"serwer:port\". Jeśli nie podano portu, "
+"Składnia to \"gospodarz\" lub \"gospodarz:port\". Jeśli nie podano portu, "
 "przyjmowana jest wartość 389 (standard LDAP)."
 
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mWarnUnsigned)
@@ -7115,9 +7133,7 @@
 #: ui/warningconfiguration.ui:59
 #, kde-format
 msgid "Warn if certificates/ke&ys expire soon (configure thresholds below)"
-msgstr ""
-"Ostrzegaj, jeśli certyfikaty/klucze niedługo utracą ważność (ustawienia "
-"poniżej)"
+msgstr "Uprzedź przed w&ygaśnięciem certyfikatu/klucza (ustawienia poniżej)"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
 #: ui/warningconfiguration.ui:68
@@ -7244,19 +7260,19 @@
 #: ui/warningconfiguration.ui:292
 #, kde-format
 msgid "For &root certificates:"
-msgstr "Dla certyfikatów podstawowych:"
+msgstr "Dla ce&rtyfikatów głównych:"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
 #: ui/warningconfiguration.ui:305
 #, kde-format
 msgid "For intermediate CA certificates:"
-msgstr "Szukaj pośrednich certyfikatów CA:"
+msgstr "Dla certyfikatów pośrednich UC:"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #: ui/warningconfiguration.ui:318
 #, kde-format
 msgid "For end-user certificates/&keys:"
-msgstr "Dla certyfikatów/kluczy użytkownika:"
+msgstr "Dla certyfikatów/&kluczy końcowych:"
 
 #. i18n: ectx: property (text), widget (QPushButton, gnupgButton)
 #: ui/warningconfiguration.ui:365
@@ -7268,7 +7284,17 @@
 #: ui/warningconfiguration.ui:404
 #, kde-format
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
-msgstr "Ponownie włącz wszystkie ostrzeżenia \"Nie pytaj więcej\""
+msgstr "Przywróć wszystkie okna \"Nie pytaj więcej\""
+
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 sekund"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Wycofaj wysłanie"
 
 #: undostack.cpp:63
 #, kde-format
@@ -7327,6 +7353,12 @@
 msgid "Zoom: %1%"
 msgstr "Przybliżenie: %1%"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Wstawki tekstowe"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Sprawdź śledzenie URL poczty"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Nazwa katalogu i rozmiar, jeśli bliski przydziałowi"
 
@@ -10845,9 +10877,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Określa, czy konto korzysta z domyślnej tożsamości"
 
-#~ msgid "Identity account"
-#~ msgstr "Konto tożsamości"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "Ścieżka RID skrzynki pocztowej do śledzenia zmian"
 
@@ -13704,10 +13733,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "Otwieranie URL..."
 
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "Na pewno uruchomić <filename>%1</filename>?"
-
 #~ msgid "Execute"
 #~ msgstr "Wykonaj"
 
diff -Nru kmail-19.04.3/po/pl/kmail-refresh-settings.po kmail-19.12.3/po/pl/kmail-refresh-settings.po
--- kmail-19.04.3/po/pl/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/pl/kmail-refresh-settings.po	2020-03-03 00:34:11.000000000 +0000
@@ -0,0 +1,104 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-10 07:11+0200\n"
+"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
+"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 19.07.70\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Łukasz Wojniłowicz"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "lukasz.wojnilowicz@gmail.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Pomocnik KMaila do odświeżania ustawień"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Odświeżanie ustawień KMaila"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Ostrzeżenie"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Wyczyść ustawienia"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Zakończ"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Wyczyść"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Usuwanie przestarzałych ustawień \"PoradaDnia\": Ukończono"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Usuwanie ustawień okien dialogowych w pliku `%1`: Ukończono"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Usuwanie ustawień filtrów w pliku `%1`: Ukończono"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Czyszczenie ustawień katalogu w pliku ustawień `%1`: Ukończono"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Czyszczenie rozmiaru okna dialogowego w pliku ustawień `%1`: Ukończono"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Zamknij KMail/Kontact zanim użyjesz."
diff -Nru kmail-19.04.3/po/pl/ktnef.po kmail-19.12.3/po/pl/ktnef.po
--- kmail-19.04.3/po/pl/ktnef.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pl/ktnef.po	2020-03-03 00:34:11.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-26 12:04+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
diff -Nru kmail-19.04.3/po/pt/akonadi_archivemail_agent.po kmail-19.12.3/po/pt/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/pt/akonadi_archivemail_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt/akonadi_archivemail_agent.po	2020-03-03 00:34:12.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: archivemailagent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-29 13:26+0000\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -17,6 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-POFile-SpellExtra: BZ TAR GZ Laurent Montel\n"
+"X-POFile-IgnoreConsistency: Name\n"
 
 #: addarchivemaildialog.cpp:44
 #, kde-format
@@ -177,13 +178,13 @@
 "Não é possível adicionar um segundo arquivo para esta pasta. Modifique a "
 "existente, como alternativa."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "A pasta não existe. Verifique por favor a configuração. O arquivo foi adiado."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Iniciar o arquivo de %1"
diff -Nru kmail-19.04.3/po/pt/akonadi_followupreminder_agent.po kmail-19.12.3/po/pt/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/pt/akonadi_followupreminder_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pt/akonadi_followupreminder_agent.po	2020-03-03 00:34:11.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_followupreminder_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-29 13:26+0000\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -13,97 +13,97 @@
 "X-POFile-SpellExtra: Laurent Montel Lembretes\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agente de Lembretes de Seguimentos"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Lembrete de Seguimento"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "'Copyright' (C) 2014-2019 de Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Manutenção"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "José Nuno Pires"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "zepires@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Para"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Assunto"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Prazo-Limite"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Resposta"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Recebido"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Em espera"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Mostrar a Mensagem"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Apagar"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Deseja remover este item seleccionado?"
 msgstr[1] "Deseja remover estes %1 itens seleccionados?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Resposta de %1 recebida"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Ainda está à espera de uma resposta para este e-mail:"
diff -Nru kmail-19.04.3/po/pt/akonadi_mailfilter_agent.po kmail-19.12.3/po/pt/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/pt/akonadi_mailfilter_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt/akonadi_mailfilter_agent.po	2020-03-03 00:34:11.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: mailfilteragent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2014-11-06 09:41+0000\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -18,17 +18,17 @@
 msgid "Filter Log Viewer"
 msgstr "Visualizador do Registo do Filtro"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Partilhar..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Registar as actividades do fi&ltro"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -38,23 +38,23 @@
 "dados de registo são recolhidos e apresentados somente quando o registo "
 "estiver activo. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalhes do Registo"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Descrição do padrão do registo"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Registar a avaliação das &regras de filtragem"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -69,34 +69,34 @@
 "em alternativa, só serão apresentados os resultados da avaliação de todas as "
 "regras de um único filtro."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Registar a avaliação do padrão do filtro"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Registar as acções do filtro"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Limite de tamanho do registo:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "ilimitado"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -109,7 +109,7 @@
 "se o tamanho dos dados registados ultrapassar este limite, os dados mais "
 "antigos serão apagados até que o limite não seja mais excedido. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -118,63 +118,63 @@
 "Não foi possível gravar o ficheiro %1:\n"
 "A \"%2\" é a descrição detalhada do erro."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Erro do KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "A filtrar a mensagem %1 de %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Erro ao aplicar a movimentação do filtro de correio"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Erro ao aplicar a remoção do filtro de correio"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Erro ao aplicar as modificações do filtro de correio"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>A avaliar as regras de filtragem:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>As regras de filtragem corresponderam.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>A começar a filtrar na mensagem \"%1\" de \"%2\" em \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "A filtrar as mensagens"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Registo de Filtragem de Correio Activo"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Pronto"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "A filtrar em %1"
diff -Nru kmail-19.04.3/po/pt/akonadi_sendlater_agent.po kmail-19.12.3/po/pt/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/pt/akonadi_sendlater_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pt/akonadi_sendlater_agent.po	2020-03-03 00:34:12.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-01-02 10:29+0000\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -60,124 +60,124 @@
 msgid "Your emails"
 msgstr "zepires@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Para"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Assunto"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Enviar perto das"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Recorrente"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID da Mensagem"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Não existem mensagens em espera..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Enviar agora"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Apagar"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Sim"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Não"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Deseja apagar o item seleccionado?"
 msgstr[1] "Deseja apagar os itens seleccionados?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Remover os itens"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Deseja remover também as mensagens?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Remover a mensagem"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Foi encontrado algo que não é uma mensagem."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Não foi encontrada nenhuma mensagem."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Ocorreu um erro ao obter a mensagem."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Não é possível obter a mensagem. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Não é possível criar o transporte"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "A mensagem não é verdadeira"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Não é possível enviar a mensagem."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Ocorreu um erro. Deseja enviá-la de novo?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Ocorreu um erro"
diff -Nru kmail-19.04.3/po/pt/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/pt/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/pt/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pt/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:12.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-08 11:11+0000\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -47,37 +47,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "A sincronizar a caixa de correio unificada %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Adicionar uma Caixa de Correio Unificada"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nome:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Escolher o ícone..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Ícone:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Recebido"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Enviado"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Rascunhos"
diff -Nru kmail-19.04.3/po/pt/kmail.po kmail-19.12.3/po/pt/kmail.po
--- kmail-19.04.3/po/pt/kmail.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pt/kmail.po	2020-03-03 00:34:11.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-02-06 11:39+0000\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-10-25 10:27+0100\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
 "Language: pt\n"
@@ -192,8 +192,8 @@
 msgstr "Várias chaves de cifra por endereço"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -300,27 +300,27 @@
 "O KMail não foi capaz de detectar nenhuma lista de correio nesta pasta. Por "
 "favor, preencha os endereços à mão."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Utilização:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Estado:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% preenchido"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 de %2 usado"
@@ -343,7 +343,7 @@
 "que deseja associar a esta pasta.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Modelos"
@@ -354,106 +354,106 @@
 msgstr "&Usar os modelos personalizados das mensagens nesta pasta"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copiar os Modelos Globais"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Ver"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Utilizar &ícones personalizados"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "Não-&lidas:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Mostrar a Coluna do Remetente/Destinatário na Lista de Mensagens"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Mostrar a col&una:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Predefinição"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Remetente"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatário"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Lista de Mensagens"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Usar a agregação predefinida"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregação"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Usar o tema predefinido"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Formato Predefinido da Mensagem"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Preferir o HTML ao texto"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Preferir o texto ao HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Usar a Configuração Global"
@@ -463,100 +463,105 @@
 msgid "Retrieval Options"
 msgstr "Opções de Recepção"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identidades"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Recepção"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Envio"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Servidor de LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contas de envio (adicione pelo menos uma):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opções Comuns"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Confirmar a&ntes de enviar"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Verificar a ortografia antes de enviar"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nunca Automaticamente"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Na Verificação Manual de E-mail"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Em Todas as Verificações de E-mail"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Enviar Agora"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Enviar Mais Tarde"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Enviar as &mensagens da pasta pasta A Enviar:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Método de &envio por omissão:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Activar a Anulação do Envio"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Adicionar uma Conta de E-Mail..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Conta Personalizada..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -565,30 +570,30 @@
 "Não foi possível iniciar o assistente de contas. Verifique por favor a sua "
 "instalação."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Não foi possível iniciar o assistente de contas"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Incluir Na Verificação Manual de E-mail"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Mudar para o modo desligado ao encerrar o KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Verificar o correio no arranque"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -646,7 +651,7 @@
 msgid "Fixed Width Font"
 msgstr "Tipo de Letra Monoespaçado"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Compositor"
@@ -955,61 +960,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Não é possível criar a marca. Já existe uma marca com esse nome."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Geral"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Modelos-Padrão"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Modelos Personalizados"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Assunto"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Codificação"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Anexos"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Auto-correcção"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Auto-Dimensionar a Imagem"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Assinatura"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1018,12 +1023,12 @@
 "Inserir automaticamente a assinatura configurada\n"
 "ao começar a compor uma mensagem"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Inserir a assinatura antes de qualquer texto citado"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1032,18 +1037,18 @@
 "Insere o separador de assinaturas compatível com o RFC\n"
 "(dois traços e um espaço numa linha) antes da assinatura"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Ao responder, não citar nenhuma assinatura existente"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formato"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1054,7 +1059,7 @@
 "(em vez da mensagem completa), quando existir \n"
 "texto seleccionado na janela da mensagem."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1066,17 +1071,17 @@
 "linha\n"
 "adicional enquanto o texto mudava de linha."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Activar a mudança de linha automática na largura indicada"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Definir a largura de texto para a mudança de linha automática"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1087,7 +1092,7 @@
 "no formato original em que foi recebido ou, se a opção\n"
 "estiver desligada, irá responder como texto simples por omissão."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1099,34 +1104,34 @@
 "É suportado o texto negrito, itálico e sublinhado, assim como as referências "
 "externas."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Incorporado"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Como Anexo"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Define o formato predefinido das mensagens encaminhadas"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tipo de encaminhamento por omissão:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1137,17 +1142,17 @@
 "Poderá seleccionar esta opção por mensagem, usando a opção \"Opções - Pedir "
 "a Notificação de Entrega\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Avisar se indicar demasiados destinatários"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Definir o número máximo de destinatários para o aviso"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1164,7 +1169,7 @@
 "mensagem para demasiadas pessoas. Lembre-se contudo que isto não\n"
 "tem em conta as listas de distribuição ou outras listas de correio."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1173,18 +1178,18 @@
 "Recordar os endereços recentes introduzidos,\n"
 "oferecendo-se para a completação do destinatário"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Sem gravar"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Máximo de endereços recentes retidos:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1193,23 +1198,23 @@
 "O número máximo de endereços introduzidos recentemente \n"
 "que serão recordados na completação"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configurar a Completação..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Auto-gravação"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Sem auto-gravação"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1217,18 +1222,18 @@
 msgstr[0] " minuto"
 msgstr[1] " minutos"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Gravar automaticamente a mensagem com este período de tempo"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefi&xos do Assunto nas Respostas"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1237,59 +1242,59 @@
 "Reconhecer qualquer dos seguintes prefixos (não distingue maiúsculas de "
 "minúsculas):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "A&dicionar..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Re&mover"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mod&ificar..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Indicar o novo prefixo de resposta:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Pre&fixos do Assunto nos Reencaminhamentos"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Adicionar..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Remo&ver"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modificar..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Indique o novo prefixo de reenvio:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1299,89 +1304,89 @@
 "contenha todos os caracteres necessários."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modificar..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Indique a codificação:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Manter a codi&ficação original ao responder ou ao reencaminhar (se possível)."
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Esta codificação não é suportada."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Usar o sufixo Message-ID personalizado"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Sufixo personalizado do Message-&ID:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definir os cabeçalhos de MIME personalizados:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nome"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valor"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&vo"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 "O 'Content-Type' não é um texto autorizado. Este cabeçalho não será gravado."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Cabeçalho inválido"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomeação de anexos compatível com o Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1390,40 +1395,40 @@
 "Active esta opção para fazer com que o Outlook(tm) compreenda os nomes de "
 "anexos que contenham caracteres não Ingleses"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Activar a detecção dos a&nexos em falta"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Reconhecer qualquer uma das palavras seguintes como intenção de anexar um "
 "ficheiro:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Indique a nova palavra-chave:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Tamanho Máximo do Anexo:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Sem limite"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1510,8 +1515,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "'Plugins' de Texto do Conversor"
+msgid "Text Conversion Plugins"
+msgstr "'Plugins' de Conversão de Texto"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1625,7 +1630,7 @@
 msgid "Archive Folder"
 msgstr "Arquivar a Pasta"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1691,19 +1696,19 @@
 msgid "Notification"
 msgstr "Notificação"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 anexo (%2)"
 msgstr[1] "%1 anexos (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Esconder a lista de anexos"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Mostrar a lista de anexos"
@@ -1720,331 +1725,331 @@
 msgid "Encoding"
 msgstr "Codificação"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Seleccione o dicionário a usar ao verificar ortograficamente esta mensagem"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Seleccione a pasta 'Enviado' para onde será gravada uma cópia desta mensagem"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Seleccione a conta de saída a usar para enviar esta mensagem"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Indique o endereço de e-mail \"De:\" desta mensagem"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Definir o assunto desta mensagem"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identidade:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Dicionário:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Pa&sta de enviados:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Transporte de &correio:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&De:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Ass&unto:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "En&viar um E-mail"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "En&viar um E-mail Via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Enviar"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Enviar Mais &Tarde"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Enviar Mais &Tarde Via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Colocar em Espera"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "&Gravar como Rascunho"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Gravar a mensagem na pasta Rascunhos"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Gravar Como &Modelo"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Gravar a mensagem na pasta Modelos"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Gravar como &Ficheiro"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Gravar a mensagem como um ficheiro de texto ou HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Inserir um Ficheiro de Texto..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Inserir um Ficheiro de Texto Recente"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Li&vro de Endereços"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Abrir o Livro de Endereços"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Novo Compositor"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Escolha os Destinatá&rios..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Gravar a Lista de &Distribuição..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Colar como Ane&xo"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Limpar os &Espaços"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Usar um Tipo de &Letra Monoespaçado"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgente"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Notificação de Disposição do &Pedido"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Pedir uma &Confirmação da Entrega"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Mudança de Linha"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "E&xcertos"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Verificação Ortográfica &Automática"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Edição de Texto Formatado"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Texto Formatado"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Comutar o modo de edição em texto formatado"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Todos os C&ampos"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identidade"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Dicionário"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Pa&sta de Enviados"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Transporte de &Correio"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&De"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Ass&unto"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Juntar a Ass&inatura"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Antec&eder com a Assinatura"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Inserir a Assinat&ura na Posição do Cursor"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Verificador Ortográfico..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Verificador Ortográfico"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Cifrar a M&ensagem"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Encriptar"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "A&ssinar a Mensagem"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Assinar"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Formato de &Cifra da Mensagem"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Seleccione um formato criptográfico para esta mensagem"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Criar uma Mensagem de Seguimento..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configurar o KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2053,53 +2058,53 @@
 "<qt>Isto irá esconder a barra do menu por completo. Podê-la-á mostrar de "
 "novo se escrever %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Esconder o menu"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linha: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Coluna: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "SOB"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Ortografia: ligada"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Ortografia: desligada"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Gravar de Novo como &Modelo"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Gravar como Ra&scunho"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2108,7 +2113,7 @@
 "Grava de novo esta mensagem na pasta de Modelos. Poderá então ser usada "
 "posteriormente."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2117,82 +2122,82 @@
 "Grava esta mensagem na pasta de Rascunhos. Poderá então ser editada e "
 "enviada posteriormente."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Quer gravar a mensagem para uso futuro ou abandoná-la?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Fechar o Compositor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "A Gravação Automática da Mensagem Falhou"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "O Envio das Mensagens Falhou"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Inserir um Ficheiro"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Adicionar como &Imagem Incorporada"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "&Adicionar Como Anexo"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nome do anexo:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "O nome do anexo não pode estar vazio"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Nome do Anexo Inválido"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Adicionar o URL à Mensagem"
 msgstr[1] "Adicionar os URL's à Mensagem"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "&Adicionar o Ficheiro Como Anexo"
 msgstr[1] "&Adicionar os Ficheiros Como Anexos"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Inserir o texto da área de transferência como um anexo"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "sem nome"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2205,12 +2210,12 @@
 "MIME) para usar nesta função.</p><p>Por favor seleccione as chaves a usar na "
 "configuração da identidade.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Chave de Cifra Indefinida"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2222,12 +2227,12 @@
 "favor seleccione a chave que deve ser usada na configuração de identidade.</"
 "p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Chave de Assinatura Indefinida"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2238,7 +2243,7 @@
 "também de definir o seu endereço de e-mail para todas as identidades, para "
 "que não o tenha de indicar para cada mensagem."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2247,37 +2252,37 @@
 "Tem que indicar pelo menos um destinatário, quer no campo Para: ou como CC "
 "ou BCC."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "O campo Para: está vazio. Enviar de qualquer forma?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Nenhum Para: indicado"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Não foi indicado o assunto da mensagem. Enviar de qualquer forma?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Assunto Não Indicado"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&Enviar como Está"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "Indicar o A&ssunto"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2285,22 +2290,22 @@
 msgstr ""
 "Tem que indicar pelo menos um destinatário para poder encriptar um rascunho."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Prestes a enviar a mensagem..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Confirmação do Envio"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "E&nviar Agora"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2309,22 +2314,22 @@
 "Está a tentar enviar a mensagem para mais de %1 destinatários. Deseja enviar "
 "a mensagem à mesma?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Demasiados destinatários"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Enviar como E&stá"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Editar os Destinatários"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2333,22 +2338,22 @@
 "A desactivação do modo de HTML fará com que o texto perca a formatação. Tem "
 "a certeza?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Perder a formatação?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perder a Formatação"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Adicionar o Código de Texto Simples"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2357,7 +2362,7 @@
 "Será usada uma encriptação de alta segurança para este destinatário (a chave "
 "de encriptação é de total confiança). Carregue no ícone para mais detalhes."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2367,7 +2372,7 @@
 "chave de encriptação é de confiança marginal). Carregue no ícone para mais "
 "detalhes."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2377,7 +2382,7 @@
 "chave de encriptação não é de confiança). Carregue no ícone para mais "
 "detalhes."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2388,7 +2393,7 @@
 "encriptação é desconhecida (não foi possível verificar a chave de "
 "encriptação). Carregue no ícone para mais detalhes."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Informação do Editor de 'Plugins'"
@@ -2465,7 +2470,7 @@
 msgid "External editor was started."
 msgstr "Foi iniciado o editor externo."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2474,14 +2479,14 @@
 "O transporte não foi encontrado. Verifique por favor se vai usar um "
 "transporte de correio correcto."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "A pasta Enviado não foi definida. Verifique-a por favor antes de enviar o "
 "correio."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
@@ -2489,7 +2494,7 @@
 "A identidade não foi encontrada. Verifique por favor se vai usar uma "
 "identidade correcta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2518,11 +2523,6 @@
 msgid "Message will not be encrypted"
 msgstr "A mensagem não será cifrada"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Excertos de Texto"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2570,27 +2570,27 @@
 msgid "Cannot move messages."
 msgstr "Não é possível mover as mensagens."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Não foi possível obter a pasta. O erro devolvido foi: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Não foi devolvida nenhuma pasta."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Não foi possível obter a pasta-mãe. O erro devolvido foi: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Não é possível obter a lista de pastas."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Mensagens arquivadas"
@@ -2631,48 +2631,48 @@
 msgid "&Existing identities:"
 msgstr "Identidades &existentes:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Erro ao gerar um novo par de chaves: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Erro na Geração das Chaves"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Sem chave"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Gerar um novo par de chaves"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "A gerar um novo par de chaves..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Editar a Identidade"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Geral"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "O seu &nome:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2684,12 +2684,12 @@
 "em branco, o seu nome real não irá aparecer, somente o endereço de e-mail.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zação:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2700,12 +2700,12 @@
 "organização, tal como quer que seja mostrado no cabeçalho do e-mail que é "
 "enviado.</p><p>É seguro (e normal) deixar isto em branco.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Endereço de e-mail:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2721,12 +2721,12 @@
 "</p><p>Se você o deixar em branco ou o tiver errado, as pessoas terão "
 "problemas a responder-lhe.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Endereços a&lternativos de e-mail:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2743,12 +2743,12 @@
 "tr><tr><th>Alternativas:</th><td>nome@exemplo.org<br>apelido@exemplo.org</"
 "td></tr></table><p>Escreva um endereço alternativo por linha.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Criptografia"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2764,12 +2764,12 @@
 "p><p>Você poderá saber mais sobre as chaves em <a>https://www.gnupg.org</a></"
 "p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Chave de assinatura OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2787,12 +2787,12 @@
 "serão afectadas.</p><p>Você poderá saber mais sobre as chaves em <a>https://"
 "www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Chave de cifra do OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2805,12 +2805,12 @@
 "branco, mas o KMail não conseguirá assinar digitalmente os e-mails com o S/"
 "MIME; as funções normais de e-mail não serão afectadas.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificado de assinatura S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2825,39 +2825,39 @@
 "KMail não conseguirá cifrar as mensagens enviadas para si com o S/MIME; as "
 "funções normais de e-mail não serão afectadas.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificado de cifra S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Formato preferido:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Assinar automaticamente as mensagens"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Encriptar automaticamente as mensagens sempre que possível"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avançado"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Endereço de res&posta:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2875,12 +2875,12 @@
 "tt>, mas que as respostas vão para o endereço de um grupo.</p><p>Se tiver "
 "dúvidas, deixe este campo em branco.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Endereços de &CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2897,12 +2897,12 @@
 "separar a lista de destinatários do CC.</p><p>Se tiver dúvidas, deixe este "
 "campo em branco.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Endereços de &BCC:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2920,57 +2920,57 @@
 "de destinatários do BCC.</p><p>Se tiver dúvidas, deixe este campo em branco."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&icionário:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Pasta de e-mail en&viado:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Pasta &de rascunhos:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Pas&ta de modelos:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Conta de Envio:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Anexar o meu vCard à mensagem"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Criar..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Língua da auto-correcção:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Repor o domínio por omissão"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Domínio &por omissão:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2979,33 +2979,33 @@
 "<qt><p>O domínio por omissão é usado para completar os endereços de e-mail "
 "que só consistem do nome do utilizador.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Usar os modelos personalizados das mensagens para esta identidade"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Assinatura"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Imagem"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Endereço de E-mail Alternativo \"%1\" Inválido"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Endereço de E-mail Inválido"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3018,7 +3018,7 @@
 "Isto poderá resultar em mensagens de aviso do lado do destinatário, ao "
 "tentar verificar as assinaturas feitas com esta configuração."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3027,7 +3027,7 @@
 "Uma das chaves de cifra do OpenPGP não contém nenhum ID de utilizador com o "
 "endereço de e-mail configurado para esta identidade (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3040,7 +3040,7 @@
 "Isto poderá resultar em mensagens de aviso do lado do destinatário, ao "
 "tentar verificar as assinaturas feitas com esta configuração."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3049,22 +3049,22 @@
 "Um dos certificados de cifra do S/MIME não contém nenhum ID de utilizador "
 "com o endereço de e-mail configurado para esta identidade (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Endereço de E-mail Não Encontrado na Chave/Certificados"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "O ficheiro de assinatura não é válido"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Editar a Identidade \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3073,7 +3073,7 @@
 "Algumas pastas personalizadas para a identidade (já) não existem; por isso, "
 "serão usadas a pastas por omissão."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Editar..."
@@ -3104,6 +3104,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Não é possível apagar o ficheiro vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Deseja mesmo cancelar?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmação"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3269,7 +3281,7 @@
 "Exemplos disponíveis em <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Imagem"
@@ -3302,7 +3314,7 @@
 msgstr[0] "A lista de distribuição \"%2\" está vazia. Não a poderá usar."
 msgstr[1] "As listas de distribuição \"%2\" estão vazias. Não as poderá usar."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Adicionar ao Livro de Endereços"
@@ -3312,22 +3324,22 @@
 msgid "Contact created successfully"
 msgstr "O contacto foi criado com sucesso"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Não é possível gravar o contacto: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Não foi possível gravar o contacto"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Tem a certeza que quer anexar a pasta \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Anexar a Pasta"
@@ -3543,14 +3555,14 @@
 msgstr "&Pasta"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Aplicar os Filtros na Pasta"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3576,7 +3588,7 @@
 msgstr "&Encaminhar"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&plicar o Filtro"
@@ -3601,7 +3613,7 @@
 msgstr "A&juda"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barra Principal"
@@ -3654,12 +3666,12 @@
 msgid "The file does not contain a message."
 msgstr "O ficheiro não contém nenhuma mensagem."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "O ficheiro contém várias mensagens. Somente a primeira será mostrada."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3668,32 +3680,32 @@
 "Deseja encaminhar as mensagens seleccionadas como anexos de uma única "
 "mensagem (como um resumo MIME) ou como mensagens individuais?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Enviar em Bloco"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Enviar Individualmente"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "A filtrar as mensagens"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "A filtrar a mensagem %1 de %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "A mover mensagens"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "A apagar mensagens"
@@ -3722,30 +3734,30 @@
 msgid "Text Direction Toolbar"
 msgstr "Barra de Direcção do Texto"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "O KMail está configurado como desligado; todas as tarefas de rede estão "
 "suspensas"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Enviar um E-mail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Não é possível enviar o e-mail"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "O KMail está configurado como ligado; todas as tarefas de rede vão prosseguir"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3754,40 +3766,40 @@
 "O KMail está configurado como ligado; todas as tarefas de rede vão "
 "prosseguir quando for detectada uma ligação à rede"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "O KMail está de momento no modo desligado. Como deseja prosseguir?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Ligado/Desligado"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Funcionar Ligado"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Funcionar Desligado"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "Foi detectada uma ligação de rede; todas as tarefas de rede vão prosseguir"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Não foi detectada nenhuma ligação de rede; todas as tarefas de rede estão "
 "suspensas"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3796,12 +3808,12 @@
 "Não foi possível aceder ao ficheiro de gravação automática em %1.\n"
 "Razão: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Acesso ao Ficheiro de Auto-Gravação sem Sucesso"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3810,7 +3822,7 @@
 msgstr[1] ""
 "Estas %1 identidades foram alteradas para usar o transporte predefinido:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3819,43 +3831,47 @@
 msgstr[1] ""
 "Estas %1 identidades foram alteradas para usar o transporte modificado:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "A enviar as mensagens"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "A iniciar o processo de envio..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "O recurso %1 está com problemas."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"O recurso %1 está com problemas.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "O Agente de Arquivo de Correio não estava registado."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "O Agente de Envio Posterior não estava registado."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "O Agente de Mensagens de Seguimento não estava registado."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3864,12 +3880,12 @@
 "Não foi possível iniciar o gestor de certificados; verifique por favor se o "
 "Kleopatra foi devidamente instalado."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Erro do KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3878,26 +3894,26 @@
 "Não foi possível iniciar o assistente de importação. Verifique por favor a "
 "sua instalação."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Não foi possível iniciar o assistente de importação"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Não foi possível iniciar o programa \"Exportação das Definições PIM\". "
-"Verifique por favor a sua instalação."
+"Não foi possível iniciar o programa \"Exportação de Dados PIM\". Verifique "
+"por favor a sua instalação."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Não foi possível iniciar a \"Exportação das Definições PIM\""
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Não foi possível iniciar a \"Exportação de Dados PIM\""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3906,71 +3922,71 @@
 "Não foi possível iniciar o assistente de importação. Verifique por favor a "
 "sua instalação."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Não foi possível iniciar o assistente de importação"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Foi encontrado outro cliente de e-mail no sistema. Deseja importar os dados "
 "do mesmo?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Não foi possível iniciar o assistente de importação. Verifique por favor a "
 "sua instalação."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Sem Assunto"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(sem modelos)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Esta pasta não tem opções de expiração definidas"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Tem a certeza que quer expirar esta pasta <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Expirar a Pasta"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Expirar"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Esvaziar o Lixo"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Enviar para o Lixo"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Tem a certeza que quer esvaziar a pasta do lixo?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3979,27 +3995,27 @@
 "<qt>Tem a certeza que quer mover todas as mensagens da pasta <b>%1</b> para "
 "o lixo?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Foram movidas todas as mensagens para o lixo"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Quer mesmo expirar todas as mensagens antigas?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Expirar as Mensagens Antigas?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Expirar"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4010,17 +4026,17 @@
 "vulnerável a \"spam\" e pode aumentar o nível de susceptibilidade do seu "
 "sistema a ataques externos e aproveitamento de falhas de segurança."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Carregar as Referências Externas"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4035,531 +4051,531 @@
 "<qt>Deseja mesmo apagar as %1 mensagens seleccionadas?<br/>Uma vez apagadas, "
 "não podem ser recuperadas.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Remover as Mensagens"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Remover a Mensagem"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "A mover as mensagens..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "A apagar as mensagens..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "As mensagens foram removidas com sucesso."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "As mensagens foram movidas com sucesso."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "A remoção das mensagens foi mal-sucedida."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "A remoção das mensagens foi cancelada."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "A mudança de sítio das mensagens foi mal-sucedida."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "A mudança de sítio das mensagens foi cancelada."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Mover as Mensagens para a Pasta"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "A copiar as mensagens..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "As mensagens foram copiadas com sucesso."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "A cópia de mensagens foi mal-sucedida."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "A cópia de mensagens foi cancelada."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copiar as Mensagens para a Pasta"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "A mover as mensagens para o lixo..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "A apagar e a mover as mensagens para o lixo..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "As mensagens foram enviadas para o lixo com sucesso."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "As mensagens foram enviadas para o lixo com sucesso"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "O envio das mensagens para o lixo foi mal-sucedido."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "A remoção ou mudança de posição das mensagens foi mal-sucedida."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "O envio das mensagens para o lixo foi cancelado."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "O envio das mensagens para o lixo foi cancelado."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Saltar para uma Pasta"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Gr&avar Como..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Expirar Todas as Pastas"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Verificar o Correio"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Verificar o Correio em"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Verificar o Correio"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "E&nviar as Mensagens em Espera"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Estado da ligação (desconhecido)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Enviar as Mensagens em Espera Via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gestor de Certificados"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importar Mensagens..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Depurar o Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visua&lizador de Registos de Filtros..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importar de Outro Cliente de E-Mail..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Editar as Respostas de \"Fora do Escritório\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configurar o Arquivo Automático..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Mensagens Adiadas..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Mensagens de Seguimento..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Apagar"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "M&over o Tópico para o Lixo"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Mover o tópico para o caixote do lixo"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Remo&ver o Tópico"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Procurar as Mensagens..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Seleccionar Todas &as Mensagens"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Gestão da Lista de Correio..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Atribuir um Atalho..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Configuração da &Expiração"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arquivar a Pasta..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Carregar as Referências E&xternas"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copiar a Mensagem Para..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Mover a Mensagem Para..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nova Mensagem..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nova"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Mensagem do &Modelo"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "N&ova Mensagem Para a Lista..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Criar um Filtro"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtro do A&ssunto..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "&Filtro da Origem..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Fil&tro do Destino..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtro do &CC..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marcar o &Tópico"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marcar o Tópico como &Lido"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marcar todas as mensagens do tópico seleccionado como lidas"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marcar o Tópico como Nã&o-Lido"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marcar todas as mensagens do tópico seleccionado como não-lidas"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marcar o Tópico como &Importante"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Remover a Marca de &Importante do Tópico"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marcar o Tópico como Item de &Acção"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Remover a Marca de Item de &Acção do Tópico"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Vigiar o Tópico"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorar o Tópico"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Gravar os Anexos..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copiar a Descodificação Para..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Apl&icar Todos os Filtros"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expandir o Tópico / Grupo"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expande o tópico ou grupo actual"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Fe&char o Tópico / Grupo"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Fecha o tópico ou grupo actual"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ex&pandir Todos os Tópicos"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expande todos os tópicos da pasta actual"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Fechar T&odos os Tópicos"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Fecha todos os tópicos na pasta actual"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Mostrar a Mensagem"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Mensagem Seguinte"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Vai para a próxima mensagem"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Mensagem Não-L&ida Seguinte"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Seguinte"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Vai para a próxima mensagem não lida"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Mensagem &Anterior"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Vai para a mensagem anterior"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Mensagem Não-Lida Anterior"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Anterior"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Vai para a mensagem não-lida anterior"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Pró&xima Pasta Não-Lida"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Vai para a próxima pasta com mensagens não lidas"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Pasta Não-Lida A&nterior"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Vai para a pasta anterior com mensagens não-lidas"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "&Texto Não-Lido Seguinte"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Vai para o próximo texto não lido"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4568,223 +4584,228 @@
 "Desce na mensagem actual. Se chegar ao fim da mensagem actual, vai para a "
 "próxima mensagem não-lida."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configurar os &Filtros..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Gerir os 'Scripts' do &Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Adicionar uma Conta..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introdução ao KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Mostra a Página de Boas-Vindas do KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configurar as &Notificações..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configurar o KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Expirar..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Adicionar uma Pasta de Favoritos..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Subscrição no Servidor..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Aplicar Todos os Filtros"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importar/Exportar os Dados do KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Novo Contacto do Livro de Endereços..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copiar a Mensagem para a Pasta"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Ir para a Pasta..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Cancelar a Operação Actual"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Passar Para a Próxima Pasta"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Passar Para a Pasta Anterior"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Seleccionar a Pasta em Primeiro Plano"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Passar Para a Primeira Pasta"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Passar Para a Última Pasta"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Passar Para a Mensagem Seguinte"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Passar Para a Mensagem Anterior"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Seleccionar a Primeira Mensagem"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Seleccionar a Última Mensagem"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Seleccionar a Mensagem em Primeiro Plano"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Colocar a Procura Rápida em Primeiro Plano"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Passar a Selecção Para a Mensagem Anterior"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Passar a Selecção Para a Mensagem Seguinte"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Mover a Mensagem Para a Pasta"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Usar Menos Largura de Banda"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Marcar Todas as Mensagens como Lidas nesta Pasta e suas Sub-Pastas"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Remover os Duplicados nesta Pasta e suas Sub-Pastas"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "&Configuração da Conta"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Reiniciar a Conta"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Adicionar uma Pasta Favorita"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Es&vaziar o Lixo"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Mover Todas as Mensagens para o Lixo"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Remover a Procura"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Editar a Procura..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "Desfa&zer"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Desfazer: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtro %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Procurar...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4795,12 +4816,12 @@
 "aumentar o nível de susceptibilidade do seu sistema a ataques externos e "
 "aproveitamento de falhas de segurança."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Usar o HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4817,119 +4838,119 @@
 "ou desactivar a funcionalidade por completo na configuração do 'plugin' do "
 "KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Activar as Caixas de Correio Unificadas?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Activar as Caixas de Correio Unificadas"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "A iniciar..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "E&nviar para o Lixo"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Lixo"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Mover a mensagem para o lixo"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Não é possível copiar o item. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nova Mensagem Para..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Responder A..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Encaminhar Para..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Adicionar ao Contacto Existente"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Abrir no Livro de Endereços"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Adicionar esta Ligação aos Favoritos"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Editar o contacto..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Gravar a Ligação Como..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Procurar na Mensagem..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Gravar a Imagem no Disco..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Mostrar no Formato HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Mostrar no formato HTML quando o correio vem deste contacto"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Carregar as referências externas quando o correio vem para este contacto"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Partilhar a imagem..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4938,64 +4959,64 @@
 "O KMail baseia-se agora na plataforma de gestão de informações pessoais "
 "Akonadi, o que provoca bastantes alterações em redor."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Correio por envio (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Pesquisas melhoradas"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Suporte para adicionar notas (anotações) às mensagens"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Menos bloqueios da interface, devido às verificações do correio em segundo "
 "plano"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Suporte para 'plugins'"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Novo motor de HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Verificação do URL de Burla Adicionada"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "O Cliente de E-mail do KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "A Obter o Conteúdo da Pasta"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Espere por favor . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Desligado"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5004,7 +5025,7 @@
 "<p>O KMail está de momento no modo desligado. Carregue <a href=\"kmail:"
 "goOnline\">aqui</a> para se ligar . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5013,22 +5034,22 @@
 "<p>A conta está de momento no modo desligado. Carregue <a href=\"kmail:"
 "goResourceOnline\">aqui</a> para se ligar . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "O contacto foi modificado com sucesso"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Novas Mensagens em"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Não existem mensagens por ler"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5051,8 +5072,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5145,17 +5166,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Seleccione os resumos dos 'plugins' a apresentar na página de resumo."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Sumário do Kontact do KDE"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5201,27 +5222,27 @@
 msgid "All"
 msgstr "Tudo"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Sumário do Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Vista Sumária do Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(C) 2003-2019 A equipa de desenvolvimento do Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5249,7 +5270,7 @@
 msgid "&Reply"
 msgstr "&Resposta"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Responder..."
@@ -5259,12 +5280,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Responder ao A&utor..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Responder &a Todos..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Responder para a &Lista..."
@@ -5294,7 +5315,7 @@
 msgid "&Edit As New"
 msgstr "&Editar como Novo"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5487,82 +5508,82 @@
 "A pesquisa foi mal-sucedida, devido a alguns erros encontrados: <ul><li>%1</"
 "li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Procurar Mensagens"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Procurar"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Incorporada..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Como &Anexo..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Gravar os Anexos..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Limpar a Selecção"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Ir para a pasta original"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 ocorrência"
 msgstr[1] "%1 ocorrências"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Última Procura"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Não seleccionou uma pasta válida."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Esqueceu-se de seleccionar as colecções."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Esqueceu-se de definir a condição."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Todas as pastas seleccionadas estão vazias ou não estão indexadas."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Esqueceu-se de adicionar as condições."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5570,32 +5591,32 @@
 "A condição 'contém' não pode ser usada com um número de caracteres inferior "
 "a 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "A procurar..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Não é possível obter o resultado da pesquisa. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "A pesquisa foi mal-sucedida."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Procura terminada."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "A pesquisa foi interrompida."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5606,21 +5627,21 @@
 "já existe outra pasta de procura com o mesmo nome. O erro devolvido foi "
 "\"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copiar a Mensagem"
 msgstr[1] "Copiar as %1 Mensagens"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Cortar a Mensagem"
 msgstr[1] "Cortar as %1 Mensagens"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "A verificar o estado do índice..."
@@ -5757,7 +5778,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5768,7 +5789,7 @@
 "questionado uma vez."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5777,26 +5798,26 @@
 "Este valor é usado para decidir se a Introdução ao KMail deverá ser mostrada."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Mostrar o campo de texto de pesquisa rápida de pastas"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Encaminhar incorporada por omissão."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Avisar se o número de destinatários for maior que:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5807,19 +5828,19 @@
 "pedir uma confirmação antes do envio do e-mail. O aviso poder-se-á desligar."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Confirmar a ortografia antes de enviar"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Pedir automaticamente as notificações de disposição das &mensagens"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5835,13 +5856,13 @@
 "<em>Opções</em>-><em>Pedir a Notificação de Disposição</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Gravar automaticamente a cada:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5854,152 +5875,152 @@
 "como 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "Mostrar a Gestão de Excertos de Texto e o Painel de Inserção no compositor."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Se assinalada, as mensagens enviadas serão guardadas encriptadas"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Uma lista com todos os URL's usados recentemente"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Uma lista com todas as codificações usadas recentemente"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Mostrar o indicador de legenda de cifra"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Validar o Atalho Predefinido de Envio"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "O tamanho da janela de identidades (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "A largura da janela de pesquisa (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "A altura da janela de pesquisa (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "A largura da janela para Configurar o KMail (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "A altura da janela para Configurar o KMail (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Área de Antevisão da Mensagem"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Não mostrar uma área de antevisão da mensagem"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Mostrar a área de antevisão da mensagem sob a lista de mensagens"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Mostrar a área de antevisão da mensagem a seguir à lista de mensagens"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Lista de Pastas"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lista de pastas longa"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Lista de pastas curta"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Modelo das mensagens novas"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Modelo da mensagem de resposta"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Modelo da mensagem de resposta para todos"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Modelo da mensagem de encaminhamento"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Caracteres de citação"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Indica a política usada na sua visualização"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6009,7 +6030,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6019,7 +6040,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6029,7 +6050,7 @@
 "uso interno)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6039,7 +6060,7 @@
 "uso interno)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6049,7 +6070,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6322,7 +6343,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6689,8 +6710,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Verificar o URL de Seguimento do E-Mail"
+msgid "Scan emails for tracking URLs"
+msgstr "Sondar os e-mails à procura de URL's de seguimento"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7309,6 +7330,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Reactivar Todos os Avisos \"Não Perguntar de Novo\""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 segundos"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Anular o envio"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
diff -Nru kmail-19.04.3/po/pt/kmail-refresh-settings.po kmail-19.12.3/po/pt/kmail-refresh-settings.po
--- kmail-19.04.3/po/pt/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/pt/kmail-refresh-settings.po	2020-03-03 00:34:11.000000000 +0000
@@ -0,0 +1,100 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-07 10:02+0100\n"
+"Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
+"Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POFile-SpellExtra: KMail Laurent Montel Kontact\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "José Nuno Pires"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "zepires@gmail.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Assistente do KMail para actualizar a configuração"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autoria"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Actualização da Configuração do KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Aviso"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Limpar a Configuração"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Terminar"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Limpar"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Remover as definições obsoletas da \"Dica do Dia\": Terminado"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Apagar a configuração da Janela no ficheiro `%1`: Terminado"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Apagar a configuração dos Filtros no ficheiro `%1`: Terminado"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+"Limpar a configuração da Pasta no ficheiro de configuração `%1`: Terminado"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Limpar o Tamanho da Janela no ficheiro de configuração `%1`: Terminado"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Por favor feche o KMail/Kontact antes de o usar."
diff -Nru kmail-19.04.3/po/pt/ktnef.po kmail-19.12.3/po/pt/ktnef.po
--- kmail-19.04.3/po/pt/ktnef.po	2019-07-09 00:20:26.000000000 +0000
+++ kmail-19.12.3/po/pt/ktnef.po	2020-03-03 00:34:11.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-19 18:22+0000\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
diff -Nru kmail-19.04.3/po/pt_BR/akonadi_archivemail_agent.po kmail-19.12.3/po/pt_BR/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/pt_BR/akonadi_archivemail_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt_BR/akonadi_archivemail_agent.po	2020-03-03 00:34:12.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-01-05 23:28-0200\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -177,13 +177,13 @@
 "Não é possível adicionar um segundo arquivo nesta pasta. Como alternativa, "
 "modifique a existente."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "A pasta não existe. Verifique as configurações. O arquivamento foi adiado."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Iniciar o arquivo de %1"
diff -Nru kmail-19.04.3/po/pt_BR/akonadi_followupreminder_agent.po kmail-19.12.3/po/pt_BR/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/pt_BR/akonadi_followupreminder_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt_BR/akonadi_followupreminder_agent.po	2020-03-03 00:34:12.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_followupreminder_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2019-01-05 23:28-0200\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -18,99 +18,99 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 18.12.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agente de Lembretes de Acompanhamento"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Lembretes de Acompanhamento"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Mantenedor"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "André Marcelo Alvarenga"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "alvarenga@kde.org"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Para"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Assunto"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Data limite"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Resposta"
 
 # Status da resposta: Recebida ou Aguardando. (Alvarenga)
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Recebida"
 
 # Status da resposta: Recebida ou Aguardando. (Alvarenga)
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Aguardando"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Mostrar mensagem"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Excluir"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Deseja remover o item selecionado?"
 msgstr[1] "Deseja remover os %1 itens selecionados?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Resposta de %1 recebida"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Você ainda aguarda uma resposta deste e-mail:"
diff -Nru kmail-19.04.3/po/pt_BR/akonadi_mailfilter_agent.po kmail-19.12.3/po/pt_BR/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/pt_BR/akonadi_mailfilter_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt_BR/akonadi_mailfilter_agent.po	2020-03-03 00:34:12.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-11-30 11:10-0200\n"
 "Last-Translator: Luiz Fernando Ranghetti <elchevive@opensuse.org>\n"
 "Language-Team: Portuguese <kde-i18n-pt_BR@kde.org>\n"
@@ -25,17 +25,17 @@
 msgid "Filter Log Viewer"
 msgstr "Visualizador de registros do filtro"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Compartilhar..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Registrar as atividades do filtro"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -45,23 +45,23 @@
 "Obviamente os registros são coletados e mostrados quando isto estiver "
 "habilitado. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalhes do registro"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Descrição do padrão de registro"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Registrar avaliação da &regra de filtragem"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -76,34 +76,34 @@
 "particular. Alternativamente, poderá ser fornecido somente o retorno sobre o "
 "resultado da avaliação de todas as regras de um filtro."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Registrar avaliação da regra do filtro"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Registrar atividades do filtro"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Limite de tamanho do registro:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "sem limite"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -117,7 +117,7 @@
 "então os dados mais antigos serão descartados, até que o limite não seja "
 "mais excedido. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -126,63 +126,63 @@
 "Não foi possível gravar o arquivo %1:\n"
 "\"%2\" é a descrição detalhada do erro."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Erro do KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrando mensagem %1 de %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Erro ao aplicar a movimentação do filtro de e-mails"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Erro ao aplicar a exclusão do filtro de e-mails"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Erro ao aplicar as modificações do filtro de e-mails"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Avaliando as regras de filtragem:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>As regras de filtragem coincidem.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Iniciar a filtragem na mensagem \"%1\" de \"%2\" em \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrando mensagens"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Registro de filtragem de e-mail ativado"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Pronto"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrando em %1"
diff -Nru kmail-19.04.3/po/pt_BR/akonadi_sendlater_agent.po kmail-19.12.3/po/pt_BR/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/pt_BR/akonadi_sendlater_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt_BR/akonadi_sendlater_agent.po	2020-03-03 00:34:12.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2019-01-05 23:45-0200\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -61,125 +61,125 @@
 msgid "Your emails"
 msgstr "alvarenga@kde.org"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Para"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Assunto"
 
 # Manter a tradução com o menor tamanho possível. (Alvarenga)
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Enviar em"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Recorrente"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID da mensagem"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Não há mensagens em espera..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Enviar agora"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Excluir"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Sim"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Não"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Deseja excluir o item selecionado?"
 msgstr[1] "Deseja excluir os itens selecionados?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Remover itens"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Deseja remover as mensagens também?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Remover mensagens"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Nenhuma mensagem encontrada."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Nenhuma mensagem encontrada."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Ocorreu um erro ao obter a mensagem."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Não foi possível obter a mensagem. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Não é possível criar o transporte"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "A mensagem não é verdadeira"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Não é possível enviar a mensagem."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Ocorreu um erro. Deseja tentar enviá-la novamente?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Ocorreu um erro"
diff -Nru kmail-19.04.3/po/pt_BR/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/pt_BR/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/pt_BR/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt_BR/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:12.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_unifiedmailbox_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-01-18 15:06-0200\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -53,37 +53,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Sincronizando a caixa de mensagens unificada %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Adicionar uma caixa de mensagens unificada"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Nome:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Escolher ícone..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "ícone:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Enviados"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Rascunhos"
diff -Nru kmail-19.04.3/po/pt_BR/kmail.po kmail-19.12.3/po/pt_BR/kmail.po
--- kmail-19.04.3/po/pt_BR/kmail.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt_BR/kmail.po	2020-03-03 00:34:12.000000000 +0000
@@ -1,5 +1,5 @@
 # Translation of kmail.po to Brazilian Portuguese
-# Copyright (C) 2003-2018 This_file_is_part_of_KDE
+# Copyright (C) 2003-2019 This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Antonio Sergio de Mello e Souza <asergioz@bol.com.br>, 2003.
@@ -8,7 +8,7 @@
 # Eduardo Habkost <ehabkost@conectiva.com.br>, 2005.
 # Waldemar Silva Júnior <wsjunior@kdemail.net>, 2005.
 # Diniz Bortolotto <diniz.bortolotto@gmail.com>, 2007.
-# André Marcelo Alvarenga <alvarenga@kde.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018.
+# André Marcelo Alvarenga <alvarenga@kde.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018, 2019.
 # Fernando Boaglio <boaglio@kde.org>, 2008.
 # Luiz Fernando Ranghetti <elchevive@opensuse.org>, 2009, 2010, 2012, 2018, 2019.
 # Marcus Vinícius de Andrade Gama <marcus.gama@gmail.com>, 2010, 2011, 2012.
@@ -17,16 +17,16 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-06-04 20:55-0300\n"
-"Last-Translator: Frederico Goncalves Guimaraes <frederico@teia.bio.br>\n"
-"Language-Team: Portuguese <kde-i18n-pt_br@kde.org>\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-10-27 09:02-0300\n"
+"Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
+"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.04.3\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -199,8 +199,8 @@
 msgstr "Múltiplas chaves de criptografia por endereço"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -307,28 +307,28 @@
 "O KMail não foi capaz de detectar uma lista de discussão nesta pasta. Por "
 "favor, preencha os endereços manualmente."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Quota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Uso:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
 # Trata-se de um % de cota em uso. (Alvarenga)
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% usado"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 de %2 usados"
@@ -351,7 +351,7 @@
 "quer associar a esta pasta.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Modelos"
@@ -362,106 +362,106 @@
 msgstr "&Usar modelos de mensagem personalizados nesta pasta"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copiar modelos globais"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Exibir"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Usar ícones &personalizados"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "Não l&ida:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Mostrar a coluna 'Remetente/Destinatário' na lista de mensagens"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Mo&strar coluna:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Padrão"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Remetente"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatário"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Lista de mensagens"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Usar o agrupamento padrão"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agrupamento"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Usar o tema padrão"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Formato padrão da mensagem"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Preferir HTML ao Texto"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Preferir Texto ao HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Usar as configurações globais"
@@ -471,100 +471,105 @@
 msgid "Retrieval Options"
 msgstr "Opções de recepção"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identidades"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Recebimento"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Envio"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Servidor LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contas de envio (adicione ao menos uma):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opções comuns"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Confirmar antes do envio"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Verificar ortografia antes do envio"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nunca automaticamente"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Nas verificações manuais de e-mails"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Em todas as verificações de e-mails"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Enviar agora"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Enviar mais tarde"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Enviar &mensagens da pasta caixa de saída:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Méto&do de envio padrão:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Ativar o desfazer envio"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Adicionar conta de e-mail..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Conta personalizada..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -573,30 +578,30 @@
 "Não foi possível iniciar o Assistente de Contas. Verifique se o "
 "AccountWizard está instalado corretamente."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Não foi possível iniciar o assistente de contas"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Incluir nas verificações manuais de e-mails"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Alternar para desconectado ao encerrar o KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Verificar e-mails ao iniciar"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -654,7 +659,7 @@
 msgid "Fixed Width Font"
 msgstr "Fonte de largura fixa"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Compositor"
@@ -959,62 +964,62 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Não é possível criar a etiqueta. Já existe uma etiqueta com esse nome."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Geral"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Modelos padrão"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Modelos personalizados"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Assunto"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Codificação de caracteres"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Anexos"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Autocorreção"
 
 # Tradução reduzida para ficar totalmente visível. Manter a tradução com o menor tamanho possível. (Alvarenga)
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Redimensionamento de imagens"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Assinatura"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1023,12 +1028,12 @@
 "Inserir automaticamente a assinatura configurada\n"
 "ao começar a compor uma mensagem"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Inserir a assinatura antes de qualquer texto citado"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1037,18 +1042,18 @@
 "Insere o separador de assinaturas compatível com o RFC\n"
 "(dois traços e um espaço em uma linha) antes da assinatura"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Ao responder, não citar nenhuma assinatura existente"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formato"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1059,7 +1064,7 @@
 "(em vez da mensagem completa), se existir texto\n"
 "selecionado na janela da mensagem."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1070,17 +1075,17 @@
 "do texto citado, mesmo que a linha tenha sido criada com uma quebra de\n"
 "linha adicional no texto."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Ativar a quebra de linha automática na largura indicada"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Definir a largura de texto para a quebra de linha automática"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1091,7 +1096,7 @@
 "em que foi recebida.\n"
 "Se estiver desmarcada, a resposta será em texto simples por padrão."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1104,34 +1109,34 @@
 "referências\n"
 "externas."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Integrado"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Como anexo"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Define o formato padrão das mensagens encaminhadas"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tipo de encaminhamento padrão:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinatários"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1142,17 +1147,17 @@
 "Você pode selecionar esta opção por mensagem, usando a opção \"Opções - "
 "Solicitar notificação de recebimento\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Avisar se muitos destinatários forem indicados"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Definir o número máximo de destinatários para o aviso"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1169,7 +1174,7 @@
 "mensagem para muitas pessoas. Lembre-se, contudo, que isso não\n"
 "leva em consideração as listas de distribuição ou listas de discussão."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1178,18 +1183,18 @@
 "Lembrar dos endereços recentes inseridos,\n"
 "oferecendo-se para a completação do destinatário"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Sem salvar"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Número máximo de endereços recentes:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1198,23 +1203,23 @@
 "Número máximo de endereços introduzidos recentemente que\n"
 "serão lembrados na completação"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Configurar autocompletar..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Salvar automaticamente"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Sem salvamento automático"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1222,18 +1227,18 @@
 msgstr[0] " minuto"
 msgstr[1] " minutos"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Salvar automaticamente a mensagem neste intervalo de tempo"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Prefi&xos do assunto nas respostas"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1242,59 +1247,59 @@
 "Reconhecer os seguintes prefixos\n"
 "(não há distinção entre maiúsculas e minúsculas):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "A&dicionar..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Re&mover"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mod&ificar..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Digite o novo prefixo de resposta:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefixos do assunto nos &encaminhamentos"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Adicionar..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Remo&ver"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modificar..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Digite o novo prefixo de encaminhamento:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1304,73 +1309,73 @@
 "busca de uma codificação que contenha todos os caracteres necessários."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modificar..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Digite a codificação de caracteres:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Se possível, manter a codificação de caracteres original nas respostas e "
 "encaminhamentos"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Esta codificação de caracteres não é suportada."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Usar sufixo de identificador de mensagens personalizado"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "&Sufixo de identificador de mensagens personalizado:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definir campos de cabeçalhos MIME personalizados:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Nome"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valor"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&vo"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
@@ -1378,17 +1383,17 @@
 "O 'Content-Type' não é uma string autorizada. Este cabeçalho não será "
 "gravado."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Cabeçalho inválido"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Nomes de anexos compatíveis com o Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1397,40 +1402,40 @@
 "Habilite esta opção para fazer com que o Outlook® compreenda os caracteres "
 "diferentes do inglês, contidos nos nomes dos anexos"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Habilitar detecção de inexistência de anexos"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Reconhecer qualquer uma das seguintes palavras-chave como intenção de anexar "
 "um arquivo:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Digite uma nova palavra-chave:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Tamanho máximo do anexo:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Sem limite"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1516,8 +1521,8 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "Plugins de Texto do Conversor"
+msgid "Text Conversion Plugins"
+msgstr "Plugins de conversão de texto"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
@@ -1631,7 +1636,7 @@
 msgid "Archive Folder"
 msgstr "Arquivar pasta"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1697,19 +1702,19 @@
 msgid "Notification"
 msgstr "Notificação"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 anexo (%2)"
 msgstr[1] "%1 anexos (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Ocultar lista de anexos"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Mostrar lista de anexos"
@@ -1726,332 +1731,332 @@
 msgid "Encoding"
 msgstr "Codificação"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Selecione o dicionário a usar quando verificar a ortografia desta mensagem"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Selecione a pasta de e-mails enviados para onde uma cópia desta mensagem "
 "será salva"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Selecione a conta de saída a usar para enviar esta mensagem"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Defina o endereço de e-mail \"De:\" para esta mensagem"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Definir o assunto desta mensagem"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identidade:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Dicionário:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Pasta de men&sagens enviadas:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Transporte de &mensagem:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&De:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Ass&unto:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Enviar mensagem"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Enviar mensagem via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Enviar"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Enviar mais &tarde"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Enviar &mais tarde via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Fila"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "&Salvar como rascunho"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Salvar o e-mail na pasta rascunhos"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Salvar como &modelo"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Salvar o e-mail na pasta modelos"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Sa&lvar como arquivo"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Salvar e-mail arquivo texto ou HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Inserir arquivo de texto..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Inserir arquivo de texto recente"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Livro de endereços"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Abrir livro de endereços"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Novo compositor"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Selecionar &destinatários..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Salvar lista de &distribuição..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Colar como a&nexo"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "L&impar espaços"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Usar fonte de largura fi&xa"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgente"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Solicitar notificação de recebimento"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Solicita&r confirmação de entrega"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Quebrar linhas"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Trechos"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Verificação ortográfica automática"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Edição de texto formatado"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Texto formatado"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Mudar o modo de edição em texto formatado"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Todos os c&ampos"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identidade"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Dicionário"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Pasta de mensagens &enviadas"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Transporte de mensagem"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&De"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Ass&unto"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Inserir ass&inatura no fim da mensagem"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Inserir as&sinatura no início da mensagem"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Inserir assinatura na posição do c&ursor"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Verificador ortográfico..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Verificador ortográfico"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Criptografar mensagem"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Criptografar"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "A&ssinar mensagem"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Assinar"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Formato de criptografia da mensagem"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Selecione um formato criptográfico para esta mensagem"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Criar lembrete de acompanhamento..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configurar o KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2060,53 +2065,53 @@
 "<qt>Isto irá ocultar a barra de menus completamente. Você pode exibi-la "
 "novamente digitando %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Ocultar barra de menus"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linha: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Coluna: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "SOB"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Verificação ortográfica: ativada"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Verificação ortográfica: desativada"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "&Salvar novamente como modelo"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Salvar como rascunho"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2115,7 +2120,7 @@
 "Salvar novamente esta mensagem na pasta de modelos. Ela pode ser usada mais "
 "tarde."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2124,82 +2129,82 @@
 "Salvar esta mensagem na pasta de rascunhos. Ela pode ser editada e enviada "
 "mais tarde."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Deseja salvar a mensagem para posterior edição ou descartá-la?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Fechar o compositor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Ocorreu uma falha no salvamento automático da mensagem"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Falha no envio da mensagem"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Inserir arquivo"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Adicionar como &imagem integrada"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Adicionar como &anexo"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Nome do anexo:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "O nome do anexo não pode ficar em branco"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "O nome do anexo é inválido"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Adicionar a URL à mensagem"
 msgstr[1] "Adicionar as URLs à mensagem"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Adicionar o arquivo como &anexo"
 msgstr[1] "Adicionar os arquivos como &anexo"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Inserir texto da área de transferência como anexo"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "sem nome"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2212,12 +2217,12 @@
 "(OpenPGP ou S/MIME) definida para isto.</p><p>Por favor, selecione a(s) "
 "chave(s) para uso nas configurações da identidade.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Chave de criptografia não definida"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2228,12 +2233,12 @@
 "definir a chave de assinatura (OpenPGP ou S/MIME) a ser usada.</p><p>Por "
 "favor, selecione a chave nas configurações da identidade.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Chave de assinatura não definida"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2244,7 +2249,7 @@
 "definir seu endereço de e-mail para todas as identidades, e assim, você não "
 "precisará digitá-lo em cada mensagem."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2253,37 +2258,37 @@
 "Você deve especificar ao menos um destinatário no campo Para: ou como Cc ou "
 "Cco."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "O campo Para: está em branco. Enviar a mensagem assim mesmo?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Nenhum Para: foi especificado"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Você não especificou um assunto. Enviar a mensagem assim mesmo?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nenhum assunto especificado"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Enviar &como está"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Especificar o assunto"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2292,22 +2297,22 @@
 "Você deve especificar ao menos um destinatário para poder criptografar um "
 "rascunho."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Pronto para enviar o e-mail..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Confirmação de envio"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Enviar agora"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2316,22 +2321,22 @@
 "Você está tentando enviar o e-mail para mais que %1 destinatários. Enviar a "
 "mensagem mesmo assim?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Muitos destinatários"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Enviar como e&stá"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Editar destinatários"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2339,22 +2344,22 @@
 msgstr ""
 "A desativação do modo HTML causará a perda da formatação. Tem certeza disto?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Perder a formatação?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Perder formatação"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Adicionar o código de texto simples"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2364,7 +2369,7 @@
 "chave criptográfica é totalmente confiável). Clique no ícone para mais "
 "detalhes."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2374,7 +2379,7 @@
 "chave criptográfica é relativamente confiável). Clique no ícone para mais "
 "detalhes."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2383,7 +2388,7 @@
 "Será usada uma criptografia de baixa segurança para este destinatário (a "
 "chave criptográfica não é confiável). Clique no ícone para mais detalhes."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2394,7 +2399,7 @@
 "criptografia é desconhecida (não foi possível verificar a chave de "
 "criptográfica). Clique no ícone para mais detalhes."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Informações sobre o editor de plugins"
@@ -2471,7 +2476,7 @@
 msgid "External editor was started."
 msgstr "O editor externo foi iniciado."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2480,14 +2485,14 @@
 "O transporte não foi encontrado. Verifique se vai usar um transporte de e-"
 "mail correto."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "A pasta de mensagens enviadas não foi definida. Definia-a antes de enviar a "
 "mensagem."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
@@ -2495,7 +2500,7 @@
 "A identidade não foi encontrada. Verifique se vai usar uma identidade "
 "correta."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2523,11 +2528,6 @@
 msgid "Message will not be encrypted"
 msgstr "A mensagem não será criptografada"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Trechos de texto"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2574,27 +2574,27 @@
 msgid "Cannot move messages."
 msgstr "Não foi possível mover as mensagens."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Não foi possível obter a pasta. Erro: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Nenhuma pasta obtida."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Não foi possível obter a pasta-mãe. Erro: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Não foi possível obter a lista de pastas."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Mensagens arquivadas"
@@ -2635,48 +2635,48 @@
 msgid "&Existing identities:"
 msgstr "Identidades &existentes:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Erro ao gerar um novo par de chaves: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Erro na geração da chave"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Sem chave"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Gerar um novo par de chaves"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Gerando novo par de chaves..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Editar identidade"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Geral"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Seu nome:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2688,12 +2688,12 @@
 "em branco, seu nome real não aparecerá, mas somente o endereço de e-mail.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zação:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2704,12 +2704,12 @@
 "se quiser que ela seja mostrada nos cabeçalhos dos e-mails enviados.</p><p>É "
 "seguro (e normal) deixar este campo em branco.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Endereço de e-mail:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2725,12 +2725,12 @@
 "abaixo.</p><p>Se deixar em branco ou informá-lo incorretamente, as pessoas "
 "terão dificuldades para responder a você.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Endereços de &e-mail alternativos:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2748,12 +2748,12 @@
 "th><td>nome@exemplo.org<br>apelido@exemplo.org</td></tr></table><p>Digite um "
 "endereço alternativo por linha.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Criptografia"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2769,12 +2769,12 @@
 "serão afetadas.</p><p>Você pode aprender mais sobre chaves em <a>https://www."
 "gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Chave de assinatura OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2792,12 +2792,12 @@
 "não serão afetadas.</p><p>Você pode aprender mais sobre chaves em <a>https://"
 "www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Chave de criptografia OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2810,12 +2810,12 @@
 "o KMail não será capaz de assinar digitalmente os e-mails usando o S/MIME. "
 "As funções normais de e-mail não serão afetadas.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificado de assinatura S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2830,39 +2830,39 @@
 "não será capaz de criptografar as cópias de e-mails enviados usando o S/"
 "MIME. As funções normais de e-mail não serão afetadas.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificado de criptografia S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Formato preferido:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Assinar as mensagens automaticamente"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Criptografar automaticamente as mensagens sempre que possível"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avançado"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Endereço de &resposta:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2880,12 +2880,12 @@
 "mas que qualquer resposta seja enviada para um endereço de grupo.</p><p>Se "
 "estiver em dúvida, deixe este campo em branco.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Endereços &Cc:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2902,12 +2902,12 @@
 "a lista de destinatários de Cc.</p><p>Se tiver dúvidas, deixe este campo em "
 "branco.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Endereços de cópia oculta (Cco):"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2925,57 +2925,57 @@
 "destinatários de Cco.</p><p>Se estiver em dúvida, deixe este campo em branco."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Dicionário:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Pasta de mensagens &enviadas:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Pasta de &rascunhos:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Pasta de modelos:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Conta de envio:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Adicionar meu vCard à mensagem"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Criar..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Idioma de autocorreção:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Restaurar o nome de domínio padrão"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "&Domínio padrão:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2984,33 +2984,33 @@
 "<qt><p>O domínio padrão é usado para completar os endereços de e-mail "
 "somente consistem do nome do usuário.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Usar modelos de mensagem personalizados para esta identidade"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Assinatura"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Imagem"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Endereço de e-mail alternativo inválido \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Endereço de e-mail inválido"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3023,7 +3023,7 @@
 "Isto pode resultar em mensagens de aviso para quem estiver recebendo-as, ao "
 "tentar verificar as assinaturas feitas com esta configuração."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3032,7 +3032,7 @@
 "Uma das chaves de criptografia OpenPGP configuradas não contém um ID de "
 "usuário com o endereço de e-mail configurado para esta identidade (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3045,7 +3045,7 @@
 "Isto pode resultar em mensagens de aviso para quem estiver recebendo-as, ao "
 "tentar verificar as assinaturas feitas com esta configuração."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3054,22 +3054,22 @@
 "Um dos certificados de criptografia S/MIME configurados não contém o "
 "endereço de e-mail configurado para esta identidade (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Endereço de e-mail não encontrado nos certificados/chave"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "O arquivo de assinatura não é válido"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Editar identidade \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3078,7 +3078,7 @@
 "Alguma pasta personalizada para a identidade não existe mais. Portanto, "
 "serão usadas as pastas padrão."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Editar..."
@@ -3109,6 +3109,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Não foi possível excluir o vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Deseja realmente cancelar?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmação"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3274,7 +3286,7 @@
 "Existem exemplos disponíveis em <a href=\"http://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Imagem"
@@ -3308,7 +3320,7 @@
 msgstr[1] ""
 "As listas de distribuição %2 estão vazia e não podem ser utilizadas."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Adicionar ao livro de endereços"
@@ -3318,22 +3330,22 @@
 msgid "Contact created successfully"
 msgstr "Contato criado com sucesso"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Não foi possível armazenar o contato: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Ocorreu uma falha ao armazenar o contato"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Deseja realmente anexar a pasta \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Anexar pasta"
@@ -3546,14 +3558,14 @@
 msgstr "&Pasta"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Aplicar todos os filtros na pasta"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3579,7 +3591,7 @@
 msgstr "&Encaminhar"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "A&plicar filtro"
@@ -3604,7 +3616,7 @@
 msgstr "Aj&uda"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Barra de ferramentas principal"
@@ -3657,14 +3669,14 @@
 msgid "The file does not contain a message."
 msgstr "O arquivo não contém uma mensagem."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "O arquivo contém múltiplas mensagens. Somente a primeira mensagem será "
 "mostrada."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3673,32 +3685,32 @@
 "Deseja encaminhar as mensagens selecionadas como anexos em uma mensagem "
 "(como um resumo MIME) ou como mensagens individuais?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Enviar como resumo"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Enviar individualmente"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrando mensagens"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrando mensagem %1 de %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Movendo mensagens"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Excluindo mensagens"
@@ -3727,31 +3739,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Barra de direção do texto"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "O KMail está configurado como off-line. Todas as tarefas de rede estão "
 "suspensas"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Enviar e-mail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Não foi possível enviar o e-mail"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "O KMail está configurado como online. Todas as tarefas de rede serão "
 "retomadas"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3760,39 +3772,39 @@
 "O KMail está configurado como online. Todas as tarefas de rede serão "
 "retomadas quando a conexão de rede for detectada"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "O KMail está em modo off-line. O que deseja fazer?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Online/offline"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Trabalhar conectado"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "A conexão de rede foi detectada. Todas as tarefas de rede serão retomadas"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Nenhuma conexão de rede detectada. Todas as tarefas de rede estão suspensas"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3801,12 +3813,12 @@
 "Não foi possível abrir o arquivo de salvamento automático em %1.\n"
 "Motivo: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Falha na abertura do arquivo de salvamento automático"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3814,7 +3826,7 @@
 msgstr[0] "Esta identidade foi alterada para usar o transporte padrão:"
 msgstr[1] "Estas %1 identidades foram alteradas para usar o transporte padrão:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3823,44 +3835,48 @@
 msgstr[1] ""
 "Estas %1 identidades foram alteradas para usar o transporte modificado:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Enviando mensagens"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Iniciando o processo de envio..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "O recurso %1 é inválido."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"O recurso %1 é inválido.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "O agente de arquivamento de e-mails não foi registrado."
 
 # A tradução do nome da ferramenta como "Agente de Envio" já indica sua funcionalidade, não sendo necessário incluir a palavra "Posterior". (Alvarenga)
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "O Agente de Envio não foi registrado."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "O Agente de Lembretes de Acompanhamento não foi registrado."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3869,12 +3885,12 @@
 "Não foi possível iniciar o gerenciador de certificados. Verifique se o "
 "Kleopatra está instalado corretamente."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Erro do KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3883,26 +3899,26 @@
 "Não foi possível iniciar o Assistente de Importação. Verifique se o "
 "ImportWizard está instalado corretamente."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Não foi possível iniciar o assistente de importação"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Não foi possível iniciar o programa \"Exportação das Definições PIM\". "
-"Verifique sua instalação."
+"Não foi possível iniciar o programa \"Exportação de dados PIM\". Verifique "
+"sua instalação."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Não foi possível iniciar o programa \"Exportação das Definições PIM\""
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Não foi possível iniciar o programa \"Exportação de dados PIM\""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3911,71 +3927,71 @@
 "Não foi possível iniciar o Assistente de Importação. Verifique se o "
 "ImportWizard está instalado corretamente."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Não foi possível iniciar o Assistente de Importação"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Foi encontrado outro cliente de e-mail no sistema. Deseja importar os dados "
 "do mesmo?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Não foi possível iniciar o assistente de importação. Verifique sua "
 "instalação."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Sem assunto"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(sem modelos)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Esta pasta não contém opções de expiração definidas"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Deseja realmente expirar a pasta <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Expirar pasta"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Expirar"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Esvaziar o lixo"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Mover para o lixo"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Deseja realmente esvaziar a pasta lixo?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3984,27 +4000,27 @@
 "<qt>Deseja realmente mover todas as mensagens da pasta <b>%1</b> para o lixo?"
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Todas as mensagens foram movidas para o lixo"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Deseja realmente expirar todas as mensagens antigas?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Expirar mensagens antigas?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Expirar"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4015,17 +4031,17 @@
 "\"spam\" e pode aumentar a probabilidade de seu sistema ser comprometido por "
 "falhas de segurança a serem descobertas."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Aviso de segurança"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Carregar referências externas"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4040,531 +4056,531 @@
 "<qt>Deseja realmente excluir as %1 mensagens selecionadas?<br />Uma vez "
 "excluídas, elas não poderão ser restauradas.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Excluir mensagens"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Excluir mensagem"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Movendo mensagens..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Excluindo mensagens..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Mensagens excluídas com sucesso."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Mensagens movidas com sucesso."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Falha ao excluir as mensagens."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "A exclusão de mensagens foi cancelada."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Ocorreu um erro ao mover as mensagens."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "A operação de mover mensagens foi cancelada."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Mover mensagens para a pasta"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Copiando mensagens..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Mensagens copiadas com sucesso."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Ocorreu um erro ao copiar as mensagens."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "A cópia das mensagens foi cancelada."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copiar mensagens para a pasta"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Movendo mensagens para o lixo..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Excluindo e movendo as mensagens para o lixo..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Mensagens movidas para o lixo com sucesso."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Mensagens movidas para o lixo ou excluídas com sucesso."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Ocorreu um erro ao mover as mensagens para o lixo."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Ocorreu um erro ao excluir ou mover as mensagens para o lixo."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "O envio das mensagens para o lixo foi cancelado."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "A exclusão ou o envio das mensagens para o lixo foi cancelado."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Ir para a pasta"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Salvar &como..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Expirar todas as pastas"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Verificar e-mails"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Verificar e-mails em"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Verificar e-mails"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Enviar mensagens em espera"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Status da conexão (desconhecido)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Enviar mensagens em espera via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gerenciador de certificados"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importar mensagens..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Depurar o Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visua&lizador de registros de filtros..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importar de outro cliente de e-mail..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Editar respostas \"Ausente do escritório\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Configurar o arquivamento automático..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Mensagens adiadas..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Mensagens com Lembretes de Acompanhamento..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Excluir"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "M&over discussão para o lixo"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Mover discussão para o lixo"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Excluir &discussão"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Loca&lizar mensagens..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Selecionar &todas as mensagens"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Gerenciamento de listas de discussão..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Associar atalho..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Configuração de &expirações"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arquivar pasta..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Carregar referências e&xternas"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copiar mensagem para..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Mover mensagem para..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nova mensagem..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nova"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Mensagem do &modelo"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nova mensagem para a &lista de discussão..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Criar filtro"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtro de A&ssunto..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtro de &Remetente..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtro de Destina&tário..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtro de &Cc..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marcar &discussão"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marcar discussão como &lida"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marca todas as mensagens da discussão selecionada como lidas"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marcar discussão como &não lida"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marca todas as mensagens da discussão selecionada como não lidas"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marcar discussão como &importante"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Remover marca de discussão &importante"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marcar discussão como um item de &ação"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Remover marca de tópicos de item de &ação"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Observar &discussão"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorar discussão"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Salvar &anexos..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Copiar descodificação para..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Apl&icar todos os filtros"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expandir discussão / grupo"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expande discussão ou grupo atual"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Re&colher discussão / grupo"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Recolhe discussão ou grupo atual"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ex&pandir todas as discussões"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expande todas as discussões da pasta atual"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Rec&olher todas as discussões"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Recolhe todas as discussões da pasta atual"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Mostrar mensagem"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Próxima mensagem"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Ir para próxima mensagem"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Próxima mensagem &não lida"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Próxima"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Ir para próxima mensagem não lida"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Mensagem &anterior"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Ir para mensagem anterior"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Mensagem anterior não lida"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Anterior"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Ir para mensagem anterior não lida"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Próxima &pasta não lida"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Ir para próxima pasta com mensagens não lidas"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Pasta &anterior não lida"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Ir para pasta anterior com mensagens não lidas"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Próximo te&xto não lido"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Ir para próximo texto não lido"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4573,223 +4589,228 @@
 "Percorre a mensagem atual para baixo. Se for o fim da mensagem, vai para a "
 "próxima mensagem não lida."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configurar &filtros..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Gerenciar os scripts &Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Adicionar conta..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introdução ao KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Exibe a página de boas-vindas do KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configurar &notificações..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configurar o KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Expirar..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Adicionar pasta favorita..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Inscrição no servidor..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Aplicar todos os filtros"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importar/Exportar dados do KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Novo contato do livro de endereços..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copiar mensagem para a pasta"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Ir para a pasta..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Interromper a operação atual"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Ir para a próxima pasta"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Ir para a pasta anterior"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Selecionar pasta com foco"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Ir para a primeira pasta"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Ir para a última pasta"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Ir para próxima mensagem"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Ir para a mensagem anterior"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Selecionar a primeira mensagem"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Selecionar a última mensagem"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Selecionar mensagem com foco"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Focalizar a pesquisa rápida"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Estender a seleção para a mensagem anterior"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Estender a seleção para a próxima mensagem"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Mover mensagem para a pasta"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Usar menos largura de banda"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Marcar todas as mensagens como lidas nesta pasta e suas subpastas"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Remover mensagens duplicadas nesta pasta e suas subpastas"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Configuraçõe&s da conta"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Reiniciar a conta..."
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Adicionar pasta favorita"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Esva&ziar o lixo"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Mover todas as mensagens para o lixo"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Excluir pesquisa"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Editar pesquisa..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Desfazer"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Desfazer: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtro %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Pesquisar... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4799,12 +4820,12 @@
 "O uso de e-mail HTML irá torná-lo vulnerável a \"spam\" e pode aumentar a "
 "possibilidade do seu sistema ser comprometido por falhas de segurança."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Usar HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4822,118 +4843,118 @@
 "ou desativar completamente a funcionalidade nas configurações do plugin do "
 "KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Ativar as Caixas de Mensagens Unificadas?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Ativar as Caixas de Mensagens Unificadas"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Iniciando..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Mover para o lixo"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Lixo"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Move mensagem para o lixo"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Não foi possível copiar o item. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nova mensagem para..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Resposta para..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Reenviar para..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Adicionar ao contato existente"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Abrir no livro de endereços"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Adicionar este link aos favoritos"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Editar contato..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Salvar link como..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "Locali&zar na mensagem..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Salvar a imagem no disco..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Mostrar em formato HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Mostrar em formato HTML ao receber e-mails deste contato"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Carregar referências externas ao receber e-mails deste contato"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Compartilhar imagem..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4942,64 +4963,64 @@
 "O KMail agora tem como base a plataforma de gerenciamento de informações "
 "pessoais do Akonadi, o que provoca muitas mudanças ao seu redor."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "E-mail por envio (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Pesquisas melhoradas"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Suporte para adição de notas (anotações) aos e-mails"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Menos bloqueios da interface, devido às verificações de e-mail em segundo "
 "plano"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Suporte a plugins"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Novo renderizador HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Adição da checagem por URL de Phishing"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Cliente de e-mail do KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Obtendo o conteúdo da pasta"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Por favor, aguarde..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Offline"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5008,7 +5029,7 @@
 "Atualmente o KMail está no modo offline. Clique <a href=\"kmail:goOnline"
 "\">aqui</a> para ficar online...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5017,22 +5038,22 @@
 "Atualmente a conta está no modo offline. Clique <a href=\"kmail:"
 "goResourceOnline\">aqui</a> para ficar online...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Contato modificado com sucesso"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Novas mensagens em"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Não há mensagens não lidas"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5055,8 +5076,8 @@
 msgstr "Copyright © 2004–2010, Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5149,17 +5170,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Selecione os plugins a serem exibidos na página de resumo."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Resumo do Kontact"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5205,27 +5226,27 @@
 msgid "All"
 msgstr "Tudo"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Resumo do Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Visualização do resumo do Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(C) 2003-2019, Os desenvolvedores do Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5253,7 +5274,7 @@
 msgid "&Reply"
 msgstr "R&esponder"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Responder..."
@@ -5263,12 +5284,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Responder para o a&utor..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Responder &a todos..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Responder para a &lista de discussão..."
@@ -5298,7 +5319,7 @@
 msgid "&Edit As New"
 msgstr "&Editar como novo"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5489,113 +5510,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Foram encontrados alguns erros na pesquisa: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Localizar mensagens"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "Pe&squisar"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Integrada..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Como &anexo..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Salvar anexos..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Limpar seleção"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Ir para a pasta original"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 ocorrência"
 msgstr[1] "%1 ocorrências"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Última pesquisa"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Você não selecionou uma pasta válida."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Você esqueceu de selecionar a condição."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Você esqueceu de definir a condição."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Todas as pastas selecionadas estão vazias ou não foram indexadas."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Você esqueceu de adicionar as condições."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Contém a condição que não pode ser usada com menos de 4 caracteres."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Pesquisando..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Não foi possível obter o resultado da pesquisa. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "A pesquisa falhou."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Pesquisa concluída."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Pesquisa interrompida."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5605,21 +5626,21 @@
 "Ocorreu um problema ao renomear sua pasta de pesquisa. É provável que já "
 "exista outra pasta de pesquisa com o mesmo nome. Erro informado \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copiar mensagem"
 msgstr[1] "Copiar %1 mensagens"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Recortar mensagem"
 msgstr[1] "Recortar %1 mensagens"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Verificando o status da indexação..."
@@ -5756,7 +5777,7 @@
 "para uso interno)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5767,7 +5788,7 @@
 "só será feita uma vez."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5776,26 +5797,26 @@
 "Este valor é usado para decidir se a introdução do KMail deve ser exibida."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Mostrar edição de linha da pesquisa rápida"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Encaminhar integrada por padrão."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Avisar se o número de destinatários for superior a:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5807,19 +5828,19 @@
 "desativado."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Verificar a ortografia antes de enviar"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Solicitar automaticamente as notificações de recebimento de &mensagens"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5836,13 +5857,13 @@
 "><em>Solicitar Notificação de Recebimento</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Intervalo de salvamento automático:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5854,7 +5875,7 @@
 "isto configurando o valor para zero."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5862,148 +5883,148 @@
 "compositor."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "Se assinalada, as mensagens enviadas serão armazenadas com criptografia"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Uma lista com todas as URLs usadas recentemente"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Uma lista com todas as codificações usadas recentemente"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Mostrar o indicador de legenda de criptografia"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Validar o atalho padrão de envio"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "O tamanho da janela de identidades (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "A largura da janela de pesquisa (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "A altura da janela de pesquisa (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "A largura da janela Configurar o KMail (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "A altura da janela Configurar o KMail (apenas para uso interno)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Painel de visualização de mensagens"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Não mostrar uma mensagem no painel de visualização"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
 "Mostrar o painel de visualização de mensagens abaixo da lista de mensagens"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
 "Mostrar o painel de visualização de mensagens ao lado da lista de mensagens"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Lista de pastas"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Listagem longa de pastas"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Listagem curta de pastas"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Modelo de mensagens novas"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Modelo da mensagem de resposta"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Modelo da mensagem de resposta a todos"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Modelo da mensagem de encaminhamento"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Caracteres de citação"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Especifica a política usada na sua visualização"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6013,7 +6034,7 @@
 "uso interno)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6023,7 +6044,7 @@
 "uso interno)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6033,7 +6054,7 @@
 "para uso interno)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6043,7 +6064,7 @@
 "para uso interno)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6053,7 +6074,7 @@
 "interno)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6324,7 +6345,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6360,7 +6381,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6385,16 +6406,16 @@
 "topo da lista de mensagens. Se não forem encontradas mensagens não lidas, a "
 "pesquisa continuará na próxima pasta.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Do mesmo modo, ao procurar "
-"a mensagem não lida anterior, a pesquisa começará a partir da base da lista "
-"de mensagens e continuar na pasta anterior, dependendo da opção selecionada."
-"</p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Do mesmo modo, ao "
+"pesquisar a mensagem não lida anterior, a pesquisa começará a partir da base "
+"da lista de mensagens e continuar na pasta anterior, dependendo da opção "
+"selecionada.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Repetir em todas as pastas marcadas:</span> É igual a\"Repetir "
-"em todas as pastas\", exceto que somente serão consideradas as pastas "
-"marcadas com a propriedade \"Atuar nos e-mails novo/não lido nesta pasta\".</"
-"p></body></html>"
+"weight:600;\">Repetir em todas as pastas marcadas:</span> É igual a "
+"\"Repetir em todas as pastas\", exceto que somente serão consideradas as "
+"pastas marcadas com a propriedade \"Atuar nos e-mails novo/não lido nesta "
+"pasta\".</p></body></html>"
 
 #. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:64
@@ -6693,8 +6714,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Verificar a URL de rastreamento do e-mail"
+msgid "Scan emails for tracking URLs"
+msgstr "Analisar e-mails por URLs de rastreio"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7317,6 +7338,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Reabilitar todos os avisos \"Não perguntar novamente\""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 segundos"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Desfazer envio"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7372,41 +7403,8 @@
 msgid "Zoom: %1%"
 msgstr "Zoom: %1%"
 
-#~ msgid "Folder Name and Size When Close to Quota"
-#~ msgstr "Nome e tamanho da pasta quando estiver próximo ao limite da quota"
+#~ msgid "Text Snippets"
+#~ msgstr "Trechos de texto"
 
-#~ msgid "Set the \"Reply-To:\" email address for this message"
-#~ msgstr ""
-#~ "Defina o endereço de e-mail de resposta \"Reply-To:\" para esta mensagem"
-
-#~ msgid "&Reply to:"
-#~ msgstr "&Responder para:"
-
-#~ msgid "&Reply To"
-#~ msgstr "&Responder para"
-
-#~ msgid "Check to be warned if the address is not in the certificate"
-#~ msgstr "Marque para ser avisado se o endereço não estiver no certificado"
-
-#~ msgid ""
-#~ "<qt>\n"
-#~ "<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-#~ "If this option is checked, a warning is issued if the email address of "
-#~ "the receiver is not contained in the certificate used for encrypting.\n"
-#~ "<p>\n"
-#~ "It is recommended to leave this option turned on for maximum security.\n"
-#~ "</p></qt>"
-#~ msgstr ""
-#~ "<qt>\n"
-#~ "<h1>Avisar se o endereço de e-mail do destinatário não estiver no "
-#~ "certificado</h1>\n"
-#~ "Se esta opção estiver marcada, um aviso é emitido se o endereço de e-mail "
-#~ "do destinatário não estiver contido no certificado usado para "
-#~ "criptografia.\n"
-#~ "<p>\n"
-#~ "É recomendável deixar esta opção habilitada para maior segurança.\n"
-#~ "</p></qt>"
-
-#~ msgid "Warn if &receiver's email address is not in certificate"
-#~ msgstr ""
-#~ "Avisar se o endereço de e-mail do &destinatário não estiver no certificado"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Verificar a URL de rastreamento do e-mail"
diff -Nru kmail-19.04.3/po/pt_BR/kmail-refresh-settings.po kmail-19.12.3/po/pt_BR/kmail-refresh-settings.po
--- kmail-19.04.3/po/pt_BR/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/pt_BR/kmail-refresh-settings.po	2020-03-03 00:34:12.000000000 +0000
@@ -0,0 +1,109 @@
+# Translation of kmail-refresh-settings.po to Brazilian Portuguese
+# Copyright (C) 2019 This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Luiz Fernando Ranghetti <elchevive@opensuse.org>, 2019.
+# André Marcelo Alvarenga <alvarenga@kde.org>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-12 00:36-0300\n"
+"Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
+"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 19.04.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Luiz Fernando Ranghetti, André Marcelo Alvarenga"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "elchevive@opensuse.org, alvarenga@kde.org"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Assistente do KMail para atualizar configurações"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Atualizar configurações do KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Aviso"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Limpar configurações"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Concluir"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Limpar"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Remover as configurações obsoletas da \"Dica do dia\": Concluído"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr ""
+"Excluir as configurações da caixa de diálogo no arquivo `%1`: Concluído"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Excluir as configurações de filtros no arquivo `%1`: Concluído"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+"Limpar as configurações de pasta no arquivo de configuração `%1`: Concluído"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr ""
+"Limpar tamanho das caixas de diálogo no arquivo de configuração `%1`: "
+"Concluído"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Feche o KMail/Kontact antes de usar."
diff -Nru kmail-19.04.3/po/pt_BR/ktnef.po kmail-19.12.3/po/pt_BR/ktnef.po
--- kmail-19.04.3/po/pt_BR/ktnef.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/pt_BR/ktnef.po	2020-03-03 00:34:12.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2018-08-04 23:24-0300\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
diff -Nru kmail-19.04.3/po/ro/akonadi_archivemail_agent.po kmail-19.12.3/po/ro/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ro/akonadi_archivemail_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ro/akonadi_archivemail_agent.po	2020-03-03 00:34:13.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2013-01-13 21:44+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -181,12 +181,12 @@
 "Nu se poate adăuga a doua arhivă pentru acest dosar. Modificați-o pe cea "
 "existentă în schimb."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Începe arhivarea %1"
diff -Nru kmail-19.04.3/po/ro/akonadi_mailfilter_agent.po kmail-19.12.3/po/ro/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ro/akonadi_mailfilter_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ro/akonadi_mailfilter_agent.po	2020-03-03 00:34:13.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2013-01-13 21:56+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -23,17 +23,17 @@
 msgid "Filter Log Viewer"
 msgstr "Vizualizor jurnal filtre"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Jurna&lizează activitățile filtrelor"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -43,23 +43,23 @@
 "filtrelor. Desigur, datele jurnalului sunt colectate și afișate numai când "
 "jurnalizarea e activată. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detalii jurnalizare"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Descrierea modelului de jurnalizare"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Evaluare &reguli de jurnalizare a filtrelor"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -74,34 +74,34 @@
 "furnizat numai feedback-ul despre rezultatul evaluării tuturor regulilor "
 "unui singur filtru."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Evaluare model de jurnalizare a filtrelor"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Jurnalizează acțiunile filtrelor"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Limită de dimensiune jurnal:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr ""
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "nelimitat"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -114,7 +114,7 @@
 "dimensiunea datelor de jurnal colectate depășește această limită, atunci "
 "cele mai vechi date vor fi aruncate până nu se mai depășește limita. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -123,64 +123,64 @@
 "Nu s-a putut scrie în fișierul %1:\n"
 "„%2” este descrierea detaliată a erorii."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Eroare KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrare mesaj %1 din %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, fuzzy, kde-format
 #| msgid "Error applying mail filter delete"
 msgid "Error applying mail filter move"
 msgstr "Eroare la aplicarea ștergerii de filtre a mesajelor"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Eroare la aplicarea ștergerii de filtre a mesajelor"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Eroare la aplicarea modificărilor de filtre ale mesajelor"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Se evaluează regulile de filtrare:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Regulile de filtrare s-au potrivit.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Începe filtrarea pe mesajul „%1” de la „%2” la „%3” :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Se filtrează mesajele"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Jurnalul de filtrare a mesajelor e activat"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Pregătit"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Se filtrează în %1"
diff -Nru kmail-19.04.3/po/ro/akonadi_sendlater_agent.po kmail-19.12.3/po/ro/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ro/akonadi_sendlater_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ro/akonadi_sendlater_agent.po	2020-03-03 00:34:13.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2013-10-05 14:11+0300\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -61,58 +61,58 @@
 msgid "Your emails"
 msgstr "arthur.titeica@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Către"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Subiect"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Trimite în jur de"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Recurent"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID mesaj"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, fuzzy, kde-format
 #| msgid "Not message found."
 msgid "No messages waiting..."
 msgstr "Niciun mesaj găsit."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Trimite acum"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Șterge"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Da"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nu"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, fuzzy, kde-format
 #| msgid "Do you want to delete selected items? Do you want to continue?"
 msgid "Do you want to delete the selected item?"
@@ -121,70 +121,70 @@
 msgstr[1] "Doriți să ștergeți elementele alese? Doriți să continuați?"
 msgstr[2] "Doriți să ștergeți elementele alese? Doriți să continuați?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Elimină elementele"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, fuzzy, kde-format
 #| msgid "Do you want to remove messages as well?"
 msgid "Do you want to remove the messages as well?"
 msgstr "Doriți de asemenea și ștergerea mesajelor?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Șterge mesajele"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, fuzzy, kde-format
 #| msgid "Not message found."
 msgid "Not message found."
 msgstr "Niciun mesaj găsit."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, fuzzy, kde-format
 #| msgid "Not message found."
 msgid "No message found."
 msgstr "Niciun mesaj găsit."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Eroare la preluarea mesajului."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Nu se poate prelua mesajul. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Nu se poate crea transportul"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Nu este un mesaj real"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Nu se poate trimite mesajul."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Mesajul a fost trimis"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "A intervenit o eroare. Doriți să îl retrimiteți?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "A intervenit o eroare"
diff -Nru kmail-19.04.3/po/ro/kmail.po kmail-19.12.3/po/ro/kmail.po
--- kmail-19.04.3/po/ro/kmail.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ro/kmail.po	2020-03-03 00:34:13.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2014-03-26 13:37+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -197,8 +197,8 @@
 msgstr "Chei de criptare multiple per adresă"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -305,27 +305,27 @@
 "KMail nu a detectat în întregime nicio listă de discuții în acest dosar. "
 "Introduceți adresele manual."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Cotă"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Utilizare:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Stare:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% plin"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 KiB used"
 msgid "%1 of %2 used"
@@ -349,7 +349,7 @@
 "să le asociați cu acest dosar.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Șabloane"
@@ -360,109 +360,109 @@
 msgstr "&Utilizează șabloane de mesaj personalizate în acest dosar"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copiază șabloanele globale"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vizualizează"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Utilizează &pictograme personalizate"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Necitit:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Arată în lista de mesaje coloana Expeditor/Destinatar"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Arată &coloana:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Implicită"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Expeditor"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Destinatar"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Lista de mesaje"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Utilizează agregarea implicită"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregare"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Utilizează tematica implicită"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tematică"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "Format de mesaj nesigur"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "Preferă HTML în loc de text simplu"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "Preferă &HTML în loc de text"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -473,105 +473,110 @@
 msgid "Retrieval Options"
 msgstr "Opțiuni preluare"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Identitate"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Primire"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Expediere"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, fuzzy, kde-format
 #| msgid "IMAP server"
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Server IMAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Conturi trimitere (adăugați cel puțin unul):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Opțiuni comune"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Confirmă înainte de a trimite"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Verifică ortografia înainte de expediere"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Niciodată automat"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "La verificarea manuală pentru mesaje noi"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "La toate verificările pentru mesaje noi"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Trimite acum"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Trimite mai târziu"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "&Trimite mesajele din dosarul \"trimitere\":"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Metoda de transmitere implicită:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Adăugare cont"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgctxt "@action:inmenu Font setting"
 #| msgid "Custom..."
 msgid "Custom Account..."
 msgstr "Personalizat..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -581,30 +586,30 @@
 "Nu am putut porni gestionarul de certificate. Verificați instalarea "
 "programului."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Expertul de conturi nu a putut fi pornit"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Include în verificarea manuală a poștei"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Deconectează la închiderea KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Verifică poșta la pornire"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -663,7 +668,7 @@
 msgid "Fixed Width Font"
 msgstr "Font lățime fixă"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Compunere"
@@ -971,61 +976,61 @@
 msgstr ""
 "Eticheta nu poate fi creată. Există deja o etichetă cu aceeași denumire."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "General"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Șabloane standard"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Șabloane personalizate"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Subiect"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Set de caractere"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Antete"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Atașamente"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Corectare automată"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Redimensionare automată a imaginii"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Semnătură"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1034,12 +1039,12 @@
 "Inserează automat semnătura configurată\n"
 "la începerea compunerii unui mesaj"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Inserează semnătura deasupra oricărui text citat"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1048,18 +1053,18 @@
 "Inserează separatorul conform cu RFC\n"
 "(două cratime și un spațiu pe o linie) înainte de semnătură"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "La răspuns, nu cita nicio semnătură existentă"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1070,7 +1075,7 @@
 "(în loc de întregul mesaj) atunci când\n"
 "este text evidențiat în fereastra mesajului."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1082,17 +1087,17 @@
 "suplimentar\n"
 "în timpul limitării dinamice a textului."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying or forwarding, only quote the message in the original "
@@ -1106,7 +1111,7 @@
 "La răspuns sau înaintare, citează mesajul numai în formatul original în care "
 "a fost primit sau, dacă nu e bifat, se va răspunde implicit ca text simplu"
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1114,34 +1119,34 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "În linie"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Ca atașament"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Stabilește formatul implicit pentru mesaje înaintate"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Tip de înaintare implicit:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1149,17 +1154,17 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Atenționează dacă sunt specificați prea mulți destinatari"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Stabilește numărul maxim de destinatari pentru avertizare"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1170,50 +1175,50 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Fără salvare"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Maximum adrese recente reținute:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Configurează ordinea completării..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Nu salva automat"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Nu salva automat"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1222,18 +1227,18 @@
 msgstr[1] " minute"
 msgstr[2] " de minute"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Salvează mesajul automat la acest interval specificat"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "&Prefixe subiect răspuns"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1242,59 +1247,59 @@
 "Recunoaște orice secvență a prefixelor următoare\n"
 "(expresii regulate insensibile la registru):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "A&dăugare..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Eli&mină"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Mo&difică..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Introduceți noul prefix pentru răspuns:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Prefixe subiect în&aintare"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Adăugare..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Elimi&nă"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Modificare..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Introduceți noul prefix pentru înaintare:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1305,90 +1310,90 @@
 "mesajului."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Modificare..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Introduceți setul de caractere:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&La răspuns sau înaintare păstrează setul de caractere original (dacă e "
 "posibil)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Acest set de caractere nu este suportat."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Utilizează sufix \"Message-Id\" personalizat"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "&Sufix \"Message-Id\" personalizat:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definește antete MIME personalizate:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Denumire"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valoare"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "N&ou"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "De&numire:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valoare:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid signature."
 msgid "Invalid header"
 msgstr "Semnătură nevalidă."
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Atașamente denumite în mod compatibil cu Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1397,41 +1402,41 @@
 "Activați această opțiune pentru a permite Outlook(tm) să înțeleagă numele de "
 "atașamente ce conțin caractere non-ASCII"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Activează &detecția atașamentelor lipsă"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Recunoaște oricare dintre cuvintele cheie ca intenție de atașare a unui "
 "fișier:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Introduceți noul cuvânt cheie:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Are atașament"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kO"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Fără limită"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1525,7 +1530,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Compunere"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1644,7 +1649,7 @@
 msgid "Archive Folder"
 msgstr "Arhivare dosar"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1710,7 +1715,7 @@
 msgid "Notification"
 msgstr "Notificare"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1718,12 +1723,12 @@
 msgstr[1] "%1 atașamente (%2)"
 msgstr[2] "%1 de atașamente (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Ascunde lista atașamentelor"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Arată lista atașamentelor"
@@ -1740,388 +1745,388 @@
 msgid "Encoding"
 msgstr "Codare"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Alegeți dicționarul de utilizat la verificarea ortografică a acestui mesaj"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Alegeți dosarul cu scrisori expediate în care va fi salvată o copie a "
 "acestui mesaj"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Alegeți contul de trimitere utilizat la expedierea acestui mesaj"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Stabiliți adresa „De la:” pentru acest mesaj"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Stabilește subiectul mesajului"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identitate:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Dicționar:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Dosar „trimi&se”:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Transport e-&mail:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&De la:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "S&ubiect:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Trimite poșta"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Trimite poșta prin"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Trimite"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "T&rimite mai târziu"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "T&rimite mai târziu prin"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Așează la coadă"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "&Salvează ca ciornă"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Salvează scrisoarea în dosarul cu ciorne"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Salvează ca șa&blon"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Salvează scrisoarea în dosarul cu șabloane"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Salvează ca &fișier"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Salvează scrisoarea ca fișier textual sau HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Inserare fișier textual..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Inserează fișier textual recent"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Cartea de &adrese"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Deschide cartea de adrese"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "Compunere &nouă"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Alege destinata&ri..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Salvează lista de &distribuție..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Lipește ca atașa&ment"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Curăță spațiil&e"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Folosește font de lățime fi&xă"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urgent"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Ce&re notificare de primire"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "Ce&re notificare de primire"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Limitare cuvinte"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Fragmente"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Verificare ortografică &automată"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Redactare text complex"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Text complex"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Comută regimul de redactare a textului complex"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "To&ate câmpurile"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitate"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Dicționar"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Do&sar „trimise”"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "T&ransport poștal"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&De la"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "S&ubiect"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Atașează &semnătura"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Atașează s&emnătura la început"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Inserează semnătura la poziția c&ursorului"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Verificator &ortografic..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Verificator ortografic"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Criptează mesajul"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Criptează"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Semnează mesajul"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Semnează"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Format mesaj &criptografic"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Alegeți un format criptografic pentru acest mesaj"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Caută mesaje..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Configurare KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Linia: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Coloana: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "SUP"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Verificare ortografică: activată"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Verificare ortografică: dezactivată"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Re&salvează ca șablon"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Salvează ca ciornă"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2130,7 +2135,7 @@
 "Resalvează acest mesaj în dosarul Șabloane. Acesta poate fi utilizats la un "
 "moment ulterior."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2139,60 +2144,60 @@
 "Salvează acest mesaj în dosarul „ciorne”. Poate fi redactat și trimis la un "
 "moment ulterior."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Doriți să salvez mesajul pentru mai târziu sau să-l șterg?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Închide fereastra de compunere"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Salvarea automată a mesajului a eșuat"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Expedierea mesajului a eșuat"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert File Content"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Inserează conținutul fișierului"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Adaugă ca mesaj în l&inie"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Adaugă ca &atașament"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Denumirea atașamentului:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid signature."
 msgid "Invalid Attachment Name"
 msgstr "Semnătură nevalidă."
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2200,7 +2205,7 @@
 msgstr[1] "Adaugă URL-uri în mesaj"
 msgstr[2] "Adaugă URL-uri în mesaj"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2208,17 +2213,17 @@
 msgstr[1] "Adaugă fișiere ca &atașament"
 msgstr[2] "Adaugă fișiere ca &atașament"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Folosește textul din clipboard ca atașament"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "nedenumit"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2231,12 +2236,12 @@
 "criptare.</p><p>Vă rog să selectați cheia/cheile de utilizat în dialogul de "
 "configurare a identității.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Cheie de criptare nedefinită"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2247,12 +2252,12 @@
 "(OpenPGP sau S/MIME) de semnare.</p><p>Vă rog să selectați cheia de utilizat "
 "în dialogul de configurare a identității.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Cheie de semnare nedefinită"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2263,7 +2268,7 @@
 "De asemenea ar trebui să setați adresa de e-mail pentru toate identitățiile "
 "astfel încât să nu fiți întrebat de ea pentru fiecare mesaj de trimis."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2275,37 +2280,37 @@
 "Trebuie să specificați cel puțin un destinatar, cel puțin în câmpul \"Către:"
 "\" sau în \"CC:\" sau \"BCC:\"."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Câmpul Către: este gol. Expediați mesajul oricum?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Niciun Către: specificat"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Nu ați specificat un subiect. Trimit mesajul?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nu ați specificat un subiect"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "T&rimite"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Specifică subiectul"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, fuzzy, kde-format
 #| msgid ""
 #| "You must specify at least one receiver,either in the To: field or as CC "
@@ -2317,22 +2322,22 @@
 "Trebuie să specificați cel puțin un destinatar, cel puțin în câmpul \"Către:"
 "\" sau în \"CC:\" sau \"BCC:\"."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Urmează trimiterea mesajului..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Confirmare de trimitere"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Trimite &acum"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2341,22 +2346,22 @@
 "Încercați să expediați mesajul către mai mult de %1 destinatari. Expediați "
 "mesajul oricum?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Prea mulți destinatari"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "T&rimite așa cum este"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "R&edactează destinatarii"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2364,44 +2369,44 @@
 msgstr ""
 "Dezactivarea regimului HTML va provoca pierderea formatării. Sunteți sigur?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Pierdeți formatarea?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Pierde formatarea"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, fuzzy, kde-format
 #| msgid "Message as Plain Text"
 msgid "Add Markup Plain Text"
 msgstr "Mesaj ca text simplu"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2409,7 +2414,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2491,27 +2496,27 @@
 msgid "External editor was started."
 msgstr "Editor extern"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Dosarul arhivă nu este definit. Verificați configurările contului"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Dosarul arhivă nu este definit. Verificați configurările contului"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account"
 msgid ""
@@ -2539,11 +2544,6 @@
 msgid "Message will not be encrypted"
 msgstr "Mesajul nu va fi criptat"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Fragmente de text"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2591,30 +2591,30 @@
 msgid "Cannot move messages."
 msgstr "Mesajele nu pot fi mutate."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Eroare la crearea dosarului"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Niciun dosar întors."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Eroare la crearea dosarului"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 #| msgid "Unable to retrieve folder list."
 msgid "Unable to return list of folders."
 msgstr "Imposibil de obținut lista dosarelor."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Mesaje arhivate"
@@ -2657,50 +2657,50 @@
 msgid "&Existing identities:"
 msgstr "&Identități existente:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Eroare la redenumirea dosarului %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Introduceți noul cuvânt cheie:"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Editare identitate"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "General"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Numele dumneavoastră:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2712,12 +2712,12 @@
 "trimiteți.</p><p>Dacă nu îl completați, atunci va fi afișată numai adresa de "
 "e-mail.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zația:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2729,12 +2729,12 @@
 "mesajelor trimise.</p><p>Nu este nici o problemă să îl lăsați necompletat.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Adresa de &e-mail:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>Email address</h3><p>This field should have your full email "
@@ -2752,12 +2752,12 @@
 "introduceți greșit, cei care vă scriu vor avea probleme să comunice cu "
 "dumneavoastră.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr ""
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2768,12 +2768,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Criptografie"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2795,12 +2795,12 @@
 "gnupg.org\">http://www.gnupg.org</a> puteți afla mai multe despre chei.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Cheie OpenPGP pentru semnare:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2826,12 +2826,12 @@
 "gnupg.org\">http://www.gnupg.org</a> puteți afla mai multe despre chei.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Cheie de criptare OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2844,12 +2844,12 @@
 "nu va putea să semneze mesajele digital cu S/MIME. Funcțiile normale de mail "
 "nu sunt afectate.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certificat de semnare S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2865,41 +2865,41 @@
 "trimise către dumneavoastră. Funcțiile normale de mail nu sunt afectate.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certificat de criptare S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Format preferat:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "&Semnează automat mesajele"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Criptează automat &mesajele oricând este posibil"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avansat"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Adresă de &răspuns:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2917,12 +2917,12 @@
 "ducă către o adresăd de grup.</p> <p>Dacă nu știți ce să faceți, lăsați "
 "câmpul necompletat.</p> </qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adrese &CC:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2948,12 +2948,12 @@
 "utilizați virgula pentru a separa lista de destinatari BCC.</p> <p>Dacă nu "
 "știți ce să faceți, lăsați câmpul necompletat.</p> </qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Adrese &BCC:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2971,60 +2971,60 @@
 "utilizați virgula pentru a separa lista de destinatari BCC.</p> <p>Dacă nu "
 "știți ce să faceți, lăsați câmpul necompletat.</p> </qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "D&icționar:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Dosar \"&trimise\":"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Dosar \"&ciorne\":"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Dosar șa&bloane:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Cont de expediere:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, fuzzy, kde-format
 #| msgid "Attach my vcard to message"
 msgid "Attach my vCard to message"
 msgstr "Atașează vcard-ul meu la mesaj"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Creează..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, fuzzy, kde-format
 #| msgid "Autocorrection Language:"
 msgid "Autocorrection language:"
 msgstr "Limba pentru corecție automată:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Domeniu &implicit:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Domeniu &implicit:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3033,33 +3033,33 @@
 "<qt><p>Domeniul implicit este utilizat pentru a completa adresele de e-mail "
 "care sunt formate numai din numele de utilizator.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Utilizează șabloane de mesaj personalizate pentru această identitate"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Semnătură"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Fotografie"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Alias de email „%1” nevalid"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Adresă de e-mail eronată"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3073,7 +3073,7 @@
 "Acest lucru poate să genereze mesaje de avertizare la primirea mesajelor de "
 "la dumneavoastră atunci când destinatarul încearcă să verifice semnătura."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3083,7 +3083,7 @@
 "identificator de utilizator cu adresa de e-mail configurată pentru această "
 "identitate (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3097,7 +3097,7 @@
 "Acest lucru poate să genereze mesaje de avertizare la primirea mesajelor de "
 "la dumneavoastră atunci când destinatarul încearcă să verifice semnătura."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3107,22 +3107,22 @@
 "identificator de utilizator cu adresa de e-mail configurată pentru această "
 "identitate (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Adresa de e-mail nu există în cheie/certificat"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Fișierul semnătură nu este valid"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Editare identitate „%1”"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3134,7 +3134,7 @@
 "Dosarul \"ciorne\" al identității „%1” nu mai există. De aceea pentru ciorne "
 "va fi utilizat dosarul implicit."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Editează..."
@@ -3172,6 +3172,20 @@
 msgid "We cannot delete vCard file."
 msgstr "Nu am putut sincroniza dosarul maildir."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgid "Do you really want to remove this group and all its snippets?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Sigur doriți să eliminați acest grup și toate fragmentele sale?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Confirmare de trimitere"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3327,7 +3341,7 @@
 "Exemplele sunt disponibile la <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
 "\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3363,7 +3377,7 @@
 msgstr[1] "Listele de distribuție %2 sunt goale, nu pot fi folosite."
 msgstr[2] "Listele de distribuție %2 sunt goale, nu pot fi folosite."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Adaugă în cartea de adrese"
@@ -3374,24 +3388,24 @@
 msgid "Contact created successfully"
 msgstr "Mesaje șterse cu succes."
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Failed to store contact"
 msgstr "Imposibil de editat atașamentul"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folder?"
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Sigur doriți să golesc coșul de gunoi?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, fuzzy, kde-format
 #| msgid "Archive Folder"
 msgid "Attach Folder"
@@ -3612,7 +3626,7 @@
 msgstr "D&osar"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
@@ -3620,7 +3634,7 @@
 msgstr "Aplică t&oate filtrele"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current Folder & All Subfolders"
@@ -3647,7 +3661,7 @@
 msgstr "Î&naintează"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Aplică filtrul"
@@ -3672,7 +3686,7 @@
 msgstr "&Ajutor"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Bara de unelte principală"
@@ -3728,44 +3742,44 @@
 msgid "The file does not contain a message."
 msgstr "Fișierul nu conține un mesaj."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Fișierul conține mesaje multiple. Va fi afișat numai primul mesaj."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, fuzzy, kde-format
 msgid "Send As Digest"
 msgstr "Trimitere nesemnată"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Trimite individual"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrare mesaje"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrare mesaj %1 din %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Mutare mesaje"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Ștergere mesaje"
@@ -3794,32 +3808,32 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail este stabilit să fie deconectat; toate sarcinile de rețea sunt "
 "suspendate"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Urmează trimiterea mesajului..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail este stabilit să fie conectat; toate sarcinile de rețea sunt reluate"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid ""
@@ -3828,34 +3842,34 @@
 msgstr ""
 "KMail este stabilit să fie conectat; toate sarcinile de rețea sunt reluate"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail se află în regim deconectat. Cum doriți să procedați?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Conectat/deconectat"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Lucrează conectat"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Lucrează deconectat"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, fuzzy, kde-format
 #| msgid "KMail is set to be online; all network jobs resumed"
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "KMail este stabilit să fie conectat; toate sarcinile de rețea sunt reluate"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, fuzzy, kde-format
 #| msgid "KMail is set to be offline; all network jobs are suspended"
 msgid "No network connection detected, all network jobs are suspended"
@@ -3863,20 +3877,20 @@
 "KMail este stabilit să fie deconectat; toate sarcinile de rețea sunt "
 "suspendate"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, fuzzy, kde-format
 #| msgid "Autosaving Failed"
 msgid "Opening Autosave File Failed"
 msgstr "Salvare automată eșuată"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3888,7 +3902,7 @@
 msgstr[2] ""
 "Aceste %1 de identități au fost schimbate să utilizeze transportul implicit:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3900,43 +3914,45 @@
 msgstr[2] ""
 "Aceste %1 de identități au fost schimbate să utilizeze transportul implicit:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Trimit mesajele"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Se inițializează procesul de trimitere..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3945,12 +3961,12 @@
 msgstr ""
 "Nu pot porni managerul de certificate. Verificați instalarea programului."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Eroare KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -3960,29 +3976,29 @@
 "Nu am putut porni gestionarul de certificate. Verificați instalarea "
 "programului."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start import wizard"
 msgstr "Expertul de conturi nu a putut fi pornit"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Nu am putut porni gestionarul de certificate. Verificați instalarea "
 "programului."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Expertul de conturi nu a putut fi pornit"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid ""
@@ -3992,18 +4008,18 @@
 "Nu am putut porni gestionarul de certificate. Verificați instalarea "
 "programului."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Expertul de conturi nu a putut fi pornit"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager. Please check your installation."
 msgid "Could not start the import wizard. Please check your installation."
@@ -4011,52 +4027,52 @@
 "Nu am putut porni gestionarul de certificate. Verificați instalarea "
 "programului."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Fără subiect"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(niciun șablon)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Acest dosar nu are setate opțiuni de expirare"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Sigur doriți să expir dosarul <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Expirare dosar"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Expiră"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Golire gunoi"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Mută în coșul de gunoi"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Sigur doriți să golesc coșul de gunoi?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4065,27 +4081,27 @@
 "<qt>Sigur doriți să mut toate mesajele dosarului <b>%1</b> în coșul de gunoi?"
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Am mutat toate mesajele în coșul de gunoi"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Sigur doriți să expir toate mesajele vechi?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Expirare mesaje vechi"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Expiră"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4097,17 +4113,17 @@
 "dumneavoastră să fie compromis de exploatări ale slăbiciunilor de securitate "
 "prezente și anticipate."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Avertizare securitate"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Încarcă referințele externe"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4125,411 +4141,411 @@
 "<qt>Sigur doriți să ștergeți cele %1 de mesaje alese?<br />Odată șterse, "
 "acestea nu mai pot fi recuperate.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Ștergere mesaje"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Șterge mesaj"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Mutare mesaje..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Ștergere mesaje..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Mesaje șterse cu succes."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Mesaje mutate cu succes."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Ștergerea mesajelor a eșuat."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Ștergerea mesajelor a fost anulată."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Mutarea mesajelor a eșuat."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Mutarea mesajelor a fost anulată."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Mută mesajele în dosar"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Copiere mesaje..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Mesaje copiate cu succes."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Copierea mesajelor a eșuat."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Copierea mesajelor a fost anulată."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copiază mesajele în dosar"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Mutare mesaje la gunoi..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Mutare mesaje la gunoi..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Mesaje mutate cu succes la gunoi."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Mesaje mutate cu succes la gunoi."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Mutarea mesajelor la gunoi a eșuat."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Mutarea mesajelor la gunoi a eșuat."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Mutarea mesajelor la gunoi a fost anulată."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Mutarea mesajelor la gunoi a fost anulată."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Sari la dosarul"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Salv&are ca..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "E&xpiră toate dosarele"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Verifică &poșta"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Verifică poșta în"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Verifică poșta"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Trimite mesajele în &așteptare"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Starea conectării (necunoscută)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Trimite mesajele din coadă via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Gestionarul de certificate"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, fuzzy, kde-format
 #| msgid "&Import Messages"
 msgid "&Import Messages..."
 msgstr "&Importă mesaje"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Depanare Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "&Vizualizor jurnal filtre..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Editare răspunsuri „Ieșit din birou”..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, fuzzy, kde-format
 #| msgid "Configure &Notifications..."
 msgid "&Configure Automatic Archiving..."
 msgstr "Configurare &notificări..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "Ștergere mesaje..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Caută mesaje..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Ș&terge"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "M&ută firul la gunoi"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Mută firul în coșul de gunoi"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Șterge f&irul"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Caută mesaje..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Selectează &toate mesajele"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Administrare &listă de discuții..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Asociază scurtătură..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Configurări &expirare"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arhivare dosar..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Încarcă &referințele externe"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copiere mesaj către..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Mutare mesaj către..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Mesaj &nou..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nou"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Mesaj &din șablon"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Mesaj nou către lista de &discuții..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Creează filtru"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtrează după câmpul &Subiect..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtrează după câmpul &De la..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtrează după câmpul &Către..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Filtrează după câmpul &Către..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marchează &firul"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marchează firul ca &citit"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marchează toate mesajele în firul selectat ca citite"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marchează firul ca n&ecitit"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marchează toate mesajele în firul selectat ca necitite"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marchează firul ca &important"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Șterge marcarea &important pentru fir"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, fuzzy, kde-format
 #| msgid "Mark Thread as &New"
 msgid "Mark Thread as &Action Item"
 msgstr "Marchează firul ca &nou"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, fuzzy, kde-format
 #| msgid "Remove &Important Message Mark"
 msgid "Remove &Action Item Thread Mark"
 msgstr "Șterge marcarea de mesaj &important"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Urmărește firul"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignoră firul"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Salvează a&tașamentele..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Message To..."
 msgid "Copy Decrypted To..."
 msgstr "Copiere mesaj către..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Aplică t&oate filtrele"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Expand Thread"
@@ -4537,13 +4553,13 @@
 msgid "&Expand Thread / Group"
 msgstr "D&esfășoară firul"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, fuzzy, kde-format
 #| msgid "Expand the current thread"
 msgid "Expand the current thread or group"
 msgstr "Desfășoară firul curent"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, fuzzy, kde-format
 #| msgctxt "View->"
 #| msgid "&Collapse Thread"
@@ -4551,123 +4567,123 @@
 msgid "&Collapse Thread / Group"
 msgstr "&Restrânge firul"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, fuzzy, kde-format
 #| msgid "Collapse the current thread"
 msgid "Collapse the current thread or group"
 msgstr "Restrânge firul curent"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Des&fășoară toate firele"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Desfășoară toate firele din dosarul curent"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Res&trânge toate firele"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Restrânge toate firele din dosarul curent"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Afișează &mesajul"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Mesajul &următor"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Salt la următorul mesaj"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Mesajul următor &necitit"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Următor"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Salt la următorul mesaj necitit"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Mesajul &precedent"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Salt la mesajul precedent"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Mesajul precedent n&ecitit"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Precedent"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Salt la mesajul precedent necitit"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "&Dosarul următor necitit"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Salt la următorul dosar cu mesaje necitite"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "D&osarul precedent necitit"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Salt la dosarul precedent cu mesaje necitite"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Următorul text &necitit"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Salt la următorul text necitit"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4676,234 +4692,240 @@
 "Derulează în jos mesajul curent. Dacă a ajuns la sfârșitul mesajului, trece "
 "la următorul mesaj necitit."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Configurează &filtrele..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Gestiune scripturi &Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Adăugare cont"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introducere în KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Afișează pagina de introducere KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Configurare &notificări..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Configurare KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Expiră..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Adaugă dosar favorit..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Abonare rezidentă pe server..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Aplică t&oate filtrele"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Configure KMail..."
 msgid "Import/Export KMail Data..."
 msgstr "&Configurare KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Contact nou în cartea de adrese..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copiază mesajul în dosar"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Salt la dosarul..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Abandonează operația curentă"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Focalizează pe următorul dosar"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Focalizează pe dosarul precedent"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Selectează dosarul cu focalizare"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on First Folder"
 msgstr "Focalizează pe următorul dosar"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, fuzzy, kde-format
 #| msgid "Focus on Next Folder"
 msgid "Focus on Last Folder"
 msgstr "Focalizează pe următorul dosar"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Focalizează pe următorul mesaj"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Focalizează pe mesajul precedent"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select First Message"
 msgstr "Selectează &toate mesajele"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, fuzzy, kde-format
 #| msgid "Select &All Messages"
 msgid "Select Last Message"
 msgstr "Selectează &toate mesajele"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Selectează mesajul cu focalizare"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Stabilește focalizarea la căutarea rapidă"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Extinde selecția la mesajul precedent"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Extinde selecția la următorul mesaj"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Mută mesajul în dosar"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message Window"
 msgid "Use Less Bandwidth"
 msgstr "Fereastra de mesaje"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "&Configurări"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity account"
+msgid "Restart Account"
+msgstr "Cont de identitate"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Adaugă dosar favorit"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Golește gunoiul"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Mută toate mesajele la gunoi"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Ș&terge căutarea"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Edit Script..."
 msgid "Edit Search..."
 msgstr "Editare script..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtrul %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Pornire..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4914,12 +4936,12 @@
 "poate crește posibilitatea ca sistemul dumneavoastră să fie compromis de "
 "exploatări ale slăbiciunilor de securitate prezente și anticipate."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Folosește HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4929,127 +4951,127 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "R&enunță"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Pornire..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Mută la gunoi"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Gunoi"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Mută mesajul în coșul de gunoi"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Copy or Move Messages to %1"
 msgid "Cannot copy item. %1"
 msgstr "Copiază sau mută mesajele la %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Mesaj nou către..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Răspunde către..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Înaintează către..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Unable to edit attachment"
 msgid "Add to Existing Contact"
 msgstr "Imposibil de editat atașamentul"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Deschide în cartea de adrese"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Adaugă ca semn de carte"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, fuzzy, kde-format
 #| msgid "Edit Note..."
 msgid "Edit contact..."
 msgstr "Modificare notă..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Salvează legătura ca..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Caută în mesaj..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Save Image On Disk..."
 msgstr "Salvează legătura ca..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Use HTML"
 msgid "Show HTML Format"
 msgstr "Folosește HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, fuzzy, kde-format
 #| msgid "Set the folder where new messages from this account are put"
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Stabilește dosarul în care vor fi plasate mesajele acestui cont"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, fuzzy, kde-format
 #| msgid "Load external references from the Internet for this message."
 msgid "Load external reference when mail comes for this contact"
 msgstr "Încarcă referințele externe din Internet pentru acest mesaj."
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Link As..."
 msgid "Share image..."
 msgstr "Salvează legătura ca..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -5058,69 +5080,69 @@
 "Acum KMail se bazează pe platforma de gestiune a informațiilor personale "
 "Akonadi, care aduce multe schimbări în toate domeniile."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Căutare îmbunătățită"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Suport pentru adăugarea adnotărilor la scrisori"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Mai puține blocări ale interfeței, verificarea poștei are loc în fundal"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "Suport GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Added Check for Phishing URL"
 msgstr "&Confirmă înainte de a trimite"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "Client de poștă KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folderlist"
 msgid "Retrieving Folder Contents"
 msgstr "Transfer lista de dosare"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Așteptați"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "Work Offline"
 msgid "Offline"
 msgstr "Lucrează deconectat"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5134,7 +5156,7 @@
 "deconectat. Apăsați <a href=\"kmail:goOnline\">aici</a> pentru a vă "
 "conecta . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5148,23 +5170,23 @@
 "deconectat. Apăsați <a href=\"kmail:goOnline\">aici</a> pentru a vă "
 "conecta . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, fuzzy, kde-format
 #| msgid "Messages moved successfully."
 msgid "Contact modified successfully"
 msgstr "Mesaje mutate cu succes."
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Mesaje noi în"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Nu sunt mesaje necitite"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5188,8 +5210,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5283,19 +5305,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Contacte"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5344,28 +5366,28 @@
 msgid "All"
 msgstr "Tot"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2009, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2009, Dezvoltatorii KMail"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5393,7 +5415,7 @@
 msgid "&Reply"
 msgstr "&Răspunde"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Răspunde..."
@@ -5403,12 +5425,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Răspunde &autorului..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Răspunde &tuturor..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Răspunde pe lista de &discuții..."
@@ -5439,7 +5461,7 @@
 msgid "&Edit As New"
 msgstr "&Editează mesajul"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5644,46 +5666,46 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Caută mesaje"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Caută"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "În &linie..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Ca &atașament..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Salvează atașamentele..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Elimină selecția"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "Sari la dosarul"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5691,69 +5713,69 @@
 msgstr[1] "%1 potriviri"
 msgstr[2] "%1 de potriviri"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Ultima căutare"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, fuzzy, kde-format
 #| msgid "Could not sync maildir folder."
 msgid "You did not selected a valid folder."
 msgstr "Nu am putut sincroniza dosarul maildir."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, fuzzy, kde-format
 #| msgid "Starting..."
 msgid "Searching..."
 msgstr "Pornire..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Copy or Move Messages to %1"
 msgid "Cannot get search result. %1"
 msgstr "Copiază sau mută mesajele la %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "Căutare anulată"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgctxt "@info:status Number of emails retrieved."
 #| msgid " completed"
 msgid "Search complete."
 msgstr " încheiat"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgctxt ""
 #| "@info/plain Displayed grayed-out inside the textbox, verb to search"
@@ -5761,7 +5783,7 @@
 msgid "Search stopped."
 msgstr "Caută"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5769,7 +5791,7 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5777,7 +5799,7 @@
 msgstr[1] "Copiază %1 mesaje"
 msgstr[2] "Copiază %1 de mesaje"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5785,7 +5807,7 @@
 msgstr[1] "Taie %1 mesaje"
 msgstr[2] "Taie %1 de mesaje"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5912,7 +5934,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5920,7 +5942,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5930,20 +5952,20 @@
 "trebuie afișată."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, fuzzy, kde-format
 #| msgid "Show folder quick search field"
 msgid "Show folder quick search line edit"
 msgstr "Arată câmpul de căutarea rapidă al dosarului"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Warn if the number of recipients is more than:"
@@ -5951,7 +5973,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5960,20 +5982,20 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, fuzzy, kde-format
 #| msgid "Confirm &before send"
 msgid "Check spelling before send"
 msgstr "&Confirmă înainte de a trimite"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Cerere automat notificare pentru starea transmiterii &mesajului"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, fuzzy, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5990,13 +6012,13 @@
 "<em>Opțiuni</em>->&gt;<em>Cerere notificare primire mesaj</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Interval salvare automată:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -6008,152 +6030,152 @@
 "Puteți dezactiva salvarea automată dacă setați valoarea lui la 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "O listă cu toate URL-urile folosite recent"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "O listă cu toate codările folosite recent"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 #| msgid "Show crypto &icons"
 msgid "Show crypto label indicator"
 msgstr "Afișează iconițe &criptografie"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Dimensiunea dialogului de identități (numai pentru uz intern)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Lățimea ferestrei de căutare (numai pentru uz intern)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Înălțimea ferestrei de căutare (numai pentru uz intern)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Lățimea dialogului Configurare KMail (numai pentru uz intern)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Înălțimea dialogului Configurare KMail (numai pentru uz intern)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Panou previzualizare mesaj"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Nu afișa panoul de previzualizare a mesajului"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Arată panoul previzualizării mesajului sub lista de mesaje"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Arată panoul previzualizării mesajului alături de lista de mesaje"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Lista de dosare"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Listă de dosare lungă"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Listă de dosare scurtă"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Șablon de mesaj pentru mesaj nou"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Șablon de mesaj pentru răspuns"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Șablon de mesaj pentru răspuns la toți"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Șablon de mesaj pentru înaintare"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Caractere de citare"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, fuzzy, kde-format
 #| msgid ""
 #| "Specifies whether the folders will expire in the background (for internal "
@@ -6164,7 +6186,7 @@
 msgstr "Specifică dacă dosarele vor expira în fundal (doar pentru uz intern)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6172,7 +6194,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6180,7 +6202,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, fuzzy, kde-format
 #| msgid "The width of the search window (for internal use only)"
 msgid ""
@@ -6189,7 +6211,7 @@
 msgstr "Lățimea ferestrei de căutare (numai pentru uz intern)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6197,7 +6219,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6458,7 +6480,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6799,10 +6821,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Verifică poșta în"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7343,6 +7364,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Reactivează toate avertizările „Nu întreba din nou”"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7408,6 +7439,14 @@
 msgid "Zoom: %1%"
 msgstr "Panoramare"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Fragmente de text"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Verifică poșta în"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Denumire și dimendiune dosar la apropierea de cotă"
 
@@ -9722,12 +9761,6 @@
 #~ msgid "Add Group"
 #~ msgstr "Adaugă grup"
 
-#, fuzzy
-#~| msgid "Do you really want to remove this group and all its snippets?"
-#~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Sigur doriți să eliminați acest grup și toate fragmentele sale?"
-
 #~ msgid "&Apply"
 #~ msgstr "&Aplică"
 
@@ -10639,9 +10672,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Folosește i&dentitatea implicită"
 
-#~ msgid "Identity account"
-#~ msgstr "Cont de identitate"
-
 #~ msgid "Define if server supports sieve"
 #~ msgstr "Definește dacă serverul susține Sieve"
 
diff -Nru kmail-19.04.3/po/ro/ktnef.po kmail-19.12.3/po/ro/ktnef.po
--- kmail-19.04.3/po/ro/ktnef.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ro/ktnef.po	2020-03-03 00:34:12.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2013-01-13 22:24+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
diff -Nru kmail-19.04.3/po/ru/akonadi_archivemail_agent.po kmail-19.12.3/po/ru/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ru/akonadi_archivemail_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ru/akonadi_archivemail_agent.po	2020-03-03 00:34:14.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-01-15 20:33+0300\n"
 "Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -185,14 +185,14 @@
 "Невозможно добавить второй архив для этой папки, вместо этого измените "
 "существующий."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "Каталог не существует. Проверьте правильность настройки. Архивирование "
 "отложено."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Начать архивирование %1"
diff -Nru kmail-19.04.3/po/ru/akonadi_followupreminder_agent.po kmail-19.12.3/po/ru/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/ru/akonadi_followupreminder_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ru/akonadi_followupreminder_agent.po	2020-03-03 00:34:13.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2019-01-15 20:33+0300\n"
 "Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -22,88 +22,88 @@
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Агент напоминаний для поддержания разговора"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Напоминания для поддержания разговора"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "© Laurent Montel, 2014–2019"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Сопровождающий"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Александр Поташев,Олеся Герасименко "
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "aspotashev@gmail.com,gammray@basealt.ru"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Получатель"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Тема"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Крайний срок"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Ответ"
 
 # Possible value in the column "Answer" --aspotashev
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Получен"
 
 # Possible value in the column "Answer" --aspotashev
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Ожидается"
 
 # BUGME: needs ellipsis at the end (as it opens a new window/dialog)? --aspotashev
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Показать письмо"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Удалить"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
@@ -112,13 +112,13 @@
 msgstr[2] "Удалить выбранные записи (%1)?"
 msgstr[3] "Удалить выбранную запись?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Получен ответ от %1"
 
 # BUGME: please reword; does this message talk about one e-mail message or many? --aspotashev
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Вы по-прежнему ждёте ответа на следующие письма:"
diff -Nru kmail-19.04.3/po/ru/akonadi_mailfilter_agent.po kmail-19.12.3/po/ru/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ru/akonadi_mailfilter_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ru/akonadi_mailfilter_agent.po	2020-03-03 00:34:13.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-11-19 17:56+0300\n"
 "Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -28,17 +28,17 @@
 msgid "Filter Log Viewer"
 msgstr "Просмотр журнала фильтрации"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Опубликовать..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Записывать действия фильтра"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -48,23 +48,23 @@
 "Разумеется, журнал будет содержать какую-либо информацию, только если запись "
 "включена."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Параметры журнала"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Записывать описание шаблона"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Записывать обработку п&равил"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -78,34 +78,34 @@
 "подробные сведения о каждом правиле фильтра; в противном случае в журнале "
 "окажется только запись о результате обработки всех правил данного фильтра."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Записывать результат применения шаблона"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Записывать действия фильтра"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Предельный размер журнала:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " КБ"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "не ограничен"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -118,7 +118,7 @@
 "превысит этот предел, самые старые записи будут удалены, чтобы освободить "
 "место для новых. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -127,63 +127,63 @@
 "Не удалось записать файл %1:\n"
 "Подробное описание ошибки: «%2»."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Ошибка KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Фильтрация письма %1 из %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Ошибка применения перемещающего фильтра"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Ошибка применения удаляющего фильтра"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Ошибка применения изменяющего фильтра"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Обработка правил фильтра:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Сообщение соответствует правилам фильтра.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Начало фильтрации сообщения «%1» от «%2» («%3»):</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Фильтрация писем"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Журнал фильтрации почты включён"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Готово"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Фильтрация коллекции источника данных «%1»"
diff -Nru kmail-19.04.3/po/ru/akonadi_sendlater_agent.po kmail-19.12.3/po/ru/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ru/akonadi_sendlater_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ru/akonadi_sendlater_agent.po	2020-03-03 00:34:14.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2019-01-15 20:35+0300\n"
 "Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -65,57 +65,57 @@
 msgid "Your emails"
 msgstr "exclusion@gmail.com,gammaray@basealt.ru"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Кому"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Тема"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Назначенное время"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "С повторением"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Идентификатор письма"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Нет писем, ожидающих отправки"
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Отправить сейчас"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Удалить"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Да"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Нет"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
@@ -124,67 +124,67 @@
 msgstr[2] "Удалить выбранные записи?"
 msgstr[3] "Удалить выбранную запись?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Удаление записей"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Также удалить сообщения?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Удаление сообщений"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Письмо не найдено."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Письмо не найдено."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Ошибка при извлечении сообщения."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Получить сообщение для отправки не удалось. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Создать транспорт не удалось."
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Отправляемое сообщение фактически сообщением не является"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Отправить сообщение не удалось."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Сообщение отправлено"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "При отправке сообщения произошла ошибка. Хотите повторить отправку?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Ошибка при отправке"
diff -Nru kmail-19.04.3/po/ru/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/ru/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/ru/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ru/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:14.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-19 17:53+0300\n"
 "Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -53,37 +53,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Синхронизация объединённой папки «%1»"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Добавление "
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Название:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Выберите значок..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Значок:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Входящие"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Отправленное"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Черновики"
diff -Nru kmail-19.04.3/po/ru/kmail.po kmail-19.12.3/po/ru/kmail.po
--- kmail-19.04.3/po/ru/kmail.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ru/kmail.po	2020-03-03 00:34:13.000000000 +0000
@@ -15,15 +15,15 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-01-19 16:05+0300\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-07-15 19:38+0300\n"
 "Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 18.12.1\n"
+"X-Generator: Lokalize 19.04.3\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Environment: kde\n"
@@ -199,8 +199,8 @@
 msgstr "Несколько ключей шифрования на адрес"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -211,10 +211,9 @@
 msgstr "Почтовый клиент KDE"
 
 #: aboutdata.cpp:365
-#, fuzzy, kde-format
-#| msgid "Copyright © 1997–2018, KMail authors"
+#, kde-format
 msgid "Copyright © 1997–2019, KMail authors"
-msgstr "© Разработчики KMail, 1997–2018"
+msgstr "© Разработчики KMail, 1997–2019"
 
 #: collectionpage/collectionmailinglistpage.cpp:51
 #, kde-format
@@ -307,27 +306,27 @@
 "KMail не смог обнаружить список рассылки в этой папке. Укажите адреса "
 "вручную."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Ограничение"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Использование:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Состояние:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "Заполнено %p%"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "используется %1 из %2"
@@ -350,7 +349,7 @@
 "которую требуется привязать к этой папке.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Шаблоны"
@@ -361,106 +360,106 @@
 msgstr "Специальные &шаблоны писем для этой папки"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Использовать стандартные шаблоны"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Вид"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "&Другие значки:"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&обычная:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "с &непрочитанными:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Показать отправителя/получателя в списке писем"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Показать &столбец адреса:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "По умолчанию"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Отправитель"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Получатель"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Список писем"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Использовать стандартный способ группировки"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Группировка"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Использовать стандартное оформление"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Тема"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Формат письма по умолчанию"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Предпочитать HTML-формат, а не текст"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Предпочитать текст, а не HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Использовать глобальные параметры"
@@ -470,100 +469,106 @@
 msgid "Retrieval Options"
 msgstr "Параметры синхронизации"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Профили"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Получение"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Отправка"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
-msgstr ""
+msgstr "Сервер LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Исходящие (должна быть хотя бы одна учётная запись):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Общие параметры"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Подтвер&ждение перед отправкой"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Проверить орфографию перед отправкой"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Отключить автоматическую отправку"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "При проверке почты вручную"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "При проверке почты"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Отправить немедленно"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Отправить позже"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "От&правлять почту из папки Исходящие:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Метод отправки по &умолчанию:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, fuzzy, kde-format
+#| msgid "Enable Unified Mailboxes"
+msgid "Enable Undo Send"
+msgstr "Использовать объединённые папки"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Добавить учётную запись почты..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Другая учётная запись..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -572,30 +577,30 @@
 "Не удалось запустить мастер учётных записей. Проверьте правильность "
 "установки программы AccountWizard."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Не удалось запустить мастер учётных записей"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Включить в проверку почты"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Отключить от сети после выхода из KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Проверять почту при запуске"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -654,7 +659,7 @@
 msgid "Fixed Width Font"
 msgstr "Моноширинный шрифт"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Редактор"
@@ -737,7 +742,7 @@
 #: configuredialog/configureappearancepage.cpp:346
 #, kde-format
 msgid "&Do not change color from original HTML mail"
-msgstr ""
+msgstr "Не изменять цвета &исходного сообщения в формате HTML"
 
 #: configuredialog/configureappearancepage.cpp:361
 #, kde-format
@@ -924,13 +929,12 @@
 #: settings/kmail.kcfg.cmake:88
 #, kde-format
 msgid "Start minimized to tray"
-msgstr ""
+msgstr "Запускать в свёрнутом виде"
 
 #: configuredialog/configureappearancepage.cpp:893
-#, fuzzy, kde-format
-#| msgid "Show unread mail in system tray"
+#, kde-format
 msgid "Show unread email in Taskbar"
-msgstr "Показывать непрочитанное в системном лотке"
+msgstr "Показывать непрочитанное в списке задач"
 
 #: configuredialog/configureappearancepage.cpp:964
 #, kde-format
@@ -973,61 +977,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Создать метку невозможно. Метка с таким названием уже существует."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Главное"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Шаблоны"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Свои шаблоны"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Тема"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Кодировка"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Заголовки"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Вложения"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Автокоррекция"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Авторазмер изображений"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Подпись"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1036,13 +1040,13 @@
 "Автоматически вставлять выбранную подпись\n"
 "при начале написания письма"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Вставлять подпись над всем цитируемым текстом"
 
 # BUGME: there are thousands of RFCs, which one did you mean? --aspotashev
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1052,20 +1056,20 @@
 "(два минуса и пробел на отдельной строке)\n"
 "перед подписью"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 "При ответе не цитировать существующие в письме\n"
 "подписи собеседников"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Форматирование"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1075,7 +1079,7 @@
 "Если в окне письма имеется выделенный текст,\n"
 "то при ответе цитировать только выделенный текст."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1086,14 +1090,14 @@
 "текста, даже если строка появилась в результате автоматического переноса\n"
 "текста на новую строку."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 "Включить автоматический перенос строк длиннее\n"
 "указанного числа символов."
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
@@ -1101,7 +1105,7 @@
 "превышении которой строки будут автоматически переноситься."
 
 # BUGME: please add "plain text" to glossary ("простой текст" или "обычный текст"?) --aspotashev
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1113,7 +1117,7 @@
 "параметр выключен, то по умолчанию письмо будет\n"
 "цитировано как простой текст."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1125,34 +1129,34 @@
 "подчёркнутый и полужирный текст, списки и внешние\n"
 "ссылки."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "В тексте нового письма"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Как вложение"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Задаёт формат по умолчанию для пересылаемых писем"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Тип пересылки по умолчанию:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Получатели"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1164,19 +1168,19 @@
 "Для отдельных писем можно изменить этот параметр, используя пункт меню "
 "«Параметры» -> «Запросить уведомление об обработке» в редакторе писем."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Предупреждение о превышении лимита количества получателей"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr ""
 "Максимальное число получателей, при превышении которого будет показано "
 "предупреждение"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1194,7 +1198,7 @@
 "Однако следует отметить, что параметр не распространяется\n"
 "на списки распространения и списки рассылки."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1203,18 +1207,18 @@
 "Запоминать введённые ранее адреса получателей\n"
 "и предлагать их для автодополнения."
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Не запоминать"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Число последних адресов для запоминания:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1223,23 +1227,23 @@
 "Максимальное число последних введённых адресов электронной\n"
 "почты, которые будут запомнены и предложены для автодополнения."
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Настроить автодополнение..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Автосохранение"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Без автосохранения"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1249,18 +1253,18 @@
 msgstr[2] " минут"
 msgstr[3] " минута"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Автоматически сохранять письмо с указанной периодичностью"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Префиксы &заголовка ответа"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1269,59 +1273,59 @@
 "Распознавать комбинации следующих префиксов\n"
 "(регулярные выражения без учёта регистра):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Добавить..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Удалить"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Из&менить..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Введите новый префикс ответа:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Префиксы заголовка &пересылаемого письма"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Добавить..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Удалит&ь"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Изменить..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Введите новый префикс пересылки:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1332,88 +1336,88 @@
 "элемента в списке)."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Изменить..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Введите новую кодировку:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "С&охранять кодировку письма при ответе или пересылке, если это возможно."
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Эта кодировка не поддерживается."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Указать свой &суффикс в Message-Id"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "С&уффикс в Message-Id"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Пользовательские теги заголовков MIME:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Поле"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Значение"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Добавить поле"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Поле:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Значение:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr "Строка «Content-Type» не разрешена. Заголовок не будет сохранён."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Недопустимый заголовок"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Имена вложений, совместимые с Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1422,38 +1426,38 @@
 "Включите этот режим, чтобы Outlook(TM) понимал имена вложений, содержащих "
 "кириллические символы"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Включить определение забытых вложений"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Любое из следующих слов свидетельствует о наличии вложения:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Введите новое ключевое слово:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Максимальный размер вложения:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " КБ"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Без ограничений"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1506,10 +1510,9 @@
 msgstr "Модули редактирования писем"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:202
-#, fuzzy, kde-format
-#| msgid "Check Before Send Plugins"
+#, kde-format
 msgid "Grammar Checker Plugins"
-msgstr "Модули проверки перед отправкой"
+msgstr "Модули проверки грамматики"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:212
 #, kde-format
@@ -1537,14 +1540,15 @@
 msgstr "Модули стилей заголовков"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
-#, kde-format
-msgid "Convertor Text Plugins"
+#, fuzzy, kde-format
+#| msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Модули преобразования текста"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
 msgid "Misc"
-msgstr ""
+msgstr "Прочие"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:279
 #, kde-format
@@ -1655,7 +1659,7 @@
 msgid "Archive Folder"
 msgstr "Архивирование папки"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1722,7 +1726,7 @@
 msgid "Notification"
 msgstr "Уведомление"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1731,12 +1735,12 @@
 msgstr[2] "%1 вложений (%2)"
 msgstr[3] "%1 вложение (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Скрыть список вложений."
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Показать список вложений."
@@ -1753,334 +1757,333 @@
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Выберите словарь для проверки правописания в письме"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Выберите папку для отправленных писем, где будет сохранена копия письма"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Выберите учётную запись для отправки этого письма"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Укажите адрес электронной почты в поле «Отправитель:»"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Укажите тему письма"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "Проф&иль:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Словарь:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "&Папка отправленной почты:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Метод отправки:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Отправитель:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Тема:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Отправить письмо"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "О&тправить через"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Отправить"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Отправить &позже"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Отправить поз&же через"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "В очередь"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Со&хранить как черновик"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Сохранить в папке для черновиков"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Сохранить как &шаблон"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Сохранить в папке шаблонов"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Сохранить как файл"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Сохранить почтовое сообщение в текстовом формате или в HTML"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Вставить текстовый &файл..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Последние вставленные файлы"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Адресная книга"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Открыть адресную книгу"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Новое окно редактора"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "&Выбрать получателей..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "&Сохранить список распространения..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "В&ставить как вложение"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Убрать пр&обелы"
 
 # BUGME: моноширинный? --aspotashev
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Мо&ноширинный шрифт"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Срочное письмо"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Запросить &уведомление об обработке"
 
-#: editor/kmcomposerwin.cpp:1172
-#, fuzzy, kde-format
-#| msgid "&Request Disposition Notification"
+#: editor/kmcomposerwin.cpp:1234
+#, kde-format
 msgid "&Request Delivery Confirmation"
-msgstr "Запросить &уведомление об обработке"
+msgstr "Запросить уведомление о &доставке"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Динамический перенос строк"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Фразы"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Автоматическая проверка орфографии"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Редактирование с форматированием"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Текст с форматированием"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Включить режим редактирования с форматированием"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Все поля"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "Проф&иль"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Словарь"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Папка о&тправленной почты"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Метод отправки"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Отправитель"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Тема"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Добавить &подпись"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Добавить подпись &до курсора"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Вставить подпись в текущей по&зиции"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "П&роверка орфографии..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Программа проверки орфографии"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Зашифровать письмо"
 
 # "Зашифровать"? --aspotashev
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Шифрование"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Подписать письмо"
 
 # "Подписать"? --aspotashev
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Подпись"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Формат шифрования/подписи"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Выберите метод шифрования для писем"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Добавить напоминание для поддержания разговора..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Настроить KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2089,53 +2092,53 @@
 "<qt>Это действие полностью скроет меню. Чтобы снова вывести его, нажмите %1."
 "</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Скрытие строки меню"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Строка: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Позиция %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ЗАМ"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "ВСТ"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Проверка орфографии включена"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Проверка орфографии выключена"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Пересо&хранить как шаблон"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Сохранить как &черновик"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2143,7 +2146,7 @@
 msgstr ""
 "Сохранить в папке шаблонов. Это письмо может быть использовано позднее."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2152,59 +2155,59 @@
 "Сохранить в папке черновиков. Это письмо можно изменить в любое время и "
 "отправить позднее."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Сохранить письмо как черновик или удалить его?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Закрыть окно редактора"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Ошибка автосохранения"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Ошибка отправки письма"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Вставка содержимого текстового файла"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Добавить как встроенное &изображение"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Вставить как &вложение"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Имя вложения:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid header"
 msgid "Invalid Attachment Name"
 msgstr "Недопустимый заголовок"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2213,7 +2216,7 @@
 msgstr[2] "Вставить ссылки в текст письма"
 msgstr[3] "Вставить ссылку в текст письма"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2222,17 +2225,17 @@
 msgstr[2] "Вставить файлы как &вложение"
 msgstr[3] "Вставить файл как &вложение"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Вставить содержимое буфера обмена как вложение"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "без имени"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2243,12 +2246,12 @@
 "<qt><p>В текущем профиле нет ключей для шифрования писем (OpenPGP или S/"
 "MIME).</p><p>Выберите ключи в диалоге настройки профиля.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Не указан ключ шифрования"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2259,12 +2262,12 @@
 "подписывания писем.</p><p>Указать используемый ключ можно в конфигурации "
 "профиля.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Не указан ключ подписи"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2275,7 +2278,7 @@
 "можно указать адрес отправителя во всех профилях, чтобы не вводить его "
 "вручную при составлении каждого письма."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2284,37 +2287,37 @@
 "Необходимо указать хотя бы одного получателя в поле «Получатель», «Копия» "
 "или «Скрытая копия»."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Не указан основной получатель. Отправить письмо, несмотря на это?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Не указан получатель"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Не указана тема. Отправить письмо без темы?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Тема не указана"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Отправить &как есть"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Указать тему"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2323,22 +2326,22 @@
 "Необходимо указать хотя бы одного получателя, чтобы была возможность "
 "зашифровать черновик."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Письмо готово к отправке..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Отправить подтверждение"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Отправить &немедленно"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2347,44 +2350,44 @@
 "Попытка отправить письмо более, чем %1 получателям.\n"
 " Отправить как есть?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Слишком много получателей"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Отправить &как есть"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Изменить получателей"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "Выключение HTML приведёт к потере форматирования текста. Продолжить?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Выключение форматирования HTML"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Удалить форматирование"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Добавить разметку обычного текста"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2394,7 +2397,7 @@
 "безопасности (полное доверие к ключу шифрования). Нажмите на значок для "
 "просмотра подробных сведений."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2404,7 +2407,7 @@
 "безопасности (частичное доверие к ключу шифрования). Нажмите на значок для "
 "просмотра подробных сведений."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2414,7 +2417,7 @@
 "безопасности (нет доверия к ключу шифрования). Нажмите на значок для "
 "просмотра подробных сведений."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2425,7 +2428,7 @@
 "шифрования неизвестен (ключ шифрования не может быть проверен). Нажмите на "
 "значок для просмотра подробных сведений."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Сведения редактора модулей"
@@ -2504,7 +2507,7 @@
 msgid "External editor was started."
 msgstr "Был запущен внешний редактор."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2512,20 +2515,20 @@
 msgstr ""
 "Не найден метод отправки. Убедитесь, что метод отправки указан правильно."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Не указана папка для отправленной почты. Необходимо указать её перед "
 "отправкой почты."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Не найден профиль. Убедитесь, что профиль указан правильно."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2552,11 +2555,6 @@
 msgid "Message will not be encrypted"
 msgstr "Письмо не будет зашифровано"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Фразы"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2601,28 +2599,28 @@
 msgid "Cannot move messages."
 msgstr "Не удалось переместить письма."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Не удалось получить содержимое папки. Сообщение о ошибке: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Не удалось определить родительскую папку."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 "Не удалось получить содержимое родительской папки. Сообщение о ошибке: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Не удалось получить список папок."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Сообщения перемещены в архив."
@@ -2663,48 +2661,48 @@
 msgid "&Existing identities:"
 msgstr "Су&ществующие профили:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "При создании пары ключей произошла ошибка: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Ошибка создания ключа"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Нет ключа"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Создать новую пару ключей"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Создание новой пары ключей..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Изменить профиль"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Главное"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Ваше имя:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2716,12 +2714,12 @@
 "поле пустым, в отправляемых письмах будет виден только адрес электронной "
 "почты.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Организация:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2732,12 +2730,12 @@
 "работаете, чтобы оно добавлялось в заголовки отправляемых писем.</p><p>Можно "
 "оставить это поле пустым.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Электронный адрес:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2752,12 +2750,12 @@
 "или добавьте дополнительные адреса в нижнее поле.</p><p>Если оставить это "
 "поле пустым или заполнить его неправильно, вам не смогут ответить.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "Допо&лнительные адреса:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2774,19 +2772,13 @@
 "org<br>last@example.org</td></tr></table><p>Каждый адрес-псевдоним следует "
 "записывать в отдельной строчке.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Криптография"
 
-#: identity/identitydialog.cpp:392
-#, fuzzy, kde-format
-#| msgid ""
-#| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
-#| "messages. You can also use GnuPG keys.</p><p>You can leave this blank, "
-#| "but KMail will not be able to digitally sign emails using OpenPGP; normal "
-#| "mail functions will not be affected.</p><p>You can find out more about "
-#| "keys at <a>http://www.gnupg.org</a></p></qt>"
+#: identity/identitydialog.cpp:391
+#, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
 "messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
@@ -2797,23 +2789,16 @@
 "<qt><p>Ключ OpenPGP будет использован для подписывания писем. Можно также "
 "использовать ключи GnuPG.</p><p>Если оставить это поле пустым, то можно "
 "будет отправлять обычную почту, для которой не требуется шифрование.</"
-"p><p>Подробнее о ключах можно прочитать на <a>http://www.gnupg.org</a></p></"
+"p><p>Подробнее о ключах можно прочитать на <a>https://www.gnupg.org</a></p></"
 "qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Ключ подписи OpenPGP:"
 
-#: identity/identitydialog.cpp:409
-#, fuzzy, kde-format
-#| msgid ""
-#| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
-#| "to yourself and for the \"Attach My Public Key\" feature in the composer. "
-#| "You can also use GnuPG keys.</p><p>You can leave this blank, but KMail "
-#| "will not be able to encrypt copies of outgoing messages to you using "
-#| "OpenPGP; normal mail functions will not be affected.</p><p>You can find "
-#| "out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+#: identity/identitydialog.cpp:408
+#, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
 "yourself and for the \"Attach My Public Key\" feature in the composer. You "
@@ -2826,14 +2811,14 @@
 "«Добавить открытый ключ» в редакторе. Можно также использовать ключи GnuPG.</"
 "p><p>Если оставить это поле пустым, то можно будет отправлять обычную почту, "
 "для которой не требуется шифрование.</p><p>Подробнее о ключах можно "
-"прочитать на <a>http://www.gnupg.org</a></p></qt>"
+"прочитать на <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Ключ шифрования OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2845,12 +2830,12 @@
 "p><p>Если оставить это поле пустым, то можно будет отправлять обычную почту, "
 "для которой не требуется шифрование.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Сертификат подписи S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2864,39 +2849,39 @@
 "пустым, то можно будет отправлять обычную почту, для которой не требуется "
 "шифрование.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Сертификат шифрования S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Предпочитаемый формат шифрования:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Автоматически подписывать письма"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Автоматически шифровать письма, если возможно"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Адрес &для ответа:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2914,12 +2899,12 @@
 "<p>Оставьте это поле пустым, если в данном действии нет необходимости.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&Адреса для копии:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2936,12 +2921,12 @@
 "вводите их через запятую.</p><p>Оставьте данное поле пустым, если не уверены "
 "в необходимости этих копий.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Адрес скрытой копии:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2958,57 +2943,57 @@
 "другим вашим адресам.</p><p>Оставьте данное поле пустым, если не уверены в "
 "необходимости этих копий.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Словарь:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Папка для отправленных:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Папка &черновиков:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Папка &шаблонов:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Учётная запись для исходящей почты:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Вкладывать электронную визитку в письма"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Создать..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Язык для автокоррекции:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Восстановить имя домена по умолчанию"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Имя &домена по умолчанию:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -3017,33 +3002,33 @@
 "<qt><p>Имя домена по умолчанию будет использовано для дополнения адреса e-"
 "mail, содержащего только имя пользователя.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Другие шаблоны писем для этого профиля"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Подпись"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Картинка"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Неверный дополнительный адрес «%1»"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Неверный электронный адрес"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3056,7 +3041,7 @@
 "Это может вызвать появление предупреждений у получателей при попытке "
 "проверки подписи."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3065,7 +3050,7 @@
 "Один из настроенных ключей OpenPGP для подписи не содержит идентификатор "
 "пользователя с адресом электронной почты для этого профиля (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3078,7 +3063,7 @@
 "Это может вызвать появление предупреждений у получателей при попытке "
 "проверки подписи."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3087,22 +3072,22 @@
 "Один из настроенных сертификатов S/MIME для подписи не содержит адреса "
 "электронной почты для этого профиля (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Адрес E-mail не найден в ключе/сертификате"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Недействительный файл подписи"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Профиль «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3111,7 +3096,7 @@
 "Некоторые пользовательские папки для профиля не существуют. Будут "
 "использованы папки по умолчанию."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Изменить..."
@@ -3142,6 +3127,19 @@
 msgid "We cannot delete vCard file."
 msgstr "Не получилось удалить файл vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Отправить подтверждение"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3294,18 +3292,15 @@
 msgstr "Укажите строку X-Face."
 
 #: identity/xfaceconfigurator.cpp:166
-#, fuzzy, kde-format
-#| msgid ""
-#| "Examples are available at <a href=\"http://ace.home.xs4all.nl/X-Faces/"
-#| "\">http://ace.home.xs4all.nl/X-Faces/</a>."
+#, kde-format
 msgid ""
 "Examples are available at <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
-"Примеры можно посмотреть на <a href=\"http://ace.home.xs4all.nl/X-Faces/"
-"\">http://ace.home.xs4all.nl/X-Faces/</a>."
+"Примеры можно посмотреть на <a href=\"https://ace.home.xs4all.nl/X-Faces/"
+"\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Изображение"
@@ -3340,7 +3335,7 @@
 msgstr[2] "Списки распространения %2 пусты, использовать их нельзя."
 msgstr[3] "Список распространения %2 пуст, использовать его нельзя."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Добавить в адресную книгу"
@@ -3350,22 +3345,22 @@
 msgid "Contact created successfully"
 msgstr "Запись контакта успешно создана"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Не удалось сохранить запись контакта: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Ошибка сохранения записи контакта"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Вложить всю папку «%1»?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Вложение папки"
@@ -3579,14 +3574,14 @@
 msgstr "П&апка"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Применить фильтры к папке"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3612,7 +3607,7 @@
 msgstr "&Переслать"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Применить &фильтр"
@@ -3637,7 +3632,7 @@
 msgstr "&Справка"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Основная панель инструментов"
@@ -3694,12 +3689,12 @@
 msgid "The file does not contain a message."
 msgstr "Файл не содержит письма."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Этот файл содержит несколько писем. Показано только первое."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3708,32 +3703,32 @@
 "Переслать выбранные письма как вложения в одном письме (как вложение MIME) "
 "или как отдельные письма?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Как вложение"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "В тексте"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Фильтрация писем"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Фильтрация письма %1 из %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Перемещение писем"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Удаление писем"
@@ -3762,27 +3757,27 @@
 msgid "Text Direction Toolbar"
 msgstr "Панель направления текста"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail переключен в автономный режим. Все сетевые операции отключены."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Отправить письмо"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Невозможно отправить письмо"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail переключен в режим работы в сети. Все сетевые операции доступны"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3791,42 +3786,42 @@
 "KMail переключен в режим работы в сети. Все сетевые операции станут "
 "доступны, когда будет обнаружено подключение к сети"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 "KMail работает в автономном режиме. Переключиться на работу в сети или "
 "остаться в автономном режиме?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "В сети/Автономный"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Работать в сети"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Работать автономно"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "Обнаружено подключение к сети, выполнение всех сетевых заданий возобновлено"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Подключение по сети не обнаружено, выполнение всех сетевых заданий "
 "приостановлено"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3835,12 +3830,12 @@
 "Не удалось открыть файл автосохранения на %1.\n"
 "Причина: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Не удалось открыть файл автосохранения"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3854,7 +3849,7 @@
 msgstr[3] ""
 "%1 профиль был изменён для использования метода отправки по умолчанию:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3869,43 +3864,46 @@
 msgstr[3] ""
 "%1 профиль был изменён для использования модифицированного метода отправки:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Отправка писем"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Запуск процесса отправки..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Источник данных %1 повреждён."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Агент архивирования почты не был зарегистрирован."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Агент отложенной отправки не был зарегистрирован."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Агент напоминаний для поддержания разговора не зарегистрирован."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3914,12 +3912,12 @@
 "Не удалось запустить программу управления сертификатами. Проверьте "
 "правильность установки программы Kleopatra."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Ошибка KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3928,26 +3926,26 @@
 "Не удалось запустить мастер импорта. Проверьте правильность установки "
 "программы ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Не удалось запустить мастер импорта"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Запустить программу «Экспорт данных PIM» не удалось. Проверьте правильность "
 "установки."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Ошибка запуска программы «Экспорт данных PIM»"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3956,97 +3954,97 @@
 "Не удалось запустить ImportWizard. Проверьте правильность установки этой "
 "программы."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Не удалось запустить мастер импорта"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "В системе обнаружен другой почтовый агент. Импортировать из него данные?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Не удалось запустить мастер импорта. Проверьте правильность установки "
 "программы."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Нет темы"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(нет шаблонов)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "В этой папке не заданы параметры устаревания писем"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Освободить от устаревших писем папку <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Освободить папку от устаревших писем"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Освободить от &устаревших"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Очистить корзину"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Удалить в корзину"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Очистить корзину?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr "<qt>Удалить письма из папки <b>%1</b> в корзину?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Все письма удалены в корзину"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Удалить все устаревшие письма?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Освободить от устаревших писем?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Освободить от устаревших"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4057,17 +4055,17 @@
 "для спама и увеличивает вероятность того, что система будет подвержена "
 "существующим и будущим опасностям."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Предупреждение системы безопасности"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Загружать внешние ресурсы"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4088,535 +4086,531 @@
 "<qt>Удалить %1 выбранное письмо?<br />Удалённые письма не могут быть "
 "восстановлены.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Удаление писем"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Удаление письма"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Перемещение писем..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Удаление писем..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Удаление писем завершено."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Перемещение писем завершено."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Не удалось удалить письма."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Удаление писем отменено."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Не удалось выполнить перемещение писем."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Перемещение писем отменено."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Выбор папки для перемещения"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Копирование писем..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Копирование писем завершено."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Не удалось выполнить копирование писем."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Копирование писем отменено."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Выбор папки для копирования"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Удаление писем в корзину..."
 
-#: kmmainwidget.cpp:1876
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash..."
+#: kmmainwidget.cpp:1883
+#, kde-format
 msgid "Deleting and moving messages to trash..."
-msgstr "Удаление писем в корзину..."
+msgstr "Удаление и перемещение писем в корзину..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Удаление писем в корзину завершено."
 
-#: kmmainwidget.cpp:1896
-#, fuzzy, kde-format
-#| msgid "Messages moved to trash successfully."
+#: kmmainwidget.cpp:1903
+#, kde-format
 msgid "Messages moved to trash or deleted successfully"
-msgstr "Удаление писем в корзину завершено."
+msgstr "Удаление или перемещение писем в корзину завершено."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Не удалось выполнить удаление писем в корзину."
 
-#: kmmainwidget.cpp:1909
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash failed."
+#: kmmainwidget.cpp:1916
+#, kde-format
 msgid "Deleting or moving messages to trash failed."
-msgstr "Не удалось выполнить удаление писем в корзину."
+msgstr "Не удалось выполнить удаление или перемещение писем в корзину."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Удаление писем в корзину отменено."
 
-#: kmmainwidget.cpp:1922
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash canceled."
+#: kmmainwidget.cpp:1929
+#, kde-format
 msgid "Deleting or moving messages to trash canceled."
-msgstr "Удаление писем в корзину отменено."
+msgstr "Удаление или перемещение писем в корзину отменено."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Переход в папку"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Сохранить &как..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Освободить все папки от &устаревших писем"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Проверить &почту"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Проверить почту в ящике"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Проверить почту"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Отправить &из очереди"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Режим работы в сети (нет данных)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Отправить из очереди"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Управление сертификатами"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Импорт писем..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Отладка Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Просмотр &журнала фильтрации..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "Импо&рт из другого почтового клиента..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Установить ответ об отсутствии..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Настроить автоматическое &архивирование..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Письма, ожидающие отправки..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Письма, оставшиеся без ответа..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Удалить"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "У&далить дискуссию в корзину"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Удалить дискуссию в корзину"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Уд&алить дискуссию"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Поиск писем..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Выделить &все письма"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "С&писки рассылки..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Привязать &комбинацию клавиш..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Удаление у&старевших писем"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Архивировать папку..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "&Загрузка внешних ссылок"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Копировать письмо в..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Переместить письмо в..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Нап&исать письмо..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Написать"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Новое письмо на базе &шаблона"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "О&тправить в список рассылки..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Создать фильтр"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Фильтровать по &теме..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Фильтровать по &отправителю..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Фильтровать по &получателю..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Фильтровать по адресу &копии..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Отметить &дискуссию"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Отметить дискуссию как &прочитанную"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Отметить все письма в дискуссии как прочитанные"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Отметить дискуссию как &непрочитанную"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Отметить все письма в дискуссии как непрочитанные"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Отметить дискуссию как &важную"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Снять отметку &важной дискуссии"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Отметить дискуссию как на &контроле"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Снять с &контроля"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Наблюдать &дискуссию"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Игнорировать дискуссию"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Сохранить все вложения..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Расшифровать и копировать в..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Применить все ф&ильтры"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Развернуть дискуссию / группу"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Развернуть текущую дискуссию или группу"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Свернуть дискуссию / группу"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Свернуть текущую дискуссию или группу"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Р&азвернуть все дискуссии"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Развернуть все дискуссии в текущей папке"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Св&ернуть все дискуссии"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Свернуть все дискуссии в текущей папке"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Показать &письмо"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Следующее &письмо"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Перейти к следующему письму"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Следующее &непрочитанное"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Следующее"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Перейти к следующему непрочитанному письму"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Предыдущее письмо"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Перейти к предыдущему письму"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Предыдущее н&епрочитанное"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Предыдущее"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Перейти к предыдущему непрочитанному письму"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Следующая непро&читанная папка"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Перейти в следующую папку с непрочитанными письмами"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "П&редыдущая непрочитанная папка"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Перейти в предыдущую папку с непрочитанными письмами"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Следующий непрочитанный &текст"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Перейти на следующий непрочитанный текст"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4625,224 +4619,228 @@
 "Пролистать письмо. При достижении конца письма перейти к следующему "
 "непрочитанному письму."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Настроить &фильтры..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "С&ценарии Sieve..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Добавить учётную запись..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Введение в KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Показать страницу приветствия KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Настроить &уведомления..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Настроить KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Удаление устаревших писем..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Добавить папку в список избранных..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Подписка на сервере..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Применить все фильтры"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Импорт или экспорт данных KMail..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Создать контакт в адресной книге..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Копирование письма — выбор папки"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Перейти в папку..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Отменить текущую операцию"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Перейти к следующей папке"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Перейти к предыдущей папке"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Выбор папки для перехода"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Перейти к первой папке"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Перейти к последней папке"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Перейти к следующему письму"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Перейти к предыдущему письму"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Выделить первое письмо"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Выделить последнее письмо"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Выбор письма для перехода"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Перевести фокус на поле быстрого поиска"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Добавить к выделению предыдущее письмо"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Добавить к выделению следующее письмо"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Перемещение письма — выбор папки"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Экономить сетевой трафик"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Отметить все письма как прочитанные в этой и всех вложенных папках"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Удалить дубликаты писем в этой и всех вложенных папках"
 
-#: kmmainwidget.cpp:3579
-#, fuzzy, kde-format
-#| msgid "&Settings"
+#: kmmainwidget.cpp:3586
+#, kde-format
 msgid "Account &Settings"
-msgstr "&Настройка"
+msgstr "Параметры &учётной записи"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Перезапустить учётную запись"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Добавить папку в список избранных"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "О&чистить корзину"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "У&далить все письма в корзину"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Удалить папку п&оиска"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Изменить параметры поиска..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "О&тменить действие"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "О&тменить %1"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Фильтр %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Поиск... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4853,12 +4851,12 @@
 "увеличивает вероятность того, что система будет подвержена существующим и "
 "будущим опасностям."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Обрабатывать HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4876,118 +4874,118 @@
 "параметрами таких папок, создать собственные папки или полностью отключить "
 "функционал объединения папок."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Использование объединённых папок"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Использовать объединённые папки"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Запуск программы..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "У&далить в корзину"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "В корзину"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Удалить письмо в корзину"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Не удалось копировать письмо. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Отправить письмо..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Ответить по адресу..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Переслать по адресу..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Добавить в существующий контакт"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Открыть в адресной книге"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Добавить в закладки"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Редактировать контакт..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Сохранить ссылку как..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Найти в письме..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Сохранить картинку на диск..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Показывать в формате HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Письма от этого контакта показывать в формате HTML"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Загружать внешние ресурсы для писем от этого контакта"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Отправить изображение..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4996,65 +4994,65 @@
 "KMail основан на структуре персонального информационного менеджера Akonadi, "
 "что стало причиной многих изменений."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push-уведомления о письмах (IMAP IDLE),"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Улучшенный поиск,"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Поддержка для добавления примечаний (аннотации) к письмам,"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Меньше зависаний графического интерфейса пользователя, проверка почты в "
 "фоновом режиме,"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Поддержка модулей,"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Новый механизм отрисовки HTML (QtWebEngine),"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Добавлена проверка на фишинговые ссылки."
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Почтовый клиент от KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Получение содержимого папки"
 
 # BUGME: should be "..." without spaces --aspotashev
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Подождите..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Автономный режим"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5063,7 +5061,7 @@
 "KMail работает в автономном режиме. Нажмите <a href=\"kmail:goOnline"
 "\">здесь</a>, чтобы перейти в сетевой режим.</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5072,22 +5070,22 @@
 "Работа с учетной записью производится в автономном режиме. Нажмите <a href="
 "\"kmail:goResourceOnline\">здесь</a>, чтобы перейти в сетевой режим.</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Запись контакта успешно изменена"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Новые письма в"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Нет непрочитанных писем"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5112,8 +5110,8 @@
 msgstr "© Tobias Koenig, 2004–2010"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5205,17 +5203,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Выберите модули для показа на странице дайджеста."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Дайджест KDE Kontact"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "© Tobias Koenig, 2004"
@@ -5261,28 +5259,27 @@
 msgid "All"
 msgstr "Всё"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Дайджест Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Страница дайджеста Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
-#, fuzzy, kde-format
-#| msgid "(c) 2003-2018 The Kontact developers"
+#: kontactplugin/summary/summaryview_plugin.cpp:122
+#, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
-msgstr "© Разработчики Kontact, 2003-2018"
+msgstr "© Разработчики Kontact, 2003-2019"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5309,7 +5306,7 @@
 msgid "&Reply"
 msgstr "&Ответить"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Ответить..."
@@ -5319,12 +5316,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Ответить &автору..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Ответить &всем..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Ответить в &список рассылки..."
@@ -5350,12 +5347,11 @@
 msgstr "Добавить примечание..."
 
 #: messageactions.cpp:132
-#, fuzzy, kde-format
-#| msgid "&Edit Message"
+#, kde-format
 msgid "&Edit As New"
-msgstr "&Редактировать письмо"
+msgstr "&Редактировать как новое"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5546,45 +5542,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Не удалось выполнить поиск по следующим причинам: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Поиск писем"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Поиск"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&В тексте нового письма..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Как вложение..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Сохранить все вложения..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Отменить выделение"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Перейти в исходную папку"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5593,68 +5589,68 @@
 msgstr[2] "%1 совпадений"
 msgstr[3] "%1 совпадение"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Последний поиск"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Выбрана недопустимая папка."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Не выбрано ни одной папки."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Не определено условие."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Все выбранные папки пусты или не проиндексированы."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Не добавлено ни одного условия."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Содержит условие присутствия подстроки короче 4 символов."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Поиск..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Не удалось получить результат поиска. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Не удалось выполнить поиск."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Поиск завершён."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Поиск остановлен."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5664,7 +5660,7 @@
 "Не удалось переименовать папку результатов поиска. Скорее всего папка "
 "результатов поиска с тем же именем уже существует. Сообщение об ошибке: «%1»"
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5673,7 +5669,7 @@
 msgstr[2] "Копировать %1 писем"
 msgstr[3] "Копировать письмо"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5682,7 +5678,7 @@
 msgstr[2] "Вырезать %1 писем"
 msgstr[3] "Вырезать письмо"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Проверка состояния индекса..."
@@ -5735,10 +5731,9 @@
 
 #. i18n: ectx: label, entry (ShowUnreadInTaskbar), group (General)
 #: settings/kmail.kcfg.cmake:92
-#, fuzzy, kde-format
-#| msgid "Show unread mail in system tray"
+#, kde-format
 msgid "Show Unread Email in TaskBar"
-msgstr "Показывать непрочитанное в системном лотке"
+msgstr "Показывать непрочитанное в списке задач"
 
 #. i18n: ectx: label, entry (ExternalEditor), group (General)
 #: settings/kmail.kcfg.cmake:96
@@ -5779,10 +5774,9 @@
 
 #. i18n: ectx: label, entry (DeleteMessageWithoutConfirmation), group (General)
 #: settings/kmail.kcfg.cmake:115
-#, fuzzy, kde-format
-#| msgid "Sending Without Confirmation"
+#, kde-format
 msgid "Delete messages without confirmation"
-msgstr "Отправлять без подтверждения"
+msgstr "Удалять без подтверждения"
 
 #. i18n: ectx: label, entry (StartSpecificFolderAtStartup), group (General)
 #: settings/kmail.kcfg.cmake:119
@@ -5817,7 +5811,7 @@
 "для внутреннего использования)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5825,7 +5819,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5833,26 +5827,26 @@
 msgstr "Показ начальной страницы KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Показать поле быстрого поиска по папке"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Пересылать в тексте нового письма по умолчанию."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Предупреждать, если число получателей превышает:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5863,19 +5857,19 @@
 "запрошено подтверждение отправки. Это предупреждение можно отключить."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Проверить орфографию перед отправкой"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Запрашивать уведомления об &обработке писем"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5890,13 +5884,13 @@
 "уведомление об обработке</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Интервал автосохранения:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5908,13 +5902,13 @@
 "отключает создание копий."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Показывать панель вставки фраз в окне редактора письма."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
@@ -5922,139 +5916,139 @@
 "зашифрованном виде"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Список последних использовавшихся адресов URL"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Список последних использовавшихся кодировок"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Показывать в редакторе индикатор подписи/шифрования"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Выбрано действие при нажатии комбинации клавиш отправки письма"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Размер диалога настройки профилей (для внутреннего использования)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Ширина диалога поиска (для внутреннего использования)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Высота диалога поиска (для внутреннего использования)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Ширина диалога настройки KMail (для внутреннего использования)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Высота диалога настройки KMail (для внутреннего использования)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Письмо"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Не показывать панель просмотра письма"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Показывать ниже списка писем"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Показывать справа от списка писем"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Список папок"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Длинная панель списка папок"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Короткая панель списка папок"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Шаблон нового письма"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Шаблон ответа отправителю"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Шаблон ответа всем"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Шаблон пересылаемого письма"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Символы цитирования"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Определяет политику при ее отображении"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6064,7 +6058,7 @@
 "внутреннего использования)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6074,7 +6068,7 @@
 "использования)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6084,7 +6078,7 @@
 "внутреннего использования)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6094,7 +6088,7 @@
 "внутреннего использования)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6104,7 +6098,7 @@
 "использования)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6374,7 +6368,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6410,7 +6404,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6436,7 +6430,7 @@
 "следующей папки.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\">Кроме того, при поиске "
-"предыдущего непрочитанного письма, поиск начнется с конца списка писем и "
+"предыдущего непрочитанного письма, поиск начнётся с конца списка писем и "
 "продолжится в предыдущей папке в зависимости от того, какая опция выбрана.</"
 "p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
@@ -6535,10 +6529,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mDeleteMessagesWithoutConfirmation)
 #: ui/miscpagemaintab.ui:180
-#, fuzzy, kde-format
-#| msgid "Sending Without Confirmation"
+#, kde-format
 msgid "Allow deleting messages without confirmation"
-msgstr "Отправлять без подтверждения"
+msgstr "Разрешить удаление без подтверждения"
 
 #. i18n: ectx: property (text), widget (QRadioButton, mChkbxAllFolders)
 #: ui/searchwindow.ui:17
@@ -6741,10 +6734,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Проверить почту в ящике"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7353,6 +7345,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Включить все отключённые предупреждения"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 # This message goes only in menu item Edit->"Undo %1" --aspotashev
 #: undostack.cpp:63
 #, kde-format
@@ -7410,10 +7412,17 @@
 msgstr[3] "На сервере включены ответы об отсутствии"
 
 #: widgets/zoomlabelwidget.cpp:35
-#, fuzzy, kde-format
-#| msgid "Zoom"
+#, kde-format
 msgid "Zoom: %1%"
-msgstr "Масштаб"
+msgstr "Масштаб: %1%"
+
+#~ msgid "Text Snippets"
+#~ msgstr "Фразы"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Проверить почту в ящике"
 
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Имя папки и размер квоты"
@@ -8858,9 +8867,6 @@
 #~ msgid "R&emove"
 #~ msgstr "&Удалить"
 
-#~ msgid "Restart"
-#~ msgstr "Перезапустить"
-
 #, fuzzy
 #~| msgid "New Message To..."
 #~ msgid "Message Delayed..."
diff -Nru kmail-19.04.3/po/ru/kmail-refresh-settings.po kmail-19.12.3/po/ru/kmail-refresh-settings.po
--- kmail-19.04.3/po/ru/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/ru/kmail-refresh-settings.po	2020-03-03 00:34:13.000000000 +0000
@@ -0,0 +1,106 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Alexander Yavorsky <kekcuha@gmail.com>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-07 21:06+0300\n"
+"Last-Translator: Alexander Yavorsky <kekcuha@gmail.com>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 19.04.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Александр Яворский"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kekcuha@gmail.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Помощник удаления неиспользуемых параметров настройки для KMail"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "© Laurent Montel <montel@kde.org>, 2019"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Автор"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Обновление настроек KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Предупреждение"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Очистка настроек"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Завершить"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Очистить"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Завершено удаление устаревшего раздела настроек «Подсказка дня»"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Завершено удаление параметров диалога в файле «%1»"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Завершено удаление параметров фильтров в файле «%1»"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Завершено удаление параметров папки в файле настроек «%1»"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Завершено удаление параметров размеров диалога в файле настроек «%1»"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr ""
+"Закройте и снова запустите приложения KMail и/или Kontact для продолжения "
+"работы."
diff -Nru kmail-19.04.3/po/ru/ktnef.po kmail-19.12.3/po/ru/ktnef.po
--- kmail-19.04.3/po/ru/ktnef.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/ru/ktnef.po	2020-03-03 00:34:13.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2017-02-05 22:49+0300\n"
 "Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
diff -Nru kmail-19.04.3/po/sk/akonadi_archivemail_agent.po kmail-19.12.3/po/sk/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/sk/akonadi_archivemail_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sk/akonadi_archivemail_agent.po	2020-03-03 00:34:14.000000000 +0000
@@ -1,18 +1,19 @@
 # translation of akonadi_archivemail_agent.po to Slovak
 # Roman Paholik <wizzardsk@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017.
+# Matej Mrenica <matejm98mthw@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
-"PO-Revision-Date: 2017-02-04 11:09+0100\n"
-"Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
-"Language-Team: Slovak <kde-sk@linux.sk>\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2019-07-17 16:14+0200\n"
+"Last-Translator: Matej Mrenica <matejm98mthw@gmail.com>\n"
+"Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.04.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: addarchivemaildialog.cpp:44
@@ -97,10 +98,9 @@
 msgstr "Archivovať e-maily automaticky."
 
 #: archivemailwidget.cpp:106
-#, fuzzy, kde-format
-#| msgid "Copyright (C) 2012-2017 Laurent Montel"
+#, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
-msgstr "Copyright (C) 2012-2017 Laurent Montel"
+msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
 #: archivemailwidget.cpp:107
 #, kde-format
@@ -176,12 +176,12 @@
 "Nemôžem pridať druhý archív do tohto priečinka. Namiesto toho zmením "
 "existujúci."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Adresár neexistuje. Prosím skontrolujte nastavenia. Archív odložený."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Spustiť na archiváciu %1"
diff -Nru kmail-19.04.3/po/sk/akonadi_followupreminder_agent.po kmail-19.12.3/po/sk/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/sk/akonadi_followupreminder_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sk/akonadi_followupreminder_agent.po	2020-03-03 00:34:14.000000000 +0000
@@ -1,114 +1,113 @@
 # translation of akonadi_followupreminder_agent.po to Slovak
 # Roman Paholik <wizzardsk@gmail.com>, 2014, 2015, 2016, 2017.
+# Matej Mrenica <matejm98mthw@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_followupreminder_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2017-08-02 21:42+0100\n"
-"Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
-"Language-Team: Slovak <kde-sk@linux.sk>\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
+"PO-Revision-Date: 2019-07-17 16:18+0200\n"
+"Last-Translator: Matej Mrenica <matejm98mthw@gmail.com>\n"
+"Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.04.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Agent sledovania mailov"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Pripomienkovač Follow Up"
 
-#: followupreminderinfoconfigwidget.cpp:47
-#, fuzzy, kde-format
-#| msgid "Copyright (C) 2014-2017 Laurent Montel"
+#: followupreminderinfoconfigwidget.cpp:42
+#, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
-msgstr "Copyright (C) 2014-2017 Laurent Montel"
+msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Správca"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Roman Paholík"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "wizzardsk@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Pre"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Predmet"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Termín"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Odpoveď"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Prijaté"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Pozdržané"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Zobraziť správu"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Vymazať"
 
-#: followupreminderinfowidget.cpp:228
-#, fuzzy, kde-format
-#| msgid "Do you want to remove selected item?"
+#: followupreminderinfowidget.cpp:227
+#, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
-msgstr[0] "Chcete odstrániť vybranú položku?"
-msgstr[1] "Chcete odstrániť vybranú položku?"
-msgstr[2] "Chcete odstrániť vybranú položku?"
+msgstr[0] "Chcete odstrániť túto vybranú položku?"
+msgstr[1] "Chcete odstrániť tieto %1 vybrané položky?"
+msgstr[2] "Chcete odstrániť týchto %1 vybraných položiek?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Prijatá odpoveď od %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Stále čakáte odpoveď o tomto maile:"
diff -Nru kmail-19.04.3/po/sk/akonadi_mailfilter_agent.po kmail-19.12.3/po/sk/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/sk/akonadi_mailfilter_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sk/akonadi_mailfilter_agent.po	2020-03-03 00:34:14.000000000 +0000
@@ -1,18 +1,19 @@
 # translation of akonadi_mailfilter_agent.po to Slovak
 # Roman Paholík <wizzardsk@gmail.com>, 2012, 2013, 2014.
+# Matej Mrenica <matejm98mthw@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2014-11-07 18:00+0100\n"
-"Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
-"Language-Team: Slovak <kde-sk@linux.sk>\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
+"PO-Revision-Date: 2019-07-17 16:21+0200\n"
+"Last-Translator: Matej Mrenica <matejm98mthw@gmail.com>\n"
+"Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 19.04.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: filterlogdialog.cpp:67
@@ -20,17 +21,17 @@
 msgid "Filter Log Viewer"
 msgstr "Prehliadač záznamu filtrov"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
-msgstr ""
+msgstr "Zdieľať..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Zaznamenávať aktivity filtra"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -40,23 +41,23 @@
 "Samozrejme, dáta o aktivite sa samozrejme ukladajú a zobrazujú, iba ak je "
 "táto voľba zapnutá. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Detaily záznamu"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Popis vzoru záznamu"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Zaznamenávať vyhodnotenie &pravidiel filtrov"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -70,34 +71,34 @@
 "pravidlo; inak sa zaznamená iba výsledok použitia všetkých pravidiel jedného "
 "filtra."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Zaznamenávať vyhodnotenie vzorky filtrov"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Zaznamenávať akcie filtrov"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Obmedzenie veľkosti záznamu:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "bez obmedzenia"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -110,7 +111,7 @@
 "túto hranicu presiahne, najstaršie dáta sa zahodia, kým limit bude "
 "prekročený. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -119,63 +120,63 @@
 "Nepodarilo sa zapísať súbor %1:\n"
 "\"%2\" je detailný popis chyby."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Chyba KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtruje sa správa %1 z %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Chyba použitia mailového filtra presunu"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Chyba použitia mailového filtra mazania"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Chyba použitia modifikácií filtra správ"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Vyhodnocujem pravidlá filtra:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Pravidlá filtra sa zhodujú.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Začať filtrovanie na správe \"%1\" z \"%2\" na \"%3\" :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrujú sa správy"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Záznam filtra mailu povolený"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Pripravený"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrovanie v %1"
diff -Nru kmail-19.04.3/po/sk/akonadi_sendlater_agent.po kmail-19.12.3/po/sk/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/sk/akonadi_sendlater_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sk/akonadi_sendlater_agent.po	2020-03-03 00:34:14.000000000 +0000
@@ -1,18 +1,19 @@
 # translation of akonadi_sendlater_agent.po to Slovak
 # Roman Paholik <wizzardsk@gmail.com>, 2013, 2014, 2015, 2016, 2017.
+# Matej Mrenica <matejm98mthw@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2017-02-04 11:10+0100\n"
-"Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
-"Language-Team: Slovak <kde-sk@linux.sk>\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
+"PO-Revision-Date: 2019-07-17 16:26+0200\n"
+"Last-Translator: Matej Mrenica <matejm98mthw@gmail.com>\n"
+"Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.04.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: sendlaterconfiguredialog.cpp:37
@@ -31,10 +32,9 @@
 msgstr "Agent na poslanie e-mailov neskôr."
 
 #: sendlaterconfiguredialog.cpp:61
-#, fuzzy, kde-format
-#| msgid "Copyright (C) 2013-2017 Laurent Montel"
+#, kde-format
 msgid "Copyright (C) 2013-2019 Laurent Montel"
-msgstr "Copyright (C) 2013-2017 Laurent Montel"
+msgstr "Copyright (C) 2013-2019 Laurent Montel"
 
 #: sendlaterconfiguredialog.cpp:63
 #, kde-format
@@ -58,57 +58,57 @@
 msgid "Your emails"
 msgstr "wizzardsk@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Pre"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Predmet"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Poslať okolo"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Opakované"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID správy"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Žiadna čakajúca správa..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Poslať teraz"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Vymazať"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Áno"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nie"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
@@ -116,67 +116,67 @@
 msgstr[1] "Chcete vymazať vybrané položky?"
 msgstr[2] "Chcete vymazať vybrané položky?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Odstrániť položky"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Chcete odstrániť aj správy?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Odstrániť správy"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Nenašla sa žiadna správa."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Nenašla sa žiadna správa."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Chyba počas naťahovania správy."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Nemôžem natiahnuť správu. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Nemôžeme vytvoriť prenos"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Správa nie je skutočná správa"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Nemôžem poslať správu."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Správa odoslaná"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Našla sa chyba. Chcete to preposlať?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Našla sa chyba"
diff -Nru kmail-19.04.3/po/sk/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/sk/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/sk/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sk/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:14.000000000 +0000
@@ -1,18 +1,19 @@
 # translation of akonadi_unifiedmailbox_agent.po to Slovak
 # Roman Paholík <wizzardsk@gmail.com>, 2018.
+# Matej Mrenica <matejm98mthw@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: akonadi_unifiedmailbox_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2018-09-22 20:37+0100\n"
-"Last-Translator: Roman Paholík <wizzardsk@gmail.com>\n"
-"Language-Team: Slovak <kde-sk@linux.sk>\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2019-07-17 16:30+0200\n"
+"Last-Translator: Matej Mrenica <matejm98mthw@gmail.com>\n"
+"Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.04.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: settingsdialog.cpp:63
@@ -50,38 +51,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Synchronizujem združený mailnox %1"
 
-#: unifiedmailboxeditor.cpp:96
-#, fuzzy, kde-format
-#| msgid "Unified Mailboxes"
+#: unifiedmailboxeditor.cpp:95
+#, kde-format
 msgid "Add an Unified MailBox"
-msgstr "Združené mailboxy"
+msgstr "Pridať Združený mailbox"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Názov:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Vybrať ikonu..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Inbox"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Odoslané"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Koncepty"
diff -Nru kmail-19.04.3/po/sk/kmail.po kmail-19.12.3/po/sk/kmail.po
--- kmail-19.04.3/po/sk/kmail.po	2019-07-09 00:20:27.000000000 +0000
+++ kmail-19.12.3/po/sk/kmail.po	2020-03-03 00:34:14.000000000 +0000
@@ -4,33 +4,35 @@
 # Richard Fric <Richard.Fric@kdemail.net>, 2006, 2007, 2009.
 # Jozef Riha <jose1711@gmail.com>, 2006, 2007.
 # Roman Paholík <wizzardsk@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017.
+# Matej Mrenica <matejm98mthw@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2017-08-02 21:39+0100\n"
-"Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
-"Language-Team: Slovak <kde-sk@linux.sk>\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-11-11 16:23+0100\n"
+"Last-Translator: Matej Mrenica <matejm98mthw@gmail.com>\n"
+"Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 19.08.3\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
-"Juraj Bednár,Stanislav Višňovský,Pavol Cvengroš,Jozef Říha,Roman Paholík"
+"Juraj Bednár,Stanislav Višňovský,Pavol Cvengroš,Jozef Říha,Roman Paholík, "
+"Matej Mrenica"
 
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""
 "juraj@bednar.sk,visnovsky@kde.org,orpheus@hq.alert.sk,jose1711@gmail.com,"
-"wizzardsk@gmail.com"
+"wizzardsk@gmail.com, matejm98mthw@gmail.com"
 
 #: about/introduction_kmail.html:5
 #, kde-format
@@ -47,11 +49,6 @@
 "Internetovými mailovými štandardmi vrátane IMAP, POP3 a SMTP."
 
 #: about/introduction_kmail.html:10
-#, fuzzy
-#| msgctxt "@info"
-#| msgid ""
-#| "KMail has many powerful features that are described in the <link "
-#| "url='help:/kmail2/index.html'>documentation</link>."
 msgid ""
 "KMail has many powerful features that are described in the <a href='help:/"
 "kmail2/index.html'>documentation</a>."
@@ -190,8 +187,8 @@
 msgstr "Viacnásobné šifrovacie kľúče pre adresu"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -202,10 +199,9 @@
 msgstr "KDE poštový klient"
 
 #: aboutdata.cpp:365
-#, fuzzy, kde-format
-#| msgid "Copyright © 1997–2017, KMail authors"
+#, kde-format
 msgid "Copyright © 1997–2019, KMail authors"
-msgstr "Copyright © 1997–2017, Autori KMail"
+msgstr "Copyright © 1997–2019, Autori KMail"
 
 #: collectionpage/collectionmailinglistpage.cpp:51
 #, kde-format
@@ -298,27 +294,27 @@
 "KMail nedokázal plne určiť mailovú konferenciu v tomto priečinku. Prosím, "
 "zadajte adresy ručne."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvóta"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Použitie:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Stav:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% plné"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 z %2 použité"
@@ -340,7 +336,7 @@
 "ktoré vyberú aktuálny priečinok.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Šablóny"
@@ -351,106 +347,106 @@
 msgstr "&Použiť vlastné šablóny pre správy v tomto priečinku"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "Kopírovať globálne šablóny"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Zobrazenie"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Použiť vlastné &ikony"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "Normálny:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "Neprečítané:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Zobraziť stĺpec Odosielateľ/Príjemca v zozname správ"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Zobraziť stĺpec:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Štandardné"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Odosielateľ"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Príjemca"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Zoznam správ"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Použiť štandardnú agregáciu"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Agregácia"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Použiť predvolenú tému"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Téma"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Predvolený formát správy"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Preferovať HTML pred textom"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Preferovať text pred HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Použiť globálne nastavenia"
@@ -460,103 +456,105 @@
 msgid "Retrieval Options"
 msgstr "Možnosti prijímania"
 
-#: configuredialog/configureaccountpage.cpp:68
-#, fuzzy, kde-format
-#| msgid "&Identity"
+#: configuredialog/configureaccountpage.cpp:69
+#, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
-msgstr "&Identita"
+msgstr "Identity"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Prijímanie"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Odosielanie"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
-msgstr ""
+msgstr "LDAP server"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Účty pre posielanie (zadajte aspoň jeden účet):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Obvyklé možnosti"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Potvrdiť pred poslaním"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Skontrolovať pravopis pred odoslaním"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nikdy automaticky"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Pri ručnej kontrole pošty"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Pri každej kontrole pošty"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Poslať teraz"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Poslať neskôr"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "&Poslať poštu z priečinku outbox:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Š&tandardná metóda posielania:"
 
-#: configuredialog/configureaccountpage.cpp:220
-#, fuzzy, kde-format
-#| msgid "&Add Account..."
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Povoliť vrátenie odoslania"
+
+#: configuredialog/configureaccountpage.cpp:241
+#, kde-format
 msgid "Add Mail Account..."
-msgstr "Pridať účet..."
+msgstr "Pridať mailový účet..."
 
-#: configuredialog/configureaccountpage.cpp:221
-#, fuzzy, kde-format
-#| msgid "Customize accounts order..."
+#: configuredialog/configureaccountpage.cpp:242
+#, kde-format
 msgid "Custom Account..."
-msgstr "Upraviť poradie účtov..."
+msgstr "Vlastný účet..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -564,30 +562,30 @@
 msgstr ""
 "Nemôžem spustiť správcu účtov. Prosím overte si inštaláciu AccountWizard."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Nie je možné spustiť sprievodcu účtami"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Zahrnúť do manuálnej kontroly pošty"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Ísť offline pri vypnutí KMailu"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Zistiť novú poštu pri spustení"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -596,9 +594,7 @@
 "správcu."
 
 #: configuredialog/configureappearancepage.cpp:94
-#, fuzzy, kde-format
-#| msgctxt "General options for the message list."
-#| msgid "General"
+#, kde-format
 msgid "General"
 msgstr "Všeobecné"
 
@@ -647,7 +643,7 @@
 msgid "Fixed Width Font"
 msgstr "Písmo s pevnou šírkou"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Editor správ"
@@ -730,7 +726,7 @@
 #: configuredialog/configureappearancepage.cpp:346
 #, kde-format
 msgid "&Do not change color from original HTML mail"
-msgstr ""
+msgstr "Nezmeniť farbu z originálu HTML mailu"
 
 #: configuredialog/configureappearancepage.cpp:361
 #, kde-format
@@ -902,11 +898,10 @@
 #: settings/kmail.kcfg.cmake:88
 #, kde-format
 msgid "Start minimized to tray"
-msgstr ""
+msgstr "Spustiť minimalizované v lište"
 
 #: configuredialog/configureappearancepage.cpp:893
-#, fuzzy, kde-format
-#| msgid "Show unread mail in system tray"
+#, kde-format
 msgid "Show unread email in Taskbar"
 msgstr "Zobraziť neprečítané správy v systémovej lište"
 
@@ -951,61 +946,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Nemôžeme vytvoriť značku. Značka s rovnakým názvom už existuje."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Všeobecné"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Štandardné šablóny"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Vlastné šablóny"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Predmet"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Znaková sada"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Hlavičky"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Prílohy"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Automatické opravy"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Automaticky zmeniť veľkosť obrázku"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Podpis"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1014,12 +1009,12 @@
 "Automaticky vložiť nastavený podpis\n"
 "pri začatí písania správy"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Vložiť podpis nad citovaný text"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1028,18 +1023,18 @@
 "Vložiť oddeľovač podpisu vyhovujúci RFC\n"
 "(dve pomlčky a medzera na riadku) pred podpisom"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Pri odpovedaní, necitovať existujúci podpis"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Formát"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1050,7 +1045,7 @@
 "(namiesto celej správy) keď je\n"
 "označený text v okne správy."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1061,17 +1056,17 @@
 "textu, aj keď riadok bol vytvorený pridaním ďalšieho zalomenia riadku počas\n"
 "zalomenia textu."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Povoliť automatické zalamovanie textu na určenej šírke"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Nastaviť šírku textu pre automatické zalamovanie slov"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1082,7 +1077,7 @@
 "v pôvodnom formáte, v ktorom bola prijatá.\n"
 " Ak nie je označené, predvolene odpovedať ako čistý text."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1093,34 +1088,34 @@
 "Tučný, kurzíva a podčiarknutý text, zoznamy a externé\n"
 "referencie sú podporované."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "V riadku"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "&Ako prílohu"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Nastaviť predvolený formát preposlanej správy"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Predvolený typ preposlania:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Adresáti"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1131,17 +1126,17 @@
 "Môžete to vybrať pre jednotlivé správy pomocou \"Možnosti - Vyžadovať "
 "oznámenie a prijatí\""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Varovať ak je zadaných priveľa prijímateľov"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Nastaviť maximálny počet prijímateľov pre upozornenie"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1158,7 +1153,7 @@
 "Avšak, toto sa netýka distribučných zoznamov alebo\n"
 "mailing listov."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1167,18 +1162,18 @@
 "Zapamätať si posledné zadané adresy,\n"
 "a ponúknuť ich pre ukončenie príjemcov"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Neukladať"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Maximálny počet udržaných adries:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1187,24 +1182,23 @@
 "Maximálny počet nedávno zadaných adries, ktoré budú\n"
 "zapamätané pre ukončenie"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Nastaviť dopĺňanie..."
 
-#: configuredialog/configurecomposerpage.cpp:445
-#, fuzzy, kde-format
-#| msgid "No autosave"
+#: configuredialog/configurecomposerpage.cpp:447
+#, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
-msgstr "Bez automatického ukladania"
+msgstr "Automatické ukladanie"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Bez automatického ukladania"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1213,18 +1207,18 @@
 msgstr[1] " min"
 msgstr[2] " min"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Automaticky poslať správu v tomto určenom intervale"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Predpon&y predmetu pri odpovedi"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1233,59 +1227,59 @@
 "Rozoznávať nasledujúce predpony\n"
 "(bez ohľadu na veľkosť písmen regulárnych výrazov):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Pridať..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "O&dstrániť"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Upraviť..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Zadajte novú predponu pre odpoveď:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Pre&dpony predmetu pri poslaní ďalej"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Pridať..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Odst&rániť"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Upraviť..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Zadajte novú predponu pre preposielanie ďalej:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1295,90 +1289,89 @@
 "hľadá sa znaková sada, ktorá obsahuje všetky požadované znaky."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Upraviť..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Zadajte znakovú sadu:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Nechať pôvodnú znakovú sadu pri odpovedi alebo preposielaní ďalej (ak je to "
 "možné)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Táto znaková sada nie je podporovaná."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Použiť vlastnú príponu pre id správy"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Vlastná prípona pre &id správy:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definujte vlastné MIME hlavičky:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Názov"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Hodnota"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Nový"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Názov:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Hodnota:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
-msgstr ""
+msgstr "„Content-Type“ nie je povolený reťazec. Táto hlavička sa neuloží."
 
-#: configuredialog/configurecomposerpage.cpp:1084
-#, fuzzy, kde-format
-#| msgid "Invalid date"
+#: configuredialog/configurecomposerpage.cpp:1086
+#, kde-format
 msgid "Invalid header"
-msgstr "Neplatný dátum"
+msgstr "Neplatná hlavička"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Mená príloh kompatibilné s Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1387,40 +1380,40 @@
 "Zapnutím tejto voľby bude Outlook (tm) podporovať vaše mená príloh, ak "
 "obsahujú aj iné než anglické písmená"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "&Povoliť určenie chýbajúcich príloh"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Rozpoznať ľubovoľné z nasledujúcich kľúčových slov ako pokus o priloženie "
 "súboru:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Zadajte nové kľúčové slovo:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Maximálna veľkosť prílohy:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Bez obmedzenia"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1474,10 +1467,9 @@
 msgstr "Pluginy návrhára"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:202
-#, fuzzy, kde-format
-#| msgid "Check Before Send Plugins"
+#, kde-format
 msgid "Grammar Checker Plugins"
-msgstr "Skontrolovať pred poslaním pluginov"
+msgstr "Doplnky kontroly pravopisu"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:212
 #, kde-format
@@ -1505,15 +1497,14 @@
 msgstr "Pluginy štýlov hlavičky"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
-#, fuzzy, kde-format
-#| msgid "Composer Plugins"
-msgid "Convertor Text Plugins"
-msgstr "Pluginy návrhára"
+#, kde-format
+msgid "Text Conversion Plugins"
+msgstr "Pluginy prevodu textu"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
 msgid "Misc"
-msgstr ""
+msgstr "Rôzne"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:279
 #, kde-format
@@ -1622,7 +1613,7 @@
 msgid "Archive Folder"
 msgstr "Archivovať priečinok"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1688,7 +1679,7 @@
 msgid "Notification"
 msgstr "Upozornenie"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1696,12 +1687,12 @@
 msgstr[1] "%1 prílohy (%2)"
 msgstr[2] "%1 príloh (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Skryť zoznam príloh"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Zobraziť zoznam príloh"
@@ -1718,330 +1709,329 @@
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Vybrať slovník na použitie pri kontrole pravopisu tejto správy"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Vybrať priečinok odoslanej pošty kde sa uloží kópia tejto správy"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Vybrať odchádzajúci účet na použitie pre poslanie tejto správy"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Nastaviť \"From:\" e-mailovú adresu pre túto správu"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Nastaviť predmet pre túto správu"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Identita:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Slovník:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Priečinok pre odo&slanú poštu:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Prenos pošty:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Odosielateľ:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "P&redmet: "
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "Po&slať poštu"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Po&slať poštu cez"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Odoslať"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Po&slať neskôr"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Po&slať neskôr cez"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Fronta"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "U&ložiť ako návrh"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Uložiť e-mail v priečinku konceptov"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Uložiť ako ša&blónu"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Uložiť e-mail v priečinku šablón"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Uložiť ako súbor"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Uložiť e-mail ako text alebo html súbor"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "Vložiť textový súbor..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "Vložiť nedávny textový súbor"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Adresár"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Otvoriť adresár"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nový editor správ"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Vybrať ad&resátov..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Uložiť &distribučný zoznam..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Vložiť ako prílo&hu"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Odstrániť &medzery"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Použiť písmo s pe&vnou šírkou"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "Urgentná"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Požadovať potvrdenie o doručení"
 
-#: editor/kmcomposerwin.cpp:1172
-#, fuzzy, kde-format
-#| msgid "&Request Disposition Notification"
+#: editor/kmcomposerwin.cpp:1234
+#, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "&Požadovať potvrdenie o doručení"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Zalamovať stĺpce"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "Úryvky"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatická kontrola pravopisu"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Editovanie s formátovaním"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rich Text"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Prepnúť režim s formátovaním"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Všetky polia"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identita"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Slovník"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Priečinok pre odo&slanú poštu"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Prenos pošty"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Odosielateľ"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "P&redmet"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Pripojiť po&dpis"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Predradiť podpis"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Vložiť podpis na pozíciu k&urzora"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Pravopi&s..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Kontrola pravopisu"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Zašifrovať správu"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Šifrovanie"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Podpísať správu"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Podpis"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Šif&rovací formát ukladania"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Vybrať kryptografický formát pre túto správu"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Pridať pripomienku Followup..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Nastaviť KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2050,53 +2040,53 @@
 "<qt>Toto skryje panel ponuky úplne. Môžete ho zase zobraziť napísaním %1.</"
 "qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Skryť lištu ponuky"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Riadok: %1"
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Stĺpec: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Kontrola pravopisu: zapnutá"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Kontrola pravopisu: vypnutá"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Znova u&ložiť ako šablónu"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "U&ložiť ako návrh"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2104,7 +2094,7 @@
 msgstr ""
 "Znova uložiť túto správu v priečinku pre šablóny. Môže byť neskôr použitá."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2113,59 +2103,58 @@
 "Uložiť túto správu v priečinku rozpísaných správ. Môže byť neskôr upravená a "
 "odoslaná."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Chcete zahodiť správu alebo ju uložiť na neskôr?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Zavrieť editor"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Automatické uloženie správy zlyhalo"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Poslanie správy zlyhalo"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Vložiť súbor"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Pridať ako obrázok v riadku"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Pridať ako prílohu"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Meno prílohy:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
-msgstr ""
+msgstr "Názov prílohy nemôže byť prázdny"
 
-#: editor/kmcomposerwin.cpp:2110
-#, fuzzy, kde-format
-#| msgid "Invalid date"
+#: editor/kmcomposerwin.cpp:2179
+#, kde-format
 msgid "Invalid Attachment Name"
-msgstr "Neplatný dátum"
+msgstr "Neplatný názov prílohy"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2173,7 +2162,7 @@
 msgstr[1] "Pridať URL do správy"
 msgstr[2] "Pridať URL do správy"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2181,17 +2170,17 @@
 msgstr[1] "Pridať súboru ako prílohu"
 msgstr[2] "Pridať súboru ako prílohu"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Vložiť text schránky ako prílohu"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "bez mena"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2203,12 +2192,12 @@
 "definovať kľúč OpenPGP alebo S/MIME, ktorý sa má použiť pre túto identitu.</"
 "p><p>Tento kľúč môžete definovať v nastavení identity.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Nedefinovaný šifrovací kľúč"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2219,12 +2208,12 @@
 "OpenPGP alebo S/MIME, ktorý sa má použiť.</p><p>Tento kľúč môžete definovať "
 "v nastavení identity.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nedefinovaný podpisový kľúč"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2234,7 +2223,7 @@
 "Do poľa Od: musíte zadať e-mailovú adresu. Mali by ste nastaviť aj e-mailovú "
 "adresu pre všetky identity, aby ste adresu nemuseli zadávať pre každú správu."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2243,37 +2232,37 @@
 "Je nutné špecifikovať aspoň jedného príjemcu v poli Komu:, Kópia alebo Slepá "
 "kópia."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Pole Pre: je prázdne. Poslať správu aj napriek tomu?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Pre: nie je uvedené"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Neuviedli ste predmet. Naozaj poslať?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Bez predmetu"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Poslať &ako je"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "Zadať &predmet"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2282,22 +2271,22 @@
 "Je nutné špecifikovať aspoň jedného príjemcu aby bolo možné zašifrovať "
 "koncept."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Posielam e-mail..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Poslať potvrdenie"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Po&slať teraz"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2305,44 +2294,44 @@
 msgstr ""
 "Snažíte sa poslať správu pre viac ako %1 prijímateľov. Poslať správu aj tak?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Príliš veľa príjemcov"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Poslať ako je"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Upraviť ad&resátov"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "Vypnutie HTML režimu spôsobí stratu formátovania textu. Ste si istý?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Stratiť formátovanie?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Stratiť formátovanie"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Pridať značkovací čistý text"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2351,7 +2340,7 @@
 "Pre tohto príjemcu sa použije šifrovanie s vysokou bezpečnosťou (šifrovací "
 "kľúč je dôveryhodný). Kliknite na ikonu pre podrobnosti."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2360,7 +2349,7 @@
 "Pre tohto príjemcu sa použije šifrovanie so strednou bezpečnosťou (šifrovací "
 "kľúč je málo dôveryhodný). Kliknite na ikonu pre podrobnosti."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2369,7 +2358,7 @@
 "Pre tohto príjemcu sa použije šifrovanie s nízkou bezpečnosťou (šifrovací "
 "kľúč je nedôveryhodný). Kliknite na ikonu pre podrobnosti."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2379,11 +2368,10 @@
 "E-mail pre tohto príjemcu sa môže zašifrovať, ale bezpečnosť šifrovania je "
 "neznáma (šifrovací kľúč sa nedá overiť). Kliknite na ikonu pre podrobnosti."
 
-#: editor/kmcomposerwin.cpp:3636
-#, fuzzy, kde-format
-#| msgid "Sending Without Confirmation"
+#: editor/kmcomposerwin.cpp:3735
+#, kde-format
 msgid "Plugin Editor Information"
-msgstr "Poslať bez potvrdenia"
+msgstr "Informácie o editore doplnkov"
 
 #: editor/potentialphishingemail/potentialphishingdetaildialog.cpp:33
 #, kde-format
@@ -2457,39 +2445,36 @@
 msgid "External editor was started."
 msgstr "Externý editor bol spustený."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
+"Transport nebol nájdený. Prosím uistite sa, že používate správny poštový "
+"transport."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
-#, fuzzy, kde-format
-#| msgid "Archive folder not defined. Please verify settings for account %1"
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
-"Priečinok archívu nie je definovaný. Prosím skontrolujte nastavenia pre účet "
-"%1"
+"Priečinok Odoslané nie je definovaný. Prosím nastavte ho pred odosielaním "
+"pošty."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
-#, fuzzy, kde-format
-#| msgid "Archive folder not defined. Please verify settings for account %1"
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
+#, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
-"Priečinok archívu nie je definovaný. Prosím skontrolujte nastavenia pre účet "
-"%1"
+"Identita nebola nájdená. Prosím uistite sa, že používate správnu identitu."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
-#, fuzzy, kde-format
-#| msgid "Archive folder not defined. Please verify settings for account %1"
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
+#, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
 "dictionary."
 msgstr ""
-"Priečinok archívu nie je definovaný. Prosím skontrolujte nastavenia pre účet "
-"%1"
+"Slovník nebol nájdený. Prosím uistite sa, že používate správny slovník."
 
 #: editor/widgets/cryptostateindicatorwidget.cpp:93
 #, kde-format
@@ -2511,11 +2496,6 @@
 msgid "Message will not be encrypted"
 msgstr "Správa nebude kryptovaná"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Textové úryvky"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2563,27 +2543,27 @@
 msgid "Cannot move messages."
 msgstr "Nemôžem presunúť správy."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Nemôžem natiahnuť priečinok. Oznámená chyba: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Nebol vrátený žiadny priečinok."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Nemôžem natiahnuť nadradený priečinok. Oznámená chyba: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Nemôžem vrátiť zoznam priečinkov."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Správy archivované"
@@ -2624,48 +2604,48 @@
 msgid "&Existing identities:"
 msgstr "&Existujúce identity:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Chyba počas generovania nového páru: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Chyba generovania kľúča"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Žiadny kľúč"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Generujem nový pár kľúčov"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Generujem nový pár kľúčov..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Zmeniť identitu"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Všeobecné"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "Vaše me&no:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2676,12 +2656,12 @@
 "chcete, aby sa zobrazilo v hlavičke posielanej správy.</p><p>Ak toto pole "
 "nevyplníte, vaše skutočné meno sa nezobrazí, iba e-mailová adresa.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zácia:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2692,12 +2672,12 @@
 "organizácie, ak ho chcete zobraziť v hlavičke posielanej správy.</p><p>Je "
 "bezpečné (a normálne) toto nevyplniť.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-mailová adresa:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2712,12 +2692,12 @@
 "ďalší alias v poli dolu.</p><p>Ak ho nevyplníte alebo vyplníte nesprávne, "
 "ľudia vám nebudú môcť odpovedať.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "E-mailové aliasy:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2733,19 +2713,13 @@
 "org</td></tr><tr><th>Aliasy:</th><td>first@example.org<br>last@example.org</"
 "td></tr></table><p>Napíšte jeden alias na riadok.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Ši&frovanie"
 
-#: identity/identitydialog.cpp:392
-#, fuzzy, kde-format
-#| msgid ""
-#| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
-#| "messages. You can also use GnuPG keys.</p><p>You can leave this blank, "
-#| "but KMail will not be able to digitally sign emails using OpenPGP; normal "
-#| "mail functions will not be affected.</p><p>You can find out more about "
-#| "keys at <a>http://www.gnupg.org</a></p></qt>"
+#: identity/identitydialog.cpp:391
+#, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
 "messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
@@ -2753,26 +2727,19 @@
 "functions will not be affected.</p><p>You can find out more about keys at "
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
-"<qt><p>Kľúč OpenPGP, ktorý tu vyberiete, sa budete používať pre podpis správ "
-"posielaných sebe samému. Môžete použiť aj kľúče GnuPG.</p><p>Môžete toto "
-"pole nechať prázdne, ale potom KMail nedokáže digitálne podpisovať správy. "
-"Normálne poštové funkcie to neovplyvní.</p><p>Viac o kľúčoch nájdete na "
+"<qt><p>Kľúč OpenPGP, ktorý si vyberiete, sa použije na digitálne "
+"podpisovanie správ. Môžete tiež použiť kľúče GnuPG.</p><p>Môžete to nechať "
+"prázdne, ale KMail nebude môcť pomocou OpenPGP digitálne podpisovať e-maily; "
+"normálne poštové funkcie to neovplyvní.</p><p>Viac o kľúčoch nájdete na "
 "<a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP kľúč pre podpis:"
 
-#: identity/identitydialog.cpp:409
-#, fuzzy, kde-format
-#| msgid ""
-#| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
-#| "to yourself and for the \"Attach My Public Key\" feature in the composer. "
-#| "You can also use GnuPG keys.</p><p>You can leave this blank, but KMail "
-#| "will not be able to encrypt copies of outgoing messages to you using "
-#| "OpenPGP; normal mail functions will not be affected.</p><p>You can find "
-#| "out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+#: identity/identitydialog.cpp:408
+#, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
 "yourself and for the \"Attach My Public Key\" feature in the composer. You "
@@ -2783,17 +2750,17 @@
 msgstr ""
 "<qt><p>Kľúč OpenPGP, ktorý tu vyberiete, sa budete používať pre šifrovanie "
 "správ posielaných sebe samému a pre funkciu \"Priložiť môj verejný kľúč\". "
-"Môžete použiť aj kľúče GnuPG.</p><p>Môžete toto pole nechať prázdne, ale "
-"potom KMail nedokáže digitálne podpisovať správy. Normálne poštové funkcie "
-"to neovplyvní.</p><p>Viac o kľúčoch nájdete na <a>http://www.gnupg.org</a></"
-"p></qt>"
+"Môžete použiť aj kľúče GnuPG.</p><p>Môžete to nechať prázdne, ale KMail vám "
+"nebude môcť šifrovať kópie odchádzajúcich správ pomocou OpenPGP; normálne "
+"poštové funkcie to neovplyvní.</p><p>Viac o kľúčoch nájdete na <a>http://www."
+"gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP kľúč pre šifrovanie:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2805,12 +2772,12 @@
 "správ.</p><p>Môžete toto pole nechať prázdne, ale potom KMail nedokáže "
 "digitálne podpisovať správy. Normálne poštové funkcie to neovplyvní.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Certifikát S/MIME pre digitálny podpis:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2825,39 +2792,39 @@
 "nedokáže šifrovať odosielané správy pomocou S/MIME. Normálne poštové funkcie "
 "to neovplyvní.</p></qt>>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Certifikát S/MIME pre šifrovanie:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Uprednostňovaný formát:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Automaticky podpísať správy"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Automaticky šifrovať správy, ak je to možné"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Ad&resa pre odpoveď:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2874,12 +2841,12 @@
 "odosielateľa, ale aby odpovede šli na skupinovú adresu.</p><p>Ak neviete, "
 "nechajte toto pole prázdne.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&CC adresa:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2896,12 +2863,12 @@
 "CC prijímateľov.</p><p>Ak máte pochybnosti, nechajte toto pole prázdne.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC adresa:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2917,57 +2884,57 @@
 "kópie každej správy na vaše iné konto.</p><p>Ak to nepotrebujete, nechajte "
 "toto pole prázdne.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Slovník:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Priečinok pre &odoslané:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Priečinok pre &návrhy:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Priečinok pre ša&blóny:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Odchádzajúci účet:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Pridať moju vizitku do správy"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Vytvoriť..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Jazyk automatických opráv:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Obnoviť predvolený názov domény"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Š&tandardná doména:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2976,33 +2943,33 @@
 "<qt><p>Štandardná doména bude použitá pre dopĺňanie e-mailových adries ktoré "
 "pozostávaju len z mena používateľa.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Použiť vlastné šablóny pre správy pre túto identitu"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Podpis"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Obrázok"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Neplatný e-mailový alias \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Neplatná e-mailová adresa"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3015,7 +2982,7 @@
 "To môže spôsobiť varovania pre prijímateľov správy pri pokuse o overenie "
 "podpisu."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3024,7 +2991,7 @@
 "Jeden z nastavených šifrovacích kľúčov OpenPGP neobsahuje e-mailovú adresu "
 "nastavenú pre túto identitu (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3037,7 +3004,7 @@
 "To môže spôsobiť varovania pre prijímateľov správy pri pokuse o overenie "
 "podpisu."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3046,22 +3013,22 @@
 "Jeden z nastavených šifrovacích certifikátov S/MIME neobsahuje e-mailovú "
 "adresu nastavenú pre túto identitu (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-mailová adresa nenájdená v kľúčoch/certifikátoch"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Podpisový súbor je neplatný"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Zmeniť identitu \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3070,7 +3037,7 @@
 "Niektoré vlastné priečinky pre identity už neexistuje. Preto budú použité "
 "štandardné priečinky."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Upraviť..."
@@ -3101,6 +3068,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Nemôžeme vymazať súbor vCard."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Naozaj chcete zrušiť?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Potvrdenie"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3254,18 +3233,15 @@
 msgstr "Použite toto poľe pre zadanie ľovoľného reťazca X-Face."
 
 #: identity/xfaceconfigurator.cpp:166
-#, fuzzy, kde-format
-#| msgid ""
-#| "Examples are available at <a href=\"http://ace.home.xs4all.nl/X-Faces/"
-#| "\">http://ace.home.xs4all.nl/X-Faces/</a>."
+#, kde-format
 msgid ""
 "Examples are available at <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
-"Príklady sú dostupné na <a href=\"http://ace.home.xs4all.nl/X-Faces/"
-"\">http://ace.home.xs4all.nl/X-Faces/</a>."
+"Príklady sú dostupné na <a href=\"https://ace.home.xs4all.nl/X-Faces/"
+"\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Obrázok"
@@ -3299,7 +3275,7 @@
 msgstr[1] "Distribučný zoznamy %2 sú prázdne, nedajú sa použiť."
 msgstr[2] "Distribučný zoznamy %2 sú prázdne, nedajú sa použiť."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Pridať do adresára"
@@ -3309,22 +3285,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakty vytvorené úspešne"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kontakt nie je možné uložiť: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Zlyhalo uloženie kontaktu"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Naozaj chcete pripojiť tento priečinok \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Pripojiť priečinok"
@@ -3535,20 +3511,18 @@
 msgstr "P&riečinok"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
-#, fuzzy, kde-format
-#| msgid "Appl&y All Filters On Folder"
+#, kde-format
 msgid "Apply Filters on Folder"
-msgstr "&Použiť všetky filtre na priečinku"
+msgstr "Použiť filtre na priečinok"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
-#, fuzzy, kde-format
-#| msgid "Remove Duplicates in This Folder and All its Subfolder"
+#, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
-msgstr "Označiť duplicity v tomto priečinku a vo všetkých podpriečinkoch"
+msgstr "Použiť filtre na priečinok a všetky jeho podpriečinky"
 
 #. i18n: ectx: Menu (message)
 #. i18n: ectx: Menu (file)
@@ -3570,7 +3544,7 @@
 msgstr "P&oslať ďalej"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Použiť filter"
@@ -3595,7 +3569,7 @@
 msgstr "&Pomocník"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Hlavný panel nástrojov"
@@ -3641,22 +3615,21 @@
 msgstr "Otvoriť správu"
 
 #: kmcommands.cpp:733
-#, fuzzy, kde-format
-#| msgid "&Message"
+#, kde-format
 msgid "Message"
-msgstr "&Správa"
+msgstr "Správa"
 
 #: kmcommands.cpp:766
 #, kde-format
 msgid "The file does not contain a message."
 msgstr "Súbor neobsahuje správu."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Súbor obsahuje niekoľko správ. Zobrazí sa iba prvá z nich."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3665,32 +3638,32 @@
 "Chcete preposlať vybrané správy ako prílohy v jednej správe (ako mime "
 "zhrnutie) alebo ako jednotlivé správy?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Poslať ako zhrnutie"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Poslať jednotlivo"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrujú sa správy"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtruje sa správa %1 z %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Presun správ"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Odstraňovanie správ"
@@ -3719,29 +3692,27 @@
 msgid "Text Direction Toolbar"
 msgstr "Panel nástrojov smeru textu"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail je nastavený offline, všetky sieťové úlohy sú odložené"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
-#, fuzzy, kde-format
-#| msgid "&Send Mail"
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
+#, kde-format
 msgid "Send Email"
-msgstr "Po&slať poštu"
+msgstr "Poslať poštu"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
-#, fuzzy, kde-format
-#| msgid "About to send email..."
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
+#, kde-format
 msgid "Impossible to send email"
-msgstr "Posielam e-mail..."
+msgstr "Nemožné poslať email"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail je nastavený online, všetky sieťové úlohy sú obnovené"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3750,37 +3721,37 @@
 "KMail je nastavený online; všetky sieťové úlohy sa obnovia, keď sa zistí "
 "sieťové pripojenie"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail je aktuálne v offline móde. Ako chcete pokračovať?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Online/Offline"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Pracovať online"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Pracovať offline"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Zistené sieťové pripojenie, všetky sieťové úlohy sú obnovené"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Nezistené sieťové pripojenie, všetky sieťové úlohy sú odložené"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3789,12 +3760,12 @@
 "Zlyhalo otvorenie automaticky uloženého súboru na %1.\n"
 "Dôvod: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Otvorenie automaticky uloženého súboru zlyhalo"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3805,7 +3776,7 @@
 msgstr[2] ""
 "Týchto %1 identít bolo zmenených tak, aby používali štandardný prenos:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3815,43 +3786,47 @@
 msgstr[2] ""
 "Týchto %1 identít bolo zmenených tak, aby používali upravený prenos:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Posielam správy"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Iniciovanie procesu odoslania..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Zdroj %1 je poškodený."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Zdroj %1 je poškodený.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Archive Mail Agent nebol registrovaný."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Agent pre poslanie neskôr nebol registrovaný."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Agent pripomienkovača Followup nebol zaregistrovaný."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3859,12 +3834,12 @@
 msgstr ""
 "Nemôžem spustiť správcu certifikátov. Prosím overte si inštaláciu Kleopatry."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Chybová správa KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3873,26 +3848,25 @@
 "Nemôžem spustiť sprievodcu importom. Prosím overte si inštaláciu "
 "ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Nie je možné spustiť sprievodcu importom"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Nie je možné spustiť program \"Exportovač nastavenia PIM\". Prosím "
-"skontrolujte vašu inštaláciu."
+"Nepodarilo sa spustiť program „Export dát PIM“. Skontrolujte svojuinštaláciu."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Nie je možné spustiť program \"Exportovač nastavenia PIM\""
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Nie je možné spustiť program \"Export dát PIM\""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3901,67 +3875,67 @@
 "Nemôžem spustiť sprievodcu importom. Prosím overte si inštaláciu "
 "ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Nie je možné spustiť sprievodcu importom"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr "V systéme bol nájdený iný mailer. Chcete z neho importovať údaje?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Nemôžem spustiť sprievodcu importom. Prosím overte si inštaláciu."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Bez predmetu"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(žiadne šablóny)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Tento priečinok nemá nastavené žiadne možnosti pre zrušenie platnosti"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Naozaj chcete zrušiť platnosť tohto priečinka <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Zrušiť platnosť priečinku"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Zrušiť platnosť"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Vyprázdniť kôš"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Presunúť do koša"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Naozaj chcete vyprázdniť priečinok koša?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3969,27 +3943,27 @@
 msgstr ""
 "<qt>Naozaj chcete presunúť všetky správy z priečinku <b>%1</b> do koša?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Všetky správy presunuté do koša"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Naozaj chcete zrušiť platnosť všetkých starých správ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Zrušiť platnosť starých správ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Zrušiť platnosť"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4000,17 +3974,17 @@
 "\" a zvyšuje pravdepodobnosť, že Váš systém bude napadnutý z hľadiska "
 "bezpečnosti."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Bezpečnostné varovanie"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Načitať externé odkazy"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4028,536 +4002,531 @@
 "<qt>Naozaj chcete odstrániť %1 vybraných správ?<br />Keď budú odstránené, "
 "nie je možné ich už obnoviť.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Zmazať správy"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Zmazať správu"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Presun správ..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Odstraňovanie správ..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Správy úspešne zmazané."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Správy úspešne presunuté."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Zmazanie správ zlyhalo."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Zmazanie správ zrušené."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Presun správ zlyhal."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Presun správ zrušený."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Premiestniť správy do priečinka"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopírovanie správ..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Správy úspešne skopírované."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Kopírovanie správ zlyhalo."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopírovanie správ zrušené."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopírovať správy do priečinka"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Presúvam správy do koša..."
 
-#: kmmainwidget.cpp:1876
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash..."
+#: kmmainwidget.cpp:1883
+#, kde-format
 msgid "Deleting and moving messages to trash..."
-msgstr "Presúvam správy do koša..."
+msgstr "Mažem a presúvam správy do koša..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Správy úspešne presunuté do koša."
 
-#: kmmainwidget.cpp:1896
-#, fuzzy, kde-format
-#| msgid "Messages moved to trash successfully."
+#: kmmainwidget.cpp:1903
+#, kde-format
 msgid "Messages moved to trash or deleted successfully"
-msgstr "Správy úspešne presunuté do koša."
+msgstr "Správy úspešne presunuté do koša alebo vymazané"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Presúvanie správ do koša zlyhalo."
 
-#: kmmainwidget.cpp:1909
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash failed."
+#: kmmainwidget.cpp:1916
+#, kde-format
 msgid "Deleting or moving messages to trash failed."
-msgstr "Presúvanie správ do koša zlyhalo."
+msgstr "Presúvanie správ do koša alebo mazanie zlyhalo."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Presúvanie správ do koša zrušené."
 
-#: kmmainwidget.cpp:1922
-#, fuzzy, kde-format
-#| msgid "Moving messages to trash canceled."
+#: kmmainwidget.cpp:1929
+#, kde-format
 msgid "Deleting or moving messages to trash canceled."
-msgstr "Presúvanie správ do koša zrušené."
+msgstr "Presúvanie správ do koša alebo mazanie zrušené."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Preskočiť do priečinku"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Uložiť &ako..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Zrušiť &platnosť vo všetkých priečinkoch"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "S&kontrolovať poštu"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Skontrolovať poštu v"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
-msgstr "S&kontrolovať poštu"
+msgstr "Skontrolovať poštu"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Poslať pozdržané &správy"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Stav online (neznámy)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Poslať pozdržané správy cez"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Správca certifikátov"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "Importovať správy..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Debug Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Prehliadač záznamu &filtrov..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "Importovať z iného e-mailového klienta..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Upraviť odpovede \"Mimo kanceláriu\"..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Nastaviť automatické archivovanie..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Zdržané správy..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Pripomienkovač správ Followup..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "Odstrá&niť"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Presunúť vlákno do k&oša"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Presunúť vlákno do koša"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Zmazať vlá&kno"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Nájsť správy..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Vybrať &všetky správy"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Správca distribučného zozna&mu..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "Prir&adiť skratku..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Nastav&enia doby vypršania"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "Archivovať priečinok..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Načítať e&xterné odkazy"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopírovať správu do..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Presunúť správu do..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nová správa..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nový"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Správa zo ša&blóny"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "N&ová správa do konferencie..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "&Vytvoriť filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filter na &Predmet..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filter na &Odosielateľa..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filter na &Komu..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filter na &Cc..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Označiť &vlákno"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Označiť vlákno ako P&rečítané"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Označiť všetky správy vo vybranom vlákne ako prečítané"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Označiť vlákno ako N&eprečítané"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Označiť všetky správy vo vybranom vlákne ako neprečítané"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Označiť vlákno ako &Dôležité"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Odstániť označenie vlákna ako &dôležité"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Označiť vlákno ako &Akčná položka"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Odstrániť označenie vlákno akčnej položky"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Sledovať &vlákno"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Ignorovať &vlákno"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Uložiť prílohy..."
 
-#: kmmainwidget.cpp:3186
-#, fuzzy, kde-format
-#| msgid "Copy Item To..."
+#: kmmainwidget.cpp:3193
+#, kde-format
 msgid "Copy Decrypted To..."
-msgstr "Kopírovať položku do..."
+msgstr "Kopírovať rozšifrované do..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "&Použiť všetky filtre"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Rozbaliť vlákno / skupinu"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Rozbaliť aktuálne vlákno alebo skupinu"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Zbaliť vlákno / skupinu"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Zbaliť aktuálne vlákno alebo skupinu"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "R&ozbaliť všetky vlákna"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Rozbaliť všetky vlákna v aktuálnom priečinku"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Z&abaliť všetky vlákna"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Zabaliť všetky vlákna v aktuálnom priečinku"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Zobraziť správy"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Ďa&lšia správa"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Prejsť na nasledujúcu správu"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Nasled&ujúca neprečítaná správa"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Nasledujúca"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Prejsť na nasledujúcu neprečítanú správu"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Pre&dchádzajúca správa"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Prejsť na predchádzajúcu správu"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Predchádzajúca &neprečítaná správa"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Predchádzajúca"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Prejsť na predchádzajúcu neprečítanú správu"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Na&sledujúci neprečítaný priečinok"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Nasledujúci priečinok s neprečítanými správami"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Pre&dchádzajúci neprečítaný priečinok"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Predchádzajúci priečinok s neprečítanými správami"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Nasledujúci neprečítaný &text"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Prejsť na nasledujúci neprečítaný text"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4566,229 +4535,230 @@
 "Posúvať sa dole v aktuálnej správe. Po dosiahnutí konca správy, presunúť sa "
 "na ďalšiu neprečítanú správu."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Nastavenie &filtrov..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Správa &Sieve skriptov..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "Pridať účet..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail Ú&vod"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Zobraziť uvítaciu stránku KMailu"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Nastaviť &upozornenia..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&Nastavenie KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Zrušiť platnosť..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Pridať obľúbený priečinok..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Prihlásenie na strane servera..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
-#, fuzzy, kde-format
-#| msgid "Appl&y All Filters"
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
+#, kde-format
 msgid "Apply All Filters"
-msgstr "&Použiť všetky filtre"
+msgstr "Použiť všetky filtre"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importovať/Exportovať KMail dáta..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nový kontakt adresára..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopírovať správu do priečinka"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Preskočiť na priečinok..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Prerušiť aktuálnu operáciu"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Fokus na nasledujúci priečinok"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Fokus na predchádzajúci priečinok"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Vybrať priečinok s fokusom"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Zamerať na prvý priečinok"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Zamerať na posledný priečinok"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Fokus na nasledujúcu správu"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Fokus na predchádzajúcu správu"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Vybrať prvú správu"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Vybrať poslednú správu"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Vybrať správu s fokusom"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Nastaviť výber na rýchle hľadanie"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Rozšíriť výber na predošlú správu"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Rozšíriť výber na ďalšiu správu"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Presunúť správu do priečinka"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Použiť menšiu šírku pásma"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 "Označiť všetky správy ako prečítané v tomto priečinku a vo všetkých "
 "podpriečinkoch"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Označiť duplicity v tomto priečinku a vo všetkých podpriečinkoch"
 
-#: kmmainwidget.cpp:3579
-#, fuzzy, kde-format
-#| msgid "&Settings"
+#: kmmainwidget.cpp:3586
+#, kde-format
 msgid "Account &Settings"
-msgstr "Na&stavenie"
+msgstr "Nastavenia účtu"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Reštartovať účet"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Pridať obľúbený priečinok"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Vyprázdniť &kôš"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Vš&etky správy presunúť do koša"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Zmazať hľa&danie"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Upraviť hľadanie..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Späť"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Späť: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
-#, fuzzy, kde-format
-#| msgctxt "Show shortcut for focus quick search. Don't change it"
-#| msgid "Search...<%1>"
+#: kmmainwidget.cpp:4695
+#, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
-msgstr "Hľadať...<%1>"
+msgstr "Hľadať... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4798,12 +4768,12 @@
 "Použitie HTML v pošte Vás robí zraniteľnejším voči \"spamu\" a zvyšuje "
 "pravdepodobnosť, že Váš systém bude napadnutý z hľadiska bezpečnosti."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Použiť HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4812,119 +4782,124 @@
 "You can configure unified mailboxes, create custom ones or\n"
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
+"Máte viac ako jeden e-mailový účet.\n"
+"Chcete povoliť funkciu Unified Mailbox, aby sa zobrazoval jednotný obsah "
+"priečinka doručenej pošty, odoslaných priečinkov a konceptov?\n"
+"Môžete nakonfigurovať zjednotené poštové schránky, vytvoriť vlastné alebo\n"
+"túto funkciu úplne vypnite v nastaveniach doplnku KMail's Plugin."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
-msgstr ""
+msgstr "Povoliť zlúčené poštové schránky?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
-msgstr ""
+msgstr "Povoliť zlúčené poštové schránky"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
-msgstr ""
+msgstr "Zrušiť"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Štartovanie..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Presunúť do koša"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Kôš"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Presunúť správu do koša"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Nemôžem kopírovať položku. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nová správa na adresu..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Odpovedať na adresu..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Poslať ďalej na adresu..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Pridať k existujúcemu kontaktu"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Otvoriť v adresári"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Uložiť záložku pre tento odkaz"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Upraviť kontakt..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Uložiť odkaz ako..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Nájsť v správe..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Uložiť obrázok na disk..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Zobraziť HTML formát"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Zobraziť HTML formát, keď príde e-mail od tohto kontaktu"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Načítať externú referenciu, keď príde e-mail od tohto kontaktu"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Zdieľať obrázok..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4933,62 +4908,62 @@
 "KMail je teraz založený na Akonadi Personal Information Management "
 "framework, čo prinieslo množstvo zmien."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push email (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Zlepšené hľadania"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Podpora pridávania poznámok (anotácií) k správam"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Menej mrznutia GUI, kontrola pošty prebieha na pozadí"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Podpora pluginov"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Nový HTML renderer (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Pridaná kontrola pre phishingové URL"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "KDE poštový klient"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Získavam obsah priečinka"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Prosím čakajte..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Nepripojený"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4997,7 +4972,7 @@
 "KMail je momentálne v offline móde. Kliknite <a href=\"kmail:goOnline\">sem</"
 "a> pre prechod na online . . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5006,22 +4981,22 @@
 "Účet je momentálne v offline móde. Kliknite <a href=\"kmail:goResourceOnline"
 "\">sem</a> na prechod na online . . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontakty zmenené úspešne"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nové správy v"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5045,8 +5020,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5138,17 +5113,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Vybrať pluginy súhrnov pre zobrazenie na súhrnnej stránke."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Súhrn KDE Kontact"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5194,28 +5169,27 @@
 msgid "All"
 msgstr "Všetko"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Súhrn Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Pohľad súhrnu Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
-#, fuzzy, kde-format
-#| msgid "(c) 2003-2017 The Kontact developers"
+#: kontactplugin/summary/summaryview_plugin.cpp:122
+#, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
-msgstr "(c) 2003-2017 Vývojári Kontact"
+msgstr "(c) 2003-2019 Vývojári Kontact"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5242,7 +5216,7 @@
 msgid "&Reply"
 msgstr "&Odpovedať"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "Od&povedať..."
@@ -5252,12 +5226,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Odpovedať &autorovi..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Odpovedať &všetkým..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Odpovedať do kon&ferencie..."
@@ -5283,12 +5257,11 @@
 msgstr "Pridať poznámku..."
 
 #: messageactions.cpp:132
-#, fuzzy, kde-format
-#| msgid "&Edit Message"
+#, kde-format
 msgid "&Edit As New"
-msgstr "&Upraviť správu"
+msgstr "Upraviť ako novú"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5346,14 +5319,12 @@
 #: messageactions.cpp:446
 #, kde-format
 msgid "<unknown>"
-msgstr ""
+msgstr "<neznáme>"
 
 #: messageactions.cpp:446
-#, fuzzy, kde-format
-#| msgctxt "@title:tab Mailing list settings for a folder."
-#| msgid "Mailing List"
+#, kde-format
 msgid "Mailing List Name: %1"
-msgstr "Mailing List"
+msgstr "Názov Mailing List-u: %1"
 
 #: messageactions.cpp:449
 #, kde-format
@@ -5481,45 +5452,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Hľadanie zlyhalo. Nájdené chyby: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Nájsť správy"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Hľadať"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "V riadku..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Ako prílohu..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Uložiť prílohy..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Vyčistiť výber"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Skočiť do pôvodného priečinku"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5527,68 +5498,68 @@
 msgstr[1] "%1 odpovedajúce"
 msgstr[2] "%1 odpovedajúcich"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Posledné hľadanie"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Nevybrali ste platný priečinok."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Zabudli ste vybrať kolekcie."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Zabudli ste definovať podmienku."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Všetky vybrané priečinky sú prázdne alebo neboli indexované."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Zabudli ste pridať podmienku."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Obsiahnutá podmienka sa nedá použiť s počtom znakov menším ako 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Hľadá sa..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Nie je možné získať výsledok hľadania. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Hľadanie zlyhalo."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Hľadanie ukončené."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Hľadanie zastavené."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5599,7 +5570,7 @@
 "že už existuje iný priečinok hľadania s rovnakým názvom. Vrátená chyba "
 "\"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5607,7 +5578,7 @@
 msgstr[1] "Kopírovať %1 správy"
 msgstr[2] "Kopírovať %1 správ"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5615,7 +5586,7 @@
 msgstr[1] "Vystrihnúť %1 správy"
 msgstr[2] "Vystrihnúť %1 správ"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Kontrolujem stav indexu..."
@@ -5670,8 +5641,7 @@
 
 #. i18n: ectx: label, entry (ShowUnreadInTaskbar), group (General)
 #: settings/kmail.kcfg.cmake:92
-#, fuzzy, kde-format
-#| msgid "Show unread mail in system tray"
+#, kde-format
 msgid "Show Unread Email in TaskBar"
 msgstr "Zobraziť neprečítané správy v systémovej lište"
 
@@ -5713,10 +5683,9 @@
 
 #. i18n: ectx: label, entry (DeleteMessageWithoutConfirmation), group (General)
 #: settings/kmail.kcfg.cmake:115
-#, fuzzy, kde-format
-#| msgid "Sending Without Confirmation"
+#, kde-format
 msgid "Delete messages without confirmation"
-msgstr "Poslať bez potvrdenia"
+msgstr "Vymazať správy bez potvrdenia"
 
 #. i18n: ectx: label, entry (StartSpecificFolderAtStartup), group (General)
 #: settings/kmail.kcfg.cmake:119
@@ -5747,15 +5716,17 @@
 msgstr "Určuje, či je aplikácia spustená prvý krát (len pre vnútorné použitie)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
 "email accounts are detected. We only ever ask once."
 msgstr ""
+"Či sa má pýtať používateľov na povolenie Združených poštových schránok, "
+"pokiaľ je zistených viac poštových účtov. Budeme sa pýtať iba raz."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5763,26 +5734,26 @@
 msgstr "Táto hodnota je použitá na rozhodnutie, či sa má zobraziť Úvod KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Zobraziť pole rýchleho hľadania priečinka"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Preposlať v riadku ako predvolené."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Varovať ak počet prijímateľov je väčší ako:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5793,19 +5764,19 @@
 "potvrdenie pred poslaním mailu. Upozornenie sa dá vypnúť."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Skontroluje pravopis pred odoslaním"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Automaticky poslať požiadavku potvrdenia o doručení"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5821,13 +5792,13 @@
 "p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Interval pre automatické ukladanie:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5839,151 +5810,151 @@
 "nastavením hodnoty na 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Zobraziť panely textových úryvkov a vkladania v composeri."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Pri kontrole, poslané správy budú uložené v šifrovanej forme"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Zoznam všetkých nedávno použitých URL"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Zoznam všetkých nedávno použitých kódovaní"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Zobraziť indikátor šifrovaného popisu"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Skontrolovať poslať predvolenú skratku"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Veľkosť dialógu identity (len pre vnútorné použitie)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Šírka okna hľadania (len pre vnútorné použitie)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Výška okna hľadanie (len pre vnútorné použitie)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Šírka konfiguračného dialógu KMail (len pre vnútorné použitie)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Výška konfiguračného dialógu KMail (len pre vnútorné použitie)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Náhľad správy"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Nezobraziť panel náhľadu správy"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Zobraziť náhľad správy po&d zoznamom správ"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Zobraziť náhľad správy &vedľa zoznamu správ"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Zoznam priečinkov"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Dlhý zoznam priečinkov"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Krátky zoznam priečinkov"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Šablóna pre novú správu"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Šablóna pre odpoveď"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Šablóna správy pre odpovedať všetkým"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Šablóna pre poslať ďalej"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Znaky citácie"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Určuje politiku použitú pri zobrazovaní politiky"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5993,7 +5964,7 @@
 "použitie)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6002,7 +5973,7 @@
 "Určuje šírku poľa predmet v dialógu okna hľadania (len pre vnútorné použitie)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6012,7 +5983,7 @@
 "použitie)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6022,7 +5993,7 @@
 "použitie)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6031,7 +6002,7 @@
 "Určuje šírku poľa dátum v dialógu okna hľadania (len pre vnútorné použitie)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6197,7 +6168,7 @@
 #: ui/composercryptoconfiguration.ui:64
 #, kde-format
 msgid "When sa&ving as draft, sign/encrypt as indicated"
-msgstr ""
+msgstr "Pri ukladaní ako Koncept, podpísať/šifrovať ako je zadané"
 
 #. i18n: ectx: property (text), widget (QCheckBox, mShowEncSignIndicator)
 #: ui/composercryptoconfiguration.ui:71
@@ -6299,7 +6270,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6344,8 +6315,8 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\">Pri skoku na ďalšiu "
-"neprečítanú správu, môže sa stať, že žiadne ďalšie neprečítané správy sú pod "
-"aktuálnou správou.</p>\n"
+"neprečítanú správu, sa môže stať, že žiadne ďalšie neprečítané správy nie sú "
+"pod aktuálnou správou.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
 "weight:600;\">Necyklovať:</span> Hľadanie sa zastaví na poslednej správe v "
@@ -6353,11 +6324,11 @@
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
 "weight:600;\">Cyklovať v aktuálnom priečinku:</span> Hľadanie bude "
-"pokračovať na vrchu zoznamu správ, ale nepôjde na ďalší priečinok.</p>\n"
+"pokračovať navrchu zoznamu správ, ale nepôjde na ďalší priečinok.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
 "weight:600;\">Cyklovať vo všetkých priečinkoch:</span> Hľadanie bude "
-"pokračovať na vrchu zoznamu správ. Ak sa nenájde žiadna neprečítaná správa, "
+"pokračovať navrchu zoznamu správ. Ak sa nenájde žiadna neprečítaná správa, "
 "pokračuje sa na ďalší priečinok.</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\">Podobne, pri hľadaní "
@@ -6461,10 +6432,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mDeleteMessagesWithoutConfirmation)
 #: ui/miscpagemaintab.ui:180
-#, fuzzy, kde-format
-#| msgid "Sending Without Confirmation"
+#, kde-format
 msgid "Allow deleting messages without confirmation"
-msgstr "Poslať bez potvrdenia"
+msgstr "Povoliť mazanie správ bez potvrdenia"
 
 #. i18n: ectx: property (text), widget (QRadioButton, mChkbxAllFolders)
 #: ui/searchwindow.ui:17
@@ -6492,8 +6462,7 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, selectMultipleFolders)
 #: ui/searchwindow.ui:60
-#, fuzzy, kde-format
-#| msgid "Select folders..."
+#, kde-format
 msgid "Select Folders..."
 msgstr "Vybrať priečinky..."
 
@@ -6618,7 +6587,7 @@
 #: ui/securitypagegeneraltab.ui:90
 #, kde-format
 msgid "Informs if message reading is a suspected email scam"
-msgstr "Ifnormuje, ak čítaná správa je podozrivá ako scam"
+msgstr "Informuje, ak čítaná správa je podozrivá ako scam"
 
 #. i18n: ectx: property (text), widget (QLabel, label_2)
 #: ui/securitypagegeneraltab.ui:97
@@ -6630,7 +6599,7 @@
 #: ui/securitypagegeneraltab.ui:116
 #, kde-format
 msgid "Encrypted Messages"
-msgstr "Kryptované správy"
+msgstr "Šifrované správy"
 
 #. i18n: ectx: property (text), widget (QCheckBox, mAlwaysDecrypt)
 #: ui/securitypagegeneraltab.ui:122
@@ -6664,10 +6633,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Skontrolovať poštu v"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr "Skontrolovať emaily na sledovacie URL adresy"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7118,11 +7086,10 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, warnGroupBox)
 #: ui/warningconfiguration.ui:59
-#, fuzzy, kde-format
-#| msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+#, kde-format
 msgid "Warn if certificates/ke&ys expire soon (configure thresholds below)"
 msgstr ""
-"Varovať pred ukončením platnosti certifikátu alebo kľúča vopred (dole "
+"Varovať pred skončením platnosti certifikátu alebo kľúča vopred (dole "
 "nastavte hranice pre varovania)"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
@@ -7253,8 +7220,7 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
 #: ui/warningconfiguration.ui:292
-#, fuzzy, kde-format
-#| msgid "For root certificates:"
+#, kde-format
 msgid "For &root certificates:"
 msgstr "Pre koreňové certifikáty:"
 
@@ -7266,8 +7232,7 @@
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #: ui/warningconfiguration.ui:318
-#, fuzzy, kde-format
-#| msgid "For end-user certificates/keys:"
+#, kde-format
 msgid "For end-user certificates/&keys:"
 msgstr "Pre koncové certifikáty/kľúče:"
 
@@ -7283,6 +7248,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Znovu zapnúť varovania \"Už sa nepýtať\""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 sekúnd"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Vrátiť odoslanie"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7307,8 +7282,7 @@
 msgstr "Nie je možné presunúť správu. %1"
 
 #: util.cpp:187
-#, fuzzy, kde-format
-#| msgid "Delete"
+#, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "Delete"
 msgstr "Vymazať"
@@ -7337,10 +7311,15 @@
 msgstr[2] "Odpoveď mimo kancelárie aktívna na serveroch"
 
 #: widgets/zoomlabelwidget.cpp:35
-#, fuzzy, kde-format
-#| msgid "Zoom"
+#, kde-format
 msgid "Zoom: %1%"
-msgstr "Priblížiť"
+msgstr "Priblíženie: %1%"
+
+#~ msgid "Text Snippets"
+#~ msgstr "Textové úryvky"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Skontrolujte sledovanie adresy Mail Url"
 
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Názov priečinka a veľkosť, keď sa blíži ku kvóte"
@@ -8889,9 +8868,6 @@
 #~ msgid "R&emove"
 #~ msgstr "&Odstrániť"
 
-#~ msgid "Restart"
-#~ msgstr "Reštart"
-
 #~ msgid "Message Delayed..."
 #~ msgstr "Správa zdržaná..."
 
diff -Nru kmail-19.04.3/po/sk/kmail-refresh-settings.po kmail-19.12.3/po/sk/kmail-refresh-settings.po
--- kmail-19.04.3/po/sk/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/sk/kmail-refresh-settings.po	2020-03-03 00:34:14.000000000 +0000
@@ -0,0 +1,103 @@
+# translation of kmail-refresh-settings.po to Slovak
+# Roman Paholík <wizzardsk@gmail.com>, 2019.
+# Matej Mrenica <matejm98mthw@gmail.com>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail-refresh-settings\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-05 12:36+0200\n"
+"Last-Translator: Matej Mrenica <matejm98mthw@gmail.com>\n"
+"Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 19.07.90\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Roman Paholík"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "wizzardsk@gmail.com"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Asistent KMailu na obnovovanie nastavenia"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "(c) 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Autor"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Nastavenia obnovenia KMailu"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Upozornenie"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Vyčistiť nastavenia"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Dokončiť"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Vyčistiť"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Odstrániť zastarané \"TipDňa\" nastavenia: Hotovo"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Odstrániť nastavenia dialógových okien v súbore `%1`: Hotovo"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Odstrániť nastavenia filtrov v súbore `%1`: Hotovo"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Vyčistiť nastavenia priečinkov v súbore nastavení `%1`: Hotovo"
+
+#: refreshsettingscleanuppage.cpp:155
+#, fuzzy, kde-format
+#| msgid "Clean Folder Settings in setting file `%1`: Done"
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Vyčistiť nastavenia priečinkov v súbore nastavení `%1`: Hotovo"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Prosím zatvorte KMail/Kontact pred použitím."
diff -Nru kmail-19.04.3/po/sk/ktnef.po kmail-19.12.3/po/sk/ktnef.po
--- kmail-19.04.3/po/sk/ktnef.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sk/ktnef.po	2020-03-03 00:34:14.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-19 18:12+0100\n"
 "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\n"
diff -Nru kmail-19.04.3/po/sl/akonadi_archivemail_agent.po kmail-19.12.3/po/sl/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/sl/akonadi_archivemail_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sl/akonadi_archivemail_agent.po	2020-03-03 00:34:15.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-01-16 17:17+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -182,12 +182,12 @@
 "Drugega arhiva za to mapo ni mogoče dodati. Namesto tega spremenite "
 "obstoječega."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "Mapa ne obstaja. Preverite nastavitve. Arhiviranje preloženo."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Začni arhivirati %1"
diff -Nru kmail-19.04.3/po/sl/akonadi_followupreminder_agent.po kmail-19.12.3/po/sl/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/sl/akonadi_followupreminder_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sl/akonadi_followupreminder_agent.po	2020-03-03 00:34:15.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-01-16 17:18+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -18,86 +18,86 @@
 "%100==4 ? 3 : 0);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Opomnik za spremljano pošto"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Opomnik za spremljano pošto"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, fuzzy, kde-format
 #| msgid "Copyright (C) 2014-2018 Laurent Montel"
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Avtorske pravice (C) 2014-2018 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Vzdrževalec"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Andrej Mernik"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "andrejm@ubuntu.si"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Za"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Zadeva"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Skrajni rok"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Odgovor"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Prejeto"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Zadržano"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Pokaži sporočilo"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Izbriši"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
@@ -106,12 +106,12 @@
 msgstr[2] "Ali želite odstraniti ta %1 izbrana predmeta?"
 msgstr[3] "Ali želite odstraniti te %1 izbrane predmete?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Prejet odgovor od %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Še vedno čakate na odgovor te e-pošte:"
diff -Nru kmail-19.04.3/po/sl/akonadi_mailfilter_agent.po kmail-19.12.3/po/sl/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/sl/akonadi_mailfilter_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sl/akonadi_mailfilter_agent.po	2020-03-03 00:34:15.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2014-12-06 14:40+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -25,17 +25,17 @@
 msgid "Filter Log Viewer"
 msgstr "Pregledovalnik dnevnika filtrov"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Be&leži dejanja filtrov"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -44,23 +44,23 @@
 "Tu lahko vklopite in izklopite beleženje dejanj filtrov. Seveda se podatki "
 "zbirajo in prikažejo le, če je beleženje vključeno."
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Podrobnosti beleženja"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Beleži opis vzorca"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Beleži &vrednotenje filtrirnih pravil"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -74,34 +74,34 @@
 "vsako posamezno pravilo filtra. V nasprotnem primeru bo prikazan samo odziv "
 "vrednotenja vseh pravil posameznega filtra."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Beleži vrednotenje filtrirnega vzorca"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Beleži dejanja filtra"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Omejitev velikosti dnevnika:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "neomejeno"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -114,7 +114,7 @@
 "uporabi: če velikost zbranih zapisov preseže to mejo, potem bodo najstarejši "
 "zapisi zavrženi dokler meja ni več presežena. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -123,63 +123,63 @@
 "Ni bilo mogoče pisati v datoteko %1:\n"
 "»%2« je podroben opis napake."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Napaka KMaila"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtriranje sporočila %1 od %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Napaka uveljavitve premikanja poštnega filtra"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Napaka uveljavitve brisanja poštnega filtra"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Napaka uveljavitve spreminjanja poštnega filtra"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Vrednotenje filtrirnih pravil:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filtrirna pravila se ujemajo.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Začni filtrirati pri sporočilu »%1« od »%2« z dne »%3«:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtriranje sporočil"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Dnevnik filtriranja pošte je omogočen"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Pripravljen"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtriranje v %1"
diff -Nru kmail-19.04.3/po/sl/akonadi_sendlater_agent.po kmail-19.12.3/po/sl/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/sl/akonadi_sendlater_agent.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sl/akonadi_sendlater_agent.po	2020-03-03 00:34:15.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-01-16 17:20+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -61,57 +61,57 @@
 msgid "Your emails"
 msgstr "andrejm@ubuntu.si"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Za"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Zadeva"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Pošlji okrog"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Ponavljajoče"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ID sporočila"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Nobeno sporočilo ne čaka ..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Pošlji zdaj"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Izbriši"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Da"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Ne"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
@@ -120,67 +120,67 @@
 msgstr[2] "Ali želite izbrisati izbrana predmeta?"
 msgstr[3] "Ali želite izbrisati izbrane predmete?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Odstrani predmete"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Ali želite odstraniti tudi sporočila?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Odstrani sporočila"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Ni najdenih sporočil."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Ni najdenih sporočil."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Napaka med pridobivanjem sporočila."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Ni mogoče pridobiti sporočila. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Ni mogoče ustvariti prenosa"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Sporočilo ni pravo"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Ni mogoče poslati sporočila."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Sporočilo poslano"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Najdena je bila napaka. Ali želite poslati znova?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Najdena napaka"
diff -Nru kmail-19.04.3/po/sl/kmail.po kmail-19.12.3/po/sl/kmail.po
--- kmail-19.04.3/po/sl/kmail.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sl/kmail.po	2020-03-03 00:34:15.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2018-01-20 10:54+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -188,8 +188,8 @@
 msgstr "Več šifrirnih ključev za en naslov"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -296,27 +296,27 @@
 "KMail v tej mapi ni uspel v celoti zaznati dopisnega seznama. Ročno "
 "izpolnite naslove."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Količinska omejitev"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Stanje:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "Uporabljeno %p %"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "Uporabljeno %1 od %2"
@@ -339,7 +339,7 @@
 "to mapo.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Predloge"
@@ -350,106 +350,106 @@
 msgstr "V tej mapi &uporabi prilagojene predloge za sporočila"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopiraj splošne predloge"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Prikaz"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Uporabi &ikone po meri"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Običajno:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Neprebrano:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Pokaži stolpec Pošiljatelj/Prejemnik v seznamu sporočil"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Po&kaži stolpec:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Privzeto"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Prejemnik"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Seznam sporočil"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Uporabi privzeto združevanje"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Združevanje"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Uporabi privzeto temo"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Privzeta oblika sporočila"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "HTML-ju daj prednost pred navadnim besedilom"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Navadnemu besedilu daj prednost pred HTML-jem"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Uporabi splošne nastavitve"
@@ -459,100 +459,105 @@
 msgid "Retrieval Options"
 msgstr "Možnosti pridobivanja"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Istovetnosti"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Prejemanje"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Pošiljanje"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Računi za pošiljanje (dodajte vsaj enega):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Splošne možnosti"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Pot&rdi pred pošiljanjem"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Pred pošiljanjem preveri črkovanje"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Nikoli samodejno"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Ob ročnem preverjanju pošte"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Ob vseh preverjanjih pošte"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Pošlji zdaj"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Pošlji kasneje"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Pošlji sporočila &v mapi odhajajoče:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Pr&ivzeti način pošiljanja:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Dodaj račun e-pošte ..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Račun po meri ..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -561,30 +566,30 @@
 "Ni bilo mogoče zagnati čarovnika za račune. Prepričajte se, da je nameščen "
 "program AccountWizard."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Ni mogoče zagnati čarovnika za račune"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Vključi v ročno preverjanje pošte"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Ob izhodu iz KMaila preklopi v nepovezani način"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Preveri pošto ob zagonu"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -642,7 +647,7 @@
 msgid "Fixed Width Font"
 msgstr "Pisava stalne širine"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Sestavljalnik"
@@ -946,61 +951,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Oznake ni mogoče ustvariti. Oznaka s tem imenom že obstaja."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Splošno"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardne predloge"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Predloge po meri"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Zadeva"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Nabor znakov"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Glave"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Priloge"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Samodejno popravljanje"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Samodejno spremeni velikost slike"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Podpis"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1009,12 +1014,12 @@
 "Ob začetku pisanja sporočila samodejno\n"
 "vstavi nastavljeni podpis"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Podpis vstavi nad navedeno besedilo"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1023,18 +1028,18 @@
 "Pred podpis vstavi ločilnik, ki ustreza priporočilu RFC\n"
 "(dva pomišljaja in presledek v eni vrstici)"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Pri odgovarjanju ne navajaj obstoječih podpisov"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Oblika"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1045,7 +1050,7 @@
 "izbrano besedilo in ne celotnega sporočila, če je\n"
 "v oknu s sporočilom izbrano besedilo."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1056,17 +1061,17 @@
 "tudi če je bila vrstica ustvarjena z dodajanjem preloma vrstice zaradi\n"
 "samodejnega prelamljanja vrstic."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Omogoči samodejno prelamljanje vrstic na določeni širini"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Nastavite širino vrstice za samodejno prelamljanje"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1077,7 +1082,7 @@
 "obliki, v kateri je bilo prejeto. Če ni označeno, bo odgovor\n"
 "privzeto v navadnem besedilu."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1088,34 +1093,34 @@
 "Podprto je krepko, ležeče in podčrtano besedilo ter\n"
 "seznami in zunanje povezave."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Znotrajvrstično"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Kot prilogo"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Nastavite privzeto vrsto posredovanih sporočil"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Privzeta vrsta posredovanja:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Prejemniki"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1126,17 +1131,17 @@
 "Zahtevo lahko za vsako sporočilo posebej preklopite v meniju\n"
 "Možnosti → Zahtevaj obvestilo o usodi."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Opozori, če je navedenih preveč prejemnikov"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Nastavite največje število prejemnikov za opozorilo"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1152,7 +1157,7 @@
 "preveč ljudem. Zapomnite si, da nastavitev ne upošteva seznamov za\n"
 "razpošiljanje in dopisnih seznamov."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1161,18 +1166,18 @@
 "Zapomni si nedavno vnesene naslove in jih\n"
 "ponudi za dopolnjevanje prejemnikov"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Brez shranjevanja"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Največje število nedavnih naslovov:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1181,24 +1186,24 @@
 "Največje število nedavno vnesenih naslovov, ki bodo\n"
 "pomnjeni za dopolnjevanje"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Nastavi dopolnjevanje ..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Brez samodejnega shranjevanja"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Brez samodejnega shranjevanja"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1208,18 +1213,18 @@
 msgstr[2] " minuti"
 msgstr[3] " minute"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Samodejno shranjuj sporočila v tu določenem razmiku"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Predpone &v zadevi pri odgovarjanju"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1228,59 +1233,59 @@
 "Prepoznaj katerokoli izmed naslednjih predpon\n"
 " (vnosi so regularni izrazi, neobčutljivi na velikost črk)"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Dod&aj ..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Ods&trani"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Spremen&i ..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Vnesite novo predpono za odgovarjanje:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Predpone v zadevi pri pos&redovanju"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Dodaj ..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Ods&trani"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Spremeni ..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Vnesite novo predpono za posredovanje:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1290,89 +1295,89 @@
 "nabor znakov, ki vsebuje vse zahtevane znake."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Spre&meni ..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Vnesite nabor znakov:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Pri od&govarjanju ali posredovanju ohrani prvotni nabor znakov (če je mogoče)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Ta nabor znakov ni podprt."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Uporabi pripono Message-ID po meri"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Pripona message-&id po meri:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Določite polja glave MIME po meri:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Ime"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Vrednost"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&vo"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Ime:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Vrednost:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "Neveljaven datum"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Z Outlookom združljivo poimenovanje prilog"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1381,40 +1386,40 @@
 "Vklopite to možnost, da bo Outlook(tm) razumel imena prilog, ki vsebujejo "
 "neangleške znake"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "O&mogoči odkrivanje manjkajočih prilog"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Prepoznaj katerokoli izmed naslednjih besed kot namen, da se priloži "
 "datoteka:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Vnesite novo ključno besedo:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Največja velikost priloge:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " KiB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Brez omejitve"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1501,7 +1506,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer Plugins"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Vstavki sestavljalnika"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1616,7 +1621,7 @@
 msgid "Archive Folder"
 msgstr "Arhiviraj mapo"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1682,7 +1687,7 @@
 msgid "Notification"
 msgstr "Obvestilo"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1691,12 +1696,12 @@
 msgstr[2] "%1 prilogi (%2)"
 msgstr[3] "%1 priloge (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Skrij seznam prilog"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Pokaži seznam prilog"
@@ -1713,331 +1718,331 @@
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Izberite slovar za uporabo pri preverjanju črkovanja v tem sporočilu"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Izberite mapo za poslano pošto, v katero bo shranjena kopija tega sporočila"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Izberite račun, ki bo uporabljen za pošiljanje tega sporočila"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Izberite e-poštni naslov pošiljatelja tega sporočila"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Nastavite zadevo tega sporočila"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Istovetnost:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Slovar:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Mapa po&slanih sporočil:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Prenos &pošte:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Od:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Zadeva:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "Pošl&ji pošto"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Pošlji poš&to preko"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Pošlji"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Pošlji &kasneje"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Pošlji &kasneje preko"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "V vrsto"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Shrani kot &osnutek"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Shrani pošto v mapo z osnutki"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Shrani kot pre&dlogo"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Shrani pošto v mapo s predlogami"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Shrani v &datoteko"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Shrani pošto kot besedilno ali HTML datoteko"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Vstavi besedilno datoteko ..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Vstavi nedavno besedilno datoteko"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "&Imenik"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Odpri imenik"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nov sestavljalnik"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Izberi p&rejemnike ..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Shrani seznam za &razpošiljanje ..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Prilepi kot prilo&go"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Po&čisti presledke"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Uporabi pisavo s&talne širine"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "N&ujno"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Za&htevaj obvestilo o usodi"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "Za&htevaj obvestilo o usodi"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Prelom vrstic"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Izrezki"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "S&amodejno preverjanje črkovanja"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Urejanje z bogatim besedilom"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Bogato besedilo"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Preklopi način urejanja z bogatim besedilom"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "Vs&a polja"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Istovetnost"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "Sl&ovar"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Mapa po&slanih sporočil"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Prenos pošte"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Od"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "&Zadeva"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Pripni podp&is na konec"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Pripni podpis na zač&etek"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "&Vstavi podpis na položaju kazalke"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Črkovalnik ..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Črkovalnik"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Ši&friraj sporočilo"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Šifriraj"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Po&dpiši sporočilo"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Podpiši"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "Oblika &šifriranja sporočil"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Izberite obliko šifriranja za to sporočilo"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Ustvari opomnik za spremljano pošto ..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Nastavi KMail ..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2046,53 +2051,53 @@
 "<qt>To bo povsem skrilo menijsko vrstico. Spet jo lahko prikažete s "
 "pritiskom %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Skrij menijsko vrstico"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Vrstica: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Stolpec: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "PREP"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "VST"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Preverjanje črkovanja: vklopljeno"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Preverjanje črkovanja: izklopljeno"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Znova sh&rani kot predlogo"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Sh&rani kot osnutek"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2101,7 +2106,7 @@
 "Znova shrani to sporočilo v mapo »Predloge«. Uredite in pošljete ga lahko "
 "kasneje."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2109,59 +2114,59 @@
 msgstr ""
 "Shrani to sporočilo v mapo »Osnutki«. Uredite in pošljete ga lahko kasneje."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Ali želite zavreči sporočilo ali ga shraniti za kasneje?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "&Zapri sestavljalnik"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Samodejno shranjevanje sporočila ni uspelo"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Pošiljanje sporočila ni uspelo"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Vstavi datoteko"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Dodaj kot znotraj&vrstično sliko"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Dodaj kot &prilogo"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Ime priloge:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "Neveljaven datum"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2170,7 +2175,7 @@
 msgstr[2] "Dodaj naslova URL v sporočilo"
 msgstr[3] "Dodaj naslove URL v sporočilo"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2179,17 +2184,17 @@
 msgstr[2] "Dodaj datoteki kot &prilogo"
 msgstr[3] "Dodaj datoteke kot &prilogo"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Besedilo z odložišča vstavi kot prilogo"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "neimenovano"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2202,12 +2207,12 @@
 "p><p>Izberite ključ, ki bodo uporabljeni, v nastavitvah istovetnosti.</p></"
 "qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Nedoločen šifrirni ključ"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2218,12 +2223,12 @@
 "(OpenPGP ali S/MIME), ki se naj za to uporabi.</p> <p>Izberite ključ, ki naj "
 "se uporabi, v nastavitvah istovetnosti.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Nedoločen podpisovalni ključ"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2234,66 +2239,66 @@
 "naslove za vse istovetnosti, da vam jih ne bo treba vnašati za vsako "
 "sporočilo."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr "V polju »Za«, »Kp« ali »Skp« morate navesti vsaj enega prejemnika."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Polje Za: je prazno. Ali vseeno pošljem sporočilo?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Prazno polje Za:"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Niste navedli zadeve. Ali vseeno pošljem sporočilo?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Brez »Zadeve«"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "P&ošlji kot je"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Navedi »Zadevo«."
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Da bi lahko šifrirali osnutek, morate navesti vsaj enega prejemnika."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "E-pošta bo poslana ..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Potrditev pošiljanja"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Pošlji &zdaj"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2301,22 +2306,22 @@
 msgstr ""
 "Pošto poskušate poslati več kot %1 prejemnikom. Ali vseeno pošljem sporočilo?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Preveč prejemnikov"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Pošlji kot je"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Ur&edi prejemnike"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2325,22 +2330,22 @@
 "Izklop načina HTML bo povzročil izgubo oblikovanja besedila. Ali ste "
 "prepričani?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Ali želite izgubiti oblikovanje?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Izguba oblikovanja"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Dodaj oznako za navadno besedilo"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2349,7 +2354,7 @@
 "Za tega prejemnika bo uporabljeno šifriranje z visoko stopnjo varnosti "
 "(šifrirnemu ključu je polno zaupano). Kliknite ikono za podrobnosti."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2358,7 +2363,7 @@
 "Za tega prejemnika bo uporabljeno šifriranje s srednjo stopnjo varnosti "
 "(šifrirnemu ključu je delno zaupano). Kliknite ikono za podrobnosti."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2367,7 +2372,7 @@
 "Za tega prejemnika bo uporabljeno šifriranje z nizko stopnjo varnosti "
 "(šifrirnemu ključu ni zaupano) Kliknite ikono za podrobnosti."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2377,7 +2382,7 @@
 "E-pošta za tega prejemnika bo šifrirana, ampak varnost šifriranja ni poznana "
 "(šifrirnega ključa ni bilo mogoče preveriti). Kliknite ikono za podrobnosti."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Podatki o vstavku urejevalnika"
@@ -2455,27 +2460,27 @@
 msgid "External editor was started."
 msgstr "Zagnan je bil zunanji urejevalnik."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr "Prenos pošte ni bil najden. Preverite, če uporabljate pravilnega."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Sent Folder is not defined. Please verify it before to send it."
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Mapa za poslano pošto ni določena. Preverite nastavitve pred pošiljanjem."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "Istovetnost ni bila najdena. Preverite, če uporabljate pravilno."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2502,11 +2507,6 @@
 msgid "Message will not be encrypted"
 msgstr "Sporočilo ne bo šifrirano"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Besedilni izrezki"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2550,27 +2550,27 @@
 msgid "Cannot move messages."
 msgstr "Sporočil ni mogoče premakniti."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Mape ni mogoče pridobiti. Sporočena napaka: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Vrnjena ni bila nobena mapa."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Nadrejene mape ni mogoče pridobiti. Sporočena napaka: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Seznama map ni mogoče vrniti."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Sporočila arhivirana"
@@ -2611,48 +2611,48 @@
 msgid "&Existing identities:"
 msgstr "&Obstoječe istovetnosti:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Napaka med ustvarjanjem novega para ključev: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Napaka med ustvarjanjem ključa"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Ni ključa"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Ustvari nov par ključev"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Ustvarjanje novega para ključev ..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Uredi Istovetnost"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Splošno"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Vaše ime"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2664,12 +2664,12 @@
 "prazno, se vaše resnično ime ne bo pojavilo, temveč le e-poštni naslov.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&zacija:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2680,12 +2680,12 @@
 "želite da naj bo prikazano v glavi sporočila, ki je poslano.</p><p>Popolnoma "
 "varno (in običajno) je, da pustite to polje prazno.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-poštni naslov:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2701,12 +2701,12 @@
 "napačno izpolnite, bodo ljudje imeli težave pri odgovarjanju na vaša "
 "sporočila.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "&Drugi e-poštni naslovi:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2722,12 +2722,12 @@
 "th><td>ime@primer.si<br>priimek@primer.si</td></tr></table><p>Vsak dodaten "
 "naslov vpišite v svojo vrstico.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Šifriranje"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2748,12 +2748,12 @@
 "pošte z uporabo OpenPGP; to ne bo vplivalo na običajne poštne zmožnosti.</"
 "p><p>Več o ključih lahko izveste na <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Podpisovalni ključ OpenPGP:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2777,12 +2777,12 @@
 "OpenPGP; to ne bo vplivalo na običajne poštne zmožnosti.</p><p>Več o ključih "
 "lahko izveste na <a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Šifrirni ključ OpenPGP:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2795,12 +2795,12 @@
 "pa KMail ne bo mogel digitalno podpisati e-pošte z uporabo S/MIME; to ne bo "
 "vplivalo na običajne poštne zmožnosti.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Podpisovalno potrdilo S/MIME:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2815,39 +2815,39 @@
 "mogel šifrirati kopij sporočil z uporabo S/MIME; to ne bo vplivalo na "
 "običajne poštne zmožnosti.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Šifrirno potrdilo S/MIME:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Prednostna oblika:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Samodejno podpiši sporočila"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Samodejno šifriraj sporočila, če je mogoče"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Napredno"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Nas&lov za odgovor:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2864,12 +2864,12 @@
 "odgovori pa naj se pošiljajo na naslov skupine.</p><p>Če ste v dvomih, "
 "pustite to polje prazno.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Naslovi &Kp (kopija):"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2885,12 +2885,12 @@
 "drug račun, ki ga imate.</p> <p>Če podate več naslovov, jih ločite z "
 "vejicami.</p><p>Če ste v dvomih, pustite to polje prazno.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Naslovi &Skp (slepa kopija):"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2907,57 +2907,57 @@
 "<p>Če podate več naslovov, jih ločite z vejicami.</p><p>Če ste v dvomih, "
 "pustite to polje prazno.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Slovar:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Mapa po&slanih sporočil:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Mapa z &osnutki:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Mapa za predloge:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Račun za pošiljanje:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Sporočilu priloži mojo vizitko vCard"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Ustvari ..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Jezik samodejnega popravljanja:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Obnovi privzeto ime domene"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Privze&ta domena:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2966,33 +2966,33 @@
 "<qt> <p>Privzeta domena se uporabi za dopolnjevanje poštnih naslovov, ki jih "
 "sestavlja le uporabniško ime.</p></qt> "
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Za to istovetnost &uporabi prilagojene predloge za sporočila"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Podpis"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Slika"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Neveljaven drugi e-poštni naslov »%1«"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Neveljaven e-poštni naslov"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3006,7 +3006,7 @@
 "To bo morda povzročilo, da bo prejemnik naletel na opozorila med poskusom "
 "preverjanja podpisov narejenih s temi nastavitvami."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3015,7 +3015,7 @@
 "Eden izmed nastavljenih šifrirnih ključev OpenPGP ne vsebuje uporabniškega "
 "ID-ja z nastavljenim e-poštnim naslovom za to istovetnost (%1)"
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3028,7 +3028,7 @@
 "To bo morda povzročilo, da bo prejemnik naletel na opozorila med poskusom "
 "preverjanja podpisov narejenih s temi nastavitvami."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3037,22 +3037,22 @@
 "Eno izmed nastavljenih šifrirnih potrdil S/MIME ne vsebuje nastavljenega e-"
 "poštnega naslova za to istovetnost (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-poštni naslov ni najden v ključu ali potrdilih"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Datoteka s podpisom ni veljavna"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Uredi istovetnost »%1«"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3061,7 +3061,7 @@
 "Ena izmed map za istovetnost ne obstaja (več). Zaradi tega bodo uporabljene "
 "privzete mape."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Uredi ..."
@@ -3092,6 +3092,19 @@
 msgid "We cannot delete vCard file."
 msgstr "Datoteke vizitke vCard ni mogoče izbrisati."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Potrditev pošiljanja"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3255,7 +3268,7 @@
 "Primeri so na voljo na <a href=\"http://ace.home.xs4all.nl/X-Faces/\">ace."
 "home.xs4all.nl/X-Faces</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Slika"
@@ -3290,7 +3303,7 @@
 msgstr[2] "Seznama za razpošiljanje »%2« sta prazna in ju ni mogoče uporabiti."
 msgstr[3] "Seznami za razpošiljanje »%2« so prazni in jih ni mogoče uporabiti."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Dodaj v imenik"
@@ -3300,22 +3313,22 @@
 msgid "Contact created successfully"
 msgstr "Stik je bil uspešno ustvarjen"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Stika ni mogoče shraniti: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Stika ni bilo mogoče shraniti"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Ali želite priložiti mapo »%1«?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Priloži mapo"
@@ -3528,14 +3541,14 @@
 msgstr "&Mapa"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Uveljavi filtre v mapi"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3561,7 +3574,7 @@
 msgstr "&Posreduj"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "U&veljavi filter"
@@ -3586,7 +3599,7 @@
 msgstr "&Pomoč"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Glavna orodna vrstica"
@@ -3642,12 +3655,12 @@
 msgid "The file does not contain a message."
 msgstr "Datoteka ne vsebuje sporočila."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Datoteka vsebuje več sporočil. Prikazano je le prvo sporočilo."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3656,32 +3669,32 @@
 "Ali želite posredovati izbrana sporočila kot priloge v enem sporočilu (kot "
 "izvleček MIME), ali kot posamična sporočila."
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Pošlji kot izvleček"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Pošlji posamično"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtriranje sporočil"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtriranje sporočila %1 od %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Premikanje sporočil"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Brisanje sporočil"
@@ -3710,33 +3723,33 @@
 msgid "Text Direction Toolbar"
 msgstr "Orodna vrstica za smer besedila"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail je nastavljen za delo v nepovezanem načinu. Vsi omrežni posli so v "
 "pripravljenosti"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "&Send Mail"
 msgid "Send Email"
 msgstr "Pošl&ji pošto"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "E-pošta bo poslana ..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail je nastavljen za delo v povezanem načinu. Vsi omrežni posli se "
 "nadaljujejo"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3745,39 +3758,39 @@
 "KMail je nastavljen za delo v povezanem načinu. Vsi omrežni posli se bodo "
 "nadaljevali, ko bo zaznana omrežna povezava"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail trenutno deluje v nepovezanem načinu. Kako želite nadaljevati?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Povezan/nepovezan"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Delaj povezano"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Delaj nepovezano"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Omrežna povezava je bila zaznana, vsi omrežni posli se nadaljujejo."
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Zaznane ni bilo nobene omrežne povezave. Vsi omrežni posli so v "
 "pripravljenosti"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3786,12 +3799,12 @@
 "Odpiranje datoteke za samodejno shranjevanje v %1 ni uspelo.\n"
 "Razlog. %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Odpiranje datoteke za samodejno shranjevanje ni uspelo"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3806,7 +3819,7 @@
 msgstr[3] ""
 "Te %1 istovetnosti so bile spremenjene tako, da uporabljajo privzeti prenos:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3823,43 +3836,46 @@
 "Te %1 istovetnosti so bile spremenjene tako, da uporabljajo spremenjeni "
 "prenos:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Pošiljanje sporočil"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Začenjanje opravila pošiljanja ..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Vir %1 je pokvarjen."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Posrednik za arhiviranje pošte ni bil registriran."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Posrednik za kasnejše pošiljanje ni bil registriran."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Posrednik za opombe spremljanja ni bil registriran."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3868,12 +3884,12 @@
 "Ni bilo mogoče zagnati upravljalnika potrdil. Prepričajte se, da je nameščen "
 "program Kleopatra."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Napaka KMaila"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3882,26 +3898,30 @@
 "Ni bilo mogoče zagnati čarovnika za uvoz. Prepričajte se, da je nameščen "
 "program ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Ni mogoče zagnati čarovnika za uvoz"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Ni bilo mogoče zagnati programa »Izvažanje nastavitev PIM«. Preverite "
 "namestitev."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Ni bilo mogoče zagnati programa »Izvažanje nastavitev PIM«"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3910,69 +3930,69 @@
 "Ni bilo mogoče zagnati programa ImportWizard. Prepričajte se, da je pravilno "
 "nameščen."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Ni mogoče zagnati ImportWizard"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Na sistemu je bil najden drug program za e-pošto. Ali želite uvoziti njegove "
 "podatke?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Ni bilo mogoče zagnati čarovnika za uvoz. Preverite namestitev."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Brez zadeve"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(ni predlog)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Ta mapa nima nastavljenih nobenih možnosti za pretek"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Ali res želite, da se mapo <b>%1</b> označi kot pretečeno?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Označi mapo kot pretečeno"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "O&znači kot pretečena"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Izprazni smeti"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Premakni v smeti"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Ali zares želite izprazniti mapo s smetmi?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3981,27 +4001,27 @@
 "<qt>Ali ste prepričani, da želite premakniti vsa sporočila iz mape <b>%1</b> "
 "v smeti?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Vsa sporočila so bila premaknjena v smeti"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Ali zares želite označiti vsa stara sporočila kot pretečena?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Označim stara sporočila kot pretečena?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Označi kot pretečeno"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4012,17 +4032,17 @@
 "količina neželene pošte. Poveča se lahko tudi verjetnost, da bo vaš sistem "
 "izkoriščen z obstoječimi in prihodnjimi varnostnimi zlorabami."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Naloži zunanje sklice"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4043,535 +4063,535 @@
 "<qt>Ali resnično želite izbrisati %1 izbrana sporočila?<br />Izbrisanih "
 "sporočil ni več mogoče obnoviti.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Izbriši sporočila"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Izbriši sporočilo"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Premikanje sporočil ..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Brisanje sporočil ..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Sporočila so bila uspešno izbrisana."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Sporočila so bila uspešno premaknjena."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Brisanje sporočil ni uspelo."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Brisanje sporočil je bilo preklicano."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Premikanje sporočil ni uspelo."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Premikanje sporočil je bilo preklicano."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Premakni sporočila v mapo"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopiranje sporočil ..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Sporočila so bila uspešno kopirana."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Kopiranje sporočil ni uspelo."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopiranje sporočil je bilo preklicano."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopiraj sporočila v mapo"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Premikanje sporočil v smeti ..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Premikanje sporočil v smeti ..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Sporočila so bila uspešno premaknjena v smeti."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Sporočila so bila uspešno premaknjena v smeti."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Premikanje sporočil v smeti ni uspelo."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Premikanje sporočil v smeti ni uspelo."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Premikanje sporočil v smeti je bilo preklicano."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Premikanje sporočil v smeti je bilo preklicano."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Pojdi v mapo"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Shrani &kot ..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "O&znači vse mape kot pretečene"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Preveri pošto"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Preveri pošto v"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Preveri pošto"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Pošlji sporočila v čakalni vrsti"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Stanje povezave (neznano)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Pošlji sporočila v čakalni vrsti preko"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Upravljalnik potrdil"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Uvozi sporočila ..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Raz&hrošči Sieve ..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Pregledovalnik &dnevnika filtrov ..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Uvozi iz drugega odjemalca za e-pošto ..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Uredi odgovore »Ni me v pisarni« ..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Nastavi samodejno arhiviranje ..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Zakasnjena sporočila ..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Sporočila opomnika spremljanja ..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Izbriši"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Pre&makni nit v smeti"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Premakni nit v smeti"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Iz&briši nit"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "Na&jdi sporočila ..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Izberi vs&a sporočila"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Upravljanje &dopisnih seznamov ..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Dodeli bližnjico ..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Nastavitve pr&eteka"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arhiviraj mapo ..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Nalo&ži zunanje sklice"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopiraj sporočilo v ..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Premakni sporočilo v ..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Novo sporočilo ..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Novo"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Sporočilo iz &predloge"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "N&ovo sporočilo na dopisni seznam ..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Ustvari &filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filter za &Zadevo ..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filter za &Od ..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filter za &Za ..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filter za &Kp ..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Označi se&znam"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Označi nit kot p&rebrano"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Označi vsa sporočila v izbrani niti kot prebrana"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Označi nit kot n&eprebrano"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Označi vsa sporočila v izbrani niti kot neprebrana"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Označi nit kot po&membno"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Odstrani oznako po&mebnosti niti"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Označi nit kot &opravilo"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Odstrani oznako &opravila z niti"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Opazuj nit"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "Prezr&i nit"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Shrani prilo&ge ..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Kopiraj odšifrirano v ..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Uvel&javi vse filtre"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Ra&zširi nit / skupino"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Razširi trenutno nit ali skupino"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Zlož&i nit / skupino"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Zloži trenutno nit ali skupino"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Razširi &vse niti"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Razširi vse niti v trenutni mapi"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Zl&oži vse niti"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Zloži vse niti v trenutni mapi"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Pri&kaži sporočilo"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Naslednje sporočilo"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Pojdi na naslednje sporočilo"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Naslednje &neprebrano sporočilo"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Naslednje"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Pojdi na naslednje neprebrano sporočilo"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Pre&dhodno sporočilo"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Pojdi na predhodno sporočilo"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Pre&dhodno neprebrano sporočilo"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Predhodno"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Pojdi na predhodno neprebrano sporočilo"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Naslednja neprebrana &mapa"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Pojdi v naslednjo mapo z neprebranimi sporočili"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Pre&dhodna neprebrana mapa"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Pojdi v predhodno mapo z neprebranimi sporočili"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Naslednje neprebrano &besedilo"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Pojdi na naslednje neprebrano besedilo"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4580,218 +4600,224 @@
 "Premakni se po trenutnem sporočilu navzdol. Če je sporočila konec, pojdi na "
 "naslednje neprebrano sporočilo."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Nastavi &filtre ..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Upravljanje skriptov &Sieve ..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "Dod&aj račun ..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "Uvod &v KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Prikaži KMailovo pozdravno stran"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Nastavi o&bvestila ..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Nastavi K&Mail ..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Označi kot pretečeno ..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Dodaj priljubljeno mapo ..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Naročnina na strani strežnika ..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Uveljavi vse filtre"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Uvozi/izvozi podatke programa KMail ..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Nov stik imenika ..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopiraj sporočilo v mapo"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Pojdi v mapo ..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Prekliči trenutno opravilo"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Žarišče na naslednji mapi"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Žarišče na prejšnji mapi"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Izberite mapo z žariščem"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Žarišče na prvi mapi"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Žarišče na zadnji mapi"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Žarišče na naslednjem sporočilu"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Žarišče na predhodnem sporočilu"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Izberi prvo sporočilo"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Izberi zadnje sporočilo"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Izberi sporočilo z žariščem"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Postavi žarišče na hitro iskanje"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Razširi izbor na predhodno sporočilo"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Razširi izbor na naslednje sporočilo"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Premakni sporočilo v mapo"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Uporabi manj pasovne širine"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Označi vsa sporočila v tej mapi in podmapah kot prebrana"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Odstrani dvojnike iz te mape in njenih podmap"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "Na&stavitve"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Restart"
+msgid "Restart Account"
+msgstr "Znova zaženi"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Dodaj priljubljeno mapo"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "I&zprazni smeti"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "P&remakni vsa sporočila v smeti"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "I&zbriši iskanje"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Uredi iskanje ..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Razveljavi"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Razveljavi: »%1«"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filter %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4799,7 +4825,7 @@
 msgid "Search... <%1>"
 msgstr "Poišči ... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4810,12 +4836,12 @@
 "pošte. Poveča se lahko tudi verjetnost, da bo vaš sistem izkoriščen z "
 "obstoječimi in prihodnjimi varnostnimi zlorabami."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Uporabi HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4825,118 +4851,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Začenjanje ..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Pre&makni v smeti"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "V smeti"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Premakni vsa sporočila v smeti"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Predmeta ni mogoče kopirati. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Novo sporočilo za ..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Odgovori ..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Posreduj ..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Dodaj obstoječemu stiku"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Odpri v imeniku"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Zaznamuj to povezavo"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Uredi stik ..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Shrani povezavo kot ..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "Najd&i v sporočilu ..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Shrani sliko na disk ..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Pokaži oblikovanje HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Ko sporočilo pošlje ta stik, pokaži oblikovanje HTML"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Ko sporočilo pošlje ta stik, naloži zunanje sklice"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Deli sliko ..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4945,62 +4971,62 @@
 "KMail sedaj temelji na ogrodju Akonadi za upravljanje z osebnimi podatki, ki "
 "prinaša veliko sprememb."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Potisna e-pošta (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Izboljšano iskanje"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Podpora za dodajanje opomb (zabeležk) e-sporočilom"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Manj zmrzovanja vmesnika, preverjanje za e-pošto sedaj poteka v ozadju"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Podpora vstavkom"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Nov izrisovalnik HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Dodano preverjanje naslova URL za ribarjenjem"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Odjemalec e-pošte za KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Pridobivanje vsebine mape"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Počakajte ..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Nepovezan"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5009,7 +5035,7 @@
 "KMail trenutno deluje v nepovezanem načinu. Kliknite <a href=\"kmail:goOnline"
 "\">sem</a>, da vzpostavite povezavo ...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5018,22 +5044,22 @@
 "Račun trenutno ni povezan. Kliknite <a href=\"kmail:goResourceOnline\">sem</"
 "a>, da vzpostavite povezavo ...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Stik je bil uspešno spremenjen"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nova sporočila v"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Ni neprebranih sporočil"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5058,8 +5084,8 @@
 msgstr "Avtorske pravice © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5152,17 +5178,17 @@
 msgstr ""
 "Izberite vstavke za povzetke, ki jih želite prikazati na strani s povzetki."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Povzetek KDE-jevega Kontacta"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "©, 2004 Tobias Koenig"
@@ -5209,28 +5235,28 @@
 msgid "All"
 msgstr "Vse"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Povzetek Kontacta"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontactov ogled povzetka"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 2003-2018 The Kontact developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© 2003-2018 razvijalci Kontacta"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5258,7 +5284,7 @@
 msgid "&Reply"
 msgstr "Odgovo&ri"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "Od&govori ..."
@@ -5268,12 +5294,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Odgovori &avtorju ..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Odgovori &vsem ..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Odgovori dopisnemu &seznamu ..."
@@ -5304,7 +5330,7 @@
 msgid "&Edit As New"
 msgstr "Ur&edi sporočilo"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5495,45 +5521,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Iskanje ni uspelo, najdenih je bilo nekaj napak: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Najdi sporočila"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "Po&išči"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "Znotrajvrst&ično ..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Kot prilogo ..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Shrani priloge ..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Počisti izbor"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Pojdi v prvotno mapo"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5542,68 +5568,68 @@
 msgstr[2] "%1 zadetka"
 msgstr[3] "%1 zadetki"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Zadnje iskanje"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Niste izbrali veljavne mape."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Pozabili ste izbrati zbirke."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Pozabili ste določiti pogoje."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Vse izbrane mape so prazne ali pa niso v kazalu."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Pozabili ste dodati pogoje."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Pogoja »Vsebuje« ne morete uporabiti z manj kot štirimi znaki."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Iskanje ..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Rezultata iskanja ni mogoče dobiti. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Iskanje je spodletelo."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Iskanje je zaključeno."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Iskanje je zaustavljeno."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5613,7 +5639,7 @@
 "Med preimenovanjem iskalne mape je prišlo do težave. Običajno je razlog to, "
 "da že obstaja druga iskalna mapa z istim imenom. Vrnjena napaka: »%1«."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5622,7 +5648,7 @@
 msgstr[2] "Kopiraj %1 sporočili"
 msgstr[3] "Kopiraj %1 sporočila"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5631,7 +5657,7 @@
 msgstr[2] "Izreži %1 sporočili"
 msgstr[3] "Izreži %1 sporočila"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Preverjanje stanja kazala ..."
@@ -5766,7 +5792,7 @@
 msgstr "Določa, ali je to prvi zagon programa (le za notranjo uporabo)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5774,7 +5800,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5782,26 +5808,26 @@
 msgstr "Ta vrednost določa ali se naj prikaže Uvod v KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Pokaži vrstico hitrega iskanja po mapi"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Privzeto posreduj znotrajvrstično."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Opozori, če je število prejemnikov večje od:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5813,19 +5839,19 @@
 "izklopiti."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Pred pošiljanjem preveri črkovanje"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Samodejno zahtevaj obvestila o uso&di sporočil"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5841,13 +5867,13 @@
 "obvestilo o usodi</em>.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Samodejno shrani vsakih:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5859,7 +5885,7 @@
 "shranjevanje lahko onemogočite, če nastavite vrednost na 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5867,145 +5893,145 @@
 "sestavljalniku."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Ko je označeno, bodo poslana sporočila shranjena v šifrirani obliki"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Seznam vseh nedavno uporabljenih naslovov URL"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Seznam vseh nedavno uporabljenih kodiranj"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Pokaži oznako šifriranja"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Potrdi veljavnost privzete bližnjice za pošiljanje"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Velikost pogovornega okna za istovetnost (le za notranjo uporabo)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Širina pogovornega okna za iskanje (le za notranjo uporabo)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Višina pogovornega okna za iskanje (le za notranjo uporabo)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Širina pogovornega okna za nastavitev KMaila (le za notranjo uporabo)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Višina pogovornega okna za nastavitev KMaila (le za notranjo uporabo)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Pladenj za predogled sporočila"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Ne pokaži pladnja za predogled sporočila"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Pokaži pladenj za predogled sporočila pod seznamom sporočil"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Pokaži pladenj za predogled sporočila poleg seznama sporočil"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Seznam map"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Dolg seznam map"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kratek seznam map"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Predloga za novo sporočilo"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Predloga sporočila za odgovor"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Predloga sporočila za odgovor vsem"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Predloga sporočila za posredovanje"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Znaki za navajanje"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Določa pravilnik, uporabljen ob njegovem prikazu"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6015,7 +6041,7 @@
 "uporabo)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6025,7 +6051,7 @@
 "uporabo)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6035,7 +6061,7 @@
 "notranjo uporabo)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6045,7 +6071,7 @@
 "notranjo uporabo)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6055,7 +6081,7 @@
 "uporabo)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6324,10 +6350,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6692,10 +6755,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Preveri pošto v"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7314,6 +7376,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Znova omogoči vsa opozorila »Ne vprašaj več«"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7374,6 +7446,14 @@
 msgid "Zoom: %1%"
 msgstr "Približanje"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Besedilni izrezki"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Preveri pošto v"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Ime in velikost mape, ki je blizu količinski omejitvi"
 
@@ -8937,9 +9017,6 @@
 #~ msgid "R&emove"
 #~ msgstr "&Odstrani"
 
-#~ msgid "Restart"
-#~ msgstr "Znova zaženi"
-
 #~ msgid "Message Delayed..."
 #~ msgstr "Sporočilo bo poslano kasneje ..."
 
diff -Nru kmail-19.04.3/po/sl/ktnef.po kmail-19.12.3/po/sl/ktnef.po
--- kmail-19.04.3/po/sl/ktnef.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sl/ktnef.po	2020-03-03 00:34:14.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-19 11:37+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
diff -Nru kmail-19.04.3/po/sr/kmail.po kmail-19.12.3/po/sr/kmail.po
--- kmail-19.04.3/po/sr/kmail.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sr/kmail.po	2020-03-03 00:34:15.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2019-04-02 08:04+0200\n"
+"POT-Creation-Date: 2019-04-03 03:39+0200\n"
 "PO-Revision-Date: 2018-01-06 09:21+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
diff -Nru kmail-19.04.3/po/sv/akonadi_archivemail_agent.po kmail-19.12.3/po/sv/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/sv/akonadi_archivemail_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/sv/akonadi_archivemail_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-29 09:17+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -175,13 +175,13 @@
 msgstr ""
 "Kan inte lägga till ett andra arkiv i korgen. Ändra det befintliga istället."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "Katalogen finns inte. Verifiera inställningarna. Arkivering uppskjuten."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Börja arkivera %1"
diff -Nru kmail-19.04.3/po/sv/akonadi_followupreminder_agent.po kmail-19.12.3/po/sv/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/sv/akonadi_followupreminder_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/sv/akonadi_followupreminder_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-29 09:18+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -17,97 +17,97 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Påminnelsemodul för uppföljning"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Uppföljningspåminnelse"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright © 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Underhåll"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Stefan Asserhäll"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "stefan.asserhall@bredband.net"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Till"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Rubrik"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Tidsgräns"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Svar"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Mottagna"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Väntande"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Visa brev"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Ta bort"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "Vill du ta bort det markerade objektet?"
 msgstr[1] "Vill du ta bort de %1 markerade objekten?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Svar från %1 mottaget"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Du väntar fortfarande på svar för detta brev:"
diff -Nru kmail-19.04.3/po/sv/akonadi_mailfilter_agent.po kmail-19.12.3/po/sv/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/sv/akonadi_mailfilter_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/sv/akonadi_mailfilter_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-09-29 11:00+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -22,17 +22,17 @@
 msgid "Filter Log Viewer"
 msgstr "Visning av filterlogg"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Dela..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "&Logga filteraktivitet"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -41,23 +41,23 @@
 "Du kan stänga av eller sätta på loggning av filteraktiviteter här. Loggdata "
 "samlas bara in och visas när loggning är aktiverad. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Loggningsinformation"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Beskrivning av loggmönster"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Logga filter&regelutvärdering"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -71,34 +71,34 @@
 "återmatning för varje enskild filterregel. Alternativt ges bara återmatning "
 "om resultat efter utvärdering av ett enstaka filter."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Logga filterregelutvärdering"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Logga filteråtgärder"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Storleksbegränsning för logg:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " Kibyte"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "obegränsad"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -110,7 +110,7 @@
 "kan du begränsa maximal minnesstorlek som ska användas. Om insamlad loggdata "
 "överskrider gränsen, kastas äldsta data till gränsen inte längre överskrids. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -119,63 +119,63 @@
 "Kunde inte skriva till filen %1:\n"
 "Den detaljerade felbeskrivningen är \"%2\"."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Kmail-fel"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerar brev %1 av %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Fel vid användning av e-postfilter för att flytta"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Fel vid användning av e-postfilter för att ta bort"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Fel vid användning av e-postfilter för ändring"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Utvärderar filterregler:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Filterregel har matchat.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Börja filtrering med brevet \"%1\" från \"%2\", \"%3\":</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrerar brev"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Logg för e-postfilter aktiverad"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Klar"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Filtrerar i %1"
diff -Nru kmail-19.04.3/po/sv/akonadi_sendlater_agent.po kmail-19.12.3/po/sv/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/sv/akonadi_sendlater_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/sv/akonadi_sendlater_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-12-29 09:18+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -59,124 +59,124 @@
 msgid "Your emails"
 msgstr "stefan.asserhall@bredband.net"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Till"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Rubrik"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Skicka omkring"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Återkommande"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Brevidentifikation"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Inga brev väntar..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Skicka nu"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Ta bort"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Ja"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Nej"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Vill du ta bort markerat objekt?"
 msgstr[1] "Vill du ta bort markerade objekt?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Ta bort objekt"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Vill du också ta bort breven?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Ta bort brev"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Inte brev hittat."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Inget brev hittades."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Fel när brev skulle hämtas."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Kan inte hämta brev. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Kan inte skapa överföring"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Brevet är inte ett verkligt brev"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Kan inte skicka brev."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Brev skickat"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Ett fel hittades. Vill du skicka om det?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Fel hittades"
diff -Nru kmail-19.04.3/po/sv/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/sv/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/sv/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/sv/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-08 20:05+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Synkroniserar förenad brevlåda %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Lägg till en förenad brevlåda"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Namn:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Välj ikon..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Ikon:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Skickat"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Utkast"
diff -Nru kmail-19.04.3/po/sv/docs/akonadi_archivemail_agent/index.docbook kmail-19.12.3/po/sv/docs/akonadi_archivemail_agent/index.docbook
--- kmail-19.04.3/po/sv/docs/akonadi_archivemail_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/sv/docs/akonadi_archivemail_agent/index.docbook	2020-03-03 00:34:21.000000000 +0000
@@ -55,9 +55,9 @@
 >&FDLNotice;</legalnotice>
 
 <date
->2013-08-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.11</releaseinfo>
+>Program 19.12</releaseinfo>
 </articleinfo>
 
 <sect1 id="introduction">
@@ -75,7 +75,7 @@
 <para
 >Använd <menuchoice
 ><guimenu
->Verktyg</guimenu
+>Inställningar</guimenu
 ><guimenuitem
 >Anpassa automatisk arkivering...</guimenuitem
 ></menuchoice
@@ -123,7 +123,7 @@
 >, sökvägen till den valda korgen i &kmail;s korglista, datum på formatet <userinput
 >år-månad-dag</userinput
 > och den valda filändelsen, t.ex. <filename
->Archive_Lokala korgar_inkorg_2013-09-03.tar.bz2</filename
+>Archive_Lokala korgar_inkorg_2019-09-03.tar.bz2</filename
 > </para
 ></listitem>
 <listitem
@@ -178,6 +178,18 @@
 <para
 >Du kan använda kryssrutorna till vänster om varje rad i listan för att aktivera eller inaktivera arkivering med detta jobb. </para>
 <para
+>Det är möjligt att komma åt inställningsdialogrutan när som helst senare genom att använda <menuchoice
+><guimenu
+>Inställningar</guimenu
+> <guimenuitem
+>Anpassa &kmail;...</guimenuitem
+></menuchoice
+> och därefter välja sidan <guilabel
+>Insticksprogram</guilabel
+> i &kmail;s huvudfönster och klicka på inställningsknappen för alternativet <guilabel
+>E-postarkiveringsmodul</guilabel
+>. </para>
+<para
 >Genom att Använda den sammanhangsberoende menyn som visas med ett klick med höger musknapp på ett arkiveringsjobb kan du öppna katalogen som innehåller arkiven eller starta arkiveringsjobbet omedelbart. Det skriver över ett befintligt arkiv som skapats tidigare samma dag utan underrättelse. </para>
 
 </sect2>
@@ -190,16 +202,15 @@
 <para
 >&i18n-archivemailagent;</para>
 <para
->Program copyright 2013 Laurent Montel montel@kde.org </para>
+>Program copyright 2013-2019 Laurent Montel montel@kde.org </para>
 <para
->Dokumentation Copyright &copy; 2013 Laurent Montel montel@kde.org </para>
+>Dokumentation Copyright &copy; 2013-2019 Laurent Montel montel@kde.org </para>
 
 <para
 >Översättning Stefan Asserhäll <email
 >stefan.asserhall@bredband.net</email
 ></para
-> 
-&underFDL; &underGPL; </sect2>
+> &underFDL; &underGPL; </sect2>
 
 </sect1>
 
diff -Nru kmail-19.04.3/po/sv/docs/akonadi_followupreminder_agent/index.docbook kmail-19.12.3/po/sv/docs/akonadi_followupreminder_agent/index.docbook
--- kmail-19.04.3/po/sv/docs/akonadi_followupreminder_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/sv/docs/akonadi_followupreminder_agent/index.docbook	2020-03-03 00:34:21.000000000 +0000
@@ -47,9 +47,9 @@
 </copyright>
 
 <date
->2014-06-10</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.14</releaseinfo>
+>Program 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -60,6 +60,78 @@
 <para
 >&i18n-followupreminderagent; är en Akonadi-modul som följer upp påminnelsebrev </para>
 
+<sect2 id="using-kapp">
+<title
+>Använda &i18n-followupreminderagent;</title>
+
+<para
+>Använd <menuchoice
+><guimenu
+>Alternativ</guimenu
+> <guimenuitem
+>Skapa påminnelse om uppföljning</guimenuitem
+></menuchoice
+> i &kmail;s brevfönster för att visa en dialogruta som låter dig skapa en påminnelse om att följa upp det aktuella brevet ett specifikt datum.</para>
+
+<screenshot>
+<screeninfo
+>Dialogrutan &i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="add-followup-reminder.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Dialogrutan &i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para
+>Dialogrutan &i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+<para
+>Klicka på neråtpilknappen intill fältet <guilabel
+>Datum</guilabel
+> för att välja datumet i &kde;:s kalenderkomponent. Det är också möjligt att välja kalender för påminnelsen genom att använda kombinationslistan <guilabel
+>Lagra uppgift i</guilabel
+>.</para>
+<para
+>För att ta bort påminnelser som du har schemalagt, använd <menuchoice
+><guimenu
+>Inställningar</guimenu
+> <guimenuitem
+>Anpassa &kmail;...</guimenuitem
+></menuchoice
+>, och välj därefter sidan <guilabel
+>Insticksprogram</guilabel
+> i &kmail; och klicka på inställningsknapp intill alternativet <guilabel
+>Påminnelsemodul för uppföljning</guilabel
+>. Använd sedan den sammanhangsberoende menyn som visas med ett högerklick på ett påminnelseobjekt för att välja alternativet <guimenuitem
+>Ta bort</guimenuitem
+>. </para>
+
+<screenshot>
+<screeninfo
+>Anpassa &i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="followupreminder-configure.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Anpassa &i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para
+>Anpassa &i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+</sect2>
+
 <sect2 id="credits">
 
 <title
@@ -68,16 +140,15 @@
 <para
 >&i18n-followupreminderagent;</para>
 <para
->Program copyright 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Program copyright 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Dokumentation Copyright &copy; 2014 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Dokumentation Copyright &copy; 2014-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Översättning Stefan Asserhäll <email
 >stefan.asserhall@bredband.net</email
 ></para
-> 
-&underFDL; &underGPL; </sect2>
+> &underFDL; &underGPL; </sect2>
 
 </sect1>
 
diff -Nru kmail-19.04.3/po/sv/docs/akonadi_sendlater_agent/index.docbook kmail-19.12.3/po/sv/docs/akonadi_sendlater_agent/index.docbook
--- kmail-19.04.3/po/sv/docs/akonadi_sendlater_agent/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/sv/docs/akonadi_sendlater_agent/index.docbook	2020-03-03 00:34:21.000000000 +0000
@@ -57,9 +57,9 @@
 </copyright>
 
 <date
->2013-11-30</date>
+>2019-09-21</date>
 <releaseinfo
->&kde; 4.12</releaseinfo>
+>Program 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -122,13 +122,17 @@
 <para
 >Vid inloggning i en &kde;-session kontrollerar modulen schemalagda brev och skickar alla brev som är försenade sedan föregående utloggning om det behövs. </para>
 <para
->Använd <menuchoice
+>För att ändra alternativ för brev, använd <menuchoice
 ><guimenu
 >Inställningar</guimenu
 > <guimenuitem
->Anpassa Skicka senare-modul...</guimenuitem
+>Anpassa &kmail;...</guimenuitem
 ></menuchoice
-> i &kmail; för att ändra alternativ för brev du har schemalagt för att skicka senare. </para>
+> och välj därefter sidan <guilabel
+>Insticksprogram</guilabel
+> i &kmail; och klicka på inställningsknappen för alternativet <guilabel
+>Skicka senare-modul</guilabel
+>. </para>
 
 <screenshot>
 <screeninfo
@@ -164,16 +168,15 @@
 <para
 >&i18n-sendlateragent;</para>
 <para
->Program copyright 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Program copyright 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 <para
->Dokumentation Copyright &copy; 2013 &Laurent.Montel; &Laurent.Montel.mail; </para>
+>Dokumentation Copyright &copy; 2013-2019 &Laurent.Montel; &Laurent.Montel.mail; </para>
 
 <para
 >Översättning Stefan Asserhäll <email
 >stefan.asserhall@bredband.net</email
 ></para
-> 
-&underFDL; &underGPL; </sect2>
+> &underFDL; &underGPL; </sect2>
 
 </sect1>
 
diff -Nru kmail-19.04.3/po/sv/docs/kmail2/credits-and-licenses.docbook kmail-19.12.3/po/sv/docs/kmail2/credits-and-licenses.docbook
--- kmail-19.04.3/po/sv/docs/kmail2/credits-and-licenses.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/sv/docs/kmail2/credits-and-licenses.docbook	2020-03-03 00:34:22.000000000 +0000
@@ -48,8 +48,8 @@
 >Tack till och licens</title>
 
 <para
->&kmail;: Copyright &kmail;-utvecklarna, 1997-2013</para>
-&underGPL; &underFDL; <sect1 id="team">
+>&kmail;: Copyright &kmail;-utvecklarna, 1997-2013</para
+>&underGPL; &underFDL; <sect1 id="team">
 <title
 >Utvecklingsgrupp</title>
 <!-- please keep in sync with the authors list on the webpage -->
diff -Nru kmail-19.04.3/po/sv/docs/ktnef/index.docbook kmail-19.12.3/po/sv/docs/ktnef/index.docbook
--- kmail-19.04.3/po/sv/docs/ktnef/index.docbook	2019-07-09 00:20:32.000000000 +0000
+++ kmail-19.12.3/po/sv/docs/ktnef/index.docbook	2020-03-03 00:34:22.000000000 +0000
@@ -168,7 +168,6 @@
 >Översättning Stefan Asserhäll <email
 >stefan.asserhall@bredband.net</email
 ></para
-> 
-&underFDL; &underGPL; </sect1>
+> &underFDL; &underGPL; </sect1>
 
 </article>
diff -Nru kmail-19.04.3/po/sv/kmail.po kmail-19.12.3/po/sv/kmail.po
--- kmail-19.04.3/po/sv/kmail.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sv/kmail.po	2020-03-03 00:34:16.000000000 +0000
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-03-09 08:29+0100\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-10-26 11:19+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
 "Language: sv\n"
@@ -186,8 +186,8 @@
 msgstr "Flera krypteringsnycklar per adress"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "Kmail"
@@ -293,27 +293,27 @@
 "Kmail kunde inte helt identifiera en sändlista i den här korgen. Fyll i "
 "adresserna manuellt."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kvoter"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Användning:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Status:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p % full"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1 av %2 används"
@@ -336,7 +336,7 @@
 "tangenterna som du vill ska höra ihop med korgen.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Mallar"
@@ -347,106 +347,106 @@
 msgstr "An&vänd egna brevmallar i korgen"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Kopiera allmänna mallar"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Visa"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Använd egna &ikoner"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "O&läst:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Visa kolumn med avsändare och mottagare i brevlistan"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Visa kolumn:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Förval"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Avsändare"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Mottagare"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Brevlista"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Använd standardsammanställning"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Sammanställning"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Använd standardtema"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Standardbrevformat"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Föredra HTML före text"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Föredra text före HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Använd globala inställningar"
@@ -456,100 +456,105 @@
 msgid "Retrieval Options"
 msgstr "Hämtningsalternativ"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Identiteter"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Ta emot"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Skicka"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "LDAP-server "
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Utgående konton (lägg till minst ett konto):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Vanliga alternativ"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Bekräfta &före skickning"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Kontrollera stavning innan sändning"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Aldrig automatiskt"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Vid manuell postkontroll"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Vid alla postkontroller"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Skicka nu"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Skicka senare"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Skicka &brev i utkorgen:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Fö&rvald metod för att skicka:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Aktivera ångring av skicka"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Lägg till e-postkonto..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Eget konto..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -558,30 +563,30 @@
 "Kunde inte starta kontoguiden. Försäkra dig om att kontoguiden är riktigt "
 "installerad."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Kan inte starta kontoguiden"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Inkludera i manuell brevkontroll"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Koppla ner när Kmail stängs av"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Titta efter nya brev vid start"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -639,7 +644,7 @@
 msgid "Fixed Width Font"
 msgstr "Teckensnitt med fast breddsteg"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Brev"
@@ -945,61 +950,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Etiketten kan inte skapas. En etikett med samma namn finns redan."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Allmänt"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standardmallar"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Egna mallar"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Rubrik"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Teckenuppsättning"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Sidhuvuden"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Bilagor"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Automatisk korrigering"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Ändra bildstorlek automatiskt"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Brevfot"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1008,12 +1013,12 @@
 "Infoga automatiskt den inställda brevfoten\n"
 "när ett brev börjar skrivas"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Infoga brevfot ovanför eventuell citerad text"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1022,18 +1027,18 @@
 "Infoga RFC-kompatibla skiljetecken för brevfot\n"
 "(två streck och ett mellanslag på en rad) innan brevfoten"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Vid svar, citera inte eventuell befintlig brevfot"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Format"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1044,7 +1049,7 @@
 "hela brevet) vid svar, när det finns\n"
 "markerad text i brevfönstret."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1056,17 +1061,17 @@
 "till och med när raden skapades genom att lägga till en ytterligare\n"
 "radbrytning när texten radbryts."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Aktivera automatisk radbrytning vid den angivna bredden"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Ställ in textbredden för automatisk radbrytning"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1077,7 +1082,7 @@
 "på originalformatet som det mottogs.\n"
 "Om avmarkerat, sker svaret normalt med enkelt text."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1088,34 +1093,34 @@
 "Fetstil, kursiv och understruken text, listor och externa referenser\n"
 "stöds."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "På plats"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Som bilaga"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Ställ in standardformat för vidarebefordrade brev"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Standardtyp för vidarebefordra:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Mottagare"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1126,17 +1131,17 @@
 "Det går att välja för enskilda brev med \"Alternativ - Begär "
 "hanteringsbekräftelse\"."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Varna om för många mottagare anges"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Ställ in maximalt antal mottagare för varningen"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1153,7 +1158,7 @@
 "till alltför många personer av misstag. Observera, dock att\n"
 "det inte tar hänsyn till fördelningslistor och sändlistor."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1162,18 +1167,18 @@
 "Kom ihåg senast inmatade adresser,\n"
 "och erbjud dem för komplettering av mottagare"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Spara inte"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Maximalt antal senaste adresser bevarade:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1182,23 +1187,23 @@
 "Det maximalt antal senast inmatade adresser som\n"
 "blir ihågkomna för komplettering"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Anpassa komplettering..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Spara automatiskt"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Spara inte automatiskt"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1206,18 +1211,18 @@
 msgstr[0] " minut"
 msgstr[1] " minuter"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "Spara automatiskt brevet med det angivna intervallet"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Rubrikprefix vid &svar"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1226,59 +1231,59 @@
 "Identifiera vilken sekvens som helst av följande prefix\n"
 "(posterna är skiftlägeskänsliga reguljära uttryck):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Lä&gg till..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Ta &bort"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Ändra..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Ange nytt svarsprefix:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Rubrikprefix &vid vidarebefordran"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Lägg till..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Ta bort"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Ändra..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Ange nytt vidarebefordringsprefix:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1288,90 +1293,90 @@
 "efter en teckenuppsättning som innehåller alla tecken som krävs."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "Än&dra..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Ange teckenuppsättning:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "Behåll ursprunglig tec&kenuppsättning vid svar eller vidarebefordran (om "
 "möjligt)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Den här teckenuppsättningen stöds inte."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Använd eget &suffix för meddelande-id"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "E&get suffix för meddelande-id:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Definiera egna Mime-huvudfält:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Namn"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Värde"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "N&ytt"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Namn:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Värde:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 "'Content-Type' är inte en godkänd sträng. Huvudet kommer inte att sparas."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Ogiltigt huvud"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Namngivning av bilagor som fungerar med Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1380,38 +1385,38 @@
 "Aktivera det här alternativet för att få Outlook™ att förstå dina svar på "
 "inbjudningar som innehåller andra tecken än engelska"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Aktivera ide&ntifiering av saknade bilagor"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Känn igen något av följande nyckelord som avsikt att bilägga en fil:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Ange nytt nyckelord:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Maximal storlek på bilaga:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " Kibyte"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Ingen gräns"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1497,7 +1502,7 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Insticksprogram för textkonvertering"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1612,7 +1617,7 @@
 msgid "Archive Folder"
 msgstr "Arkivera korg"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1678,19 +1683,19 @@
 msgid "Notification"
 msgstr "Underrättelse"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 bilaga (%2)"
 msgstr[1] "%1 bilagor (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Dölj lista med bilagor"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Visa lista med bilagor"
@@ -1707,329 +1712,329 @@
 msgid "Encoding"
 msgstr "Kodning"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "Kmail 2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Välj en ordlista att använda vid stavningskontroll av brevet"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Välj en korg med skickade brev där en kopia av brevet ska sparas"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Välj utgående kontot att använda för att skicka brevet"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Ange e-postadressen \"Från:\" för brevet"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Ange en rubrik för brevet"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "I&dentitet:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Ordlista:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Ski&ckade brev-korg:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Brev&överföring:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Från:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "R&ubrik:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Skicka brev"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Skicka brev via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Skicka"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Skicka s&enare"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Skicka s&enare via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Köa"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Spara som &utkast"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Spara brev i korgen Utkast"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Spara som &mall"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Spara brev i korgen Mallar"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Spara som &fil"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Spara brev som text- eller HTML-fil"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Infoga textfil..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Infoga senaste textfil"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Adress&bok"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Öppna adressbok"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Nytt brev"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Välj &mottagare..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Spara &distributionslista..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Klistra in som bila&ga"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "&Rensa mellanslag"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Använd teckensnitt med fast &breddsteg"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Brådskande"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "Begär &hanteringsbekräftelse"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "Begär hante&ringsbekräftelse"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "Bryt &rader"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "Text&snuttar"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Automatisk rättstavning"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Rich text-redigering"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rich text"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Växla Rich text-redigeringsläge"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Alla fält"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Identitet"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "Or&dlista"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Ski&ckade brev-korg"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "Brev&överföring"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Från"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "R&ubrik"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Lägg t&ill brevfot sist"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Lägg till br&evfot först"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Infoga brevfot vid &markörposition"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Stavningskontroll..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Stavningskontroll"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "Krypt&era brevet"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Signera brevet"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Signera"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Krypterat brevformat"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Välj ett krypteringsformat för brevet"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Skapa påminnelse om uppföljning..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Anpassa Kmail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2038,53 +2043,53 @@
 "<qt>Detta döljer menyraden fullständigt. Du kan visa den igen genom att "
 "skriva in %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Dölj menyrad"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Rad: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Kolumn: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ERSÄTT"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INFOGA"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Stavningskontroll: på"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Stavningskontroll: av"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Spara i&gen som mall"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Spara som utkast"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2093,7 +2098,7 @@
 "Spara brevet igen i mallkorgen. Det kan därefter användas vid ett senare "
 "tillfälle."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2102,82 +2107,82 @@
 "Spara brevet i korgen Utkast. Det kan därefter redigeras och skickas vid ett "
 "senare tillfälle."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Vill du kasta bort brevet eller spara det till senare?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Stäng brevfönster"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Misslyckades spara brev automatiskt"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Misslyckades skicka brev"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Infoga fil"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Lägg till som b&ild på plats"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Lägg till som &bilaga"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Bilagans namn:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Bilagans namn kan inte vara tomt"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Ogiltigt namn på bilaga"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Lägg till webbadress i brev"
 msgstr[1] "Lägg till webbadresser i brev"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Lägg till fil som &bilaga"
 msgstr[1] "Lägg till filer som &bilagor"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Infoga klippbordets text som bilaga"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "namnlös"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2190,12 +2195,12 @@
 "krypteringsnyckel att använda för detta.</p><p>Välj nyckel eller nycklar som "
 "ska användas i identitetsinställningen.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Odefinierad krypteringsnyckel"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2206,12 +2211,12 @@
 "eller S/MIME-signeringsnyckel som ska användas.</p><p>Välj nyckeln som ska "
 "användas i identitetsinställningarna.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Odefinierad signeringsnyckel"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2222,7 +2227,7 @@
 "postadress för alla identiteter, så att du inte behöver skriva in den för "
 "varje brev."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2231,59 +2236,59 @@
 "Du måste ange minst en mottagare antingen i fältet Till:, eller som kopia "
 "eller dold kopia."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Fältet Till: är tomt. Skicka brevet i alla fall?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Till: inte angivet"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Du angav inte någon rubrik. Skicka brevet i alla fall?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Ingen rubrik angiven"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Ski&cka som det är"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "A&nge rubriken"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Du måste ange minst en mottagare för att kunna kryptera ett utkast."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "På väg att skicka e-post..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Skicka bekräftelse"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "&Skicka nu"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2291,22 +2296,22 @@
 msgstr ""
 "Du försöker skicka brevet till mer än %1 mottagare. Skicka brevet ändå?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "För många mottagare"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Ski&cka som det är"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Redigera mottagare"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2315,22 +2320,22 @@
 "Att stänga av HTML-läget gör att texten förlorar sin formatering. Är du "
 "säker?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Förlora formatering?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Förlora formatering"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Lägg till markering som ren text"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2339,7 +2344,7 @@
 "Kryptering med hög säkerhet används för mottagaren (krypteringsnyckeln är "
 "helt pålitlig). Klicka på ikonen för detaljerad information."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2348,7 +2353,7 @@
 "Kryptering med medelsäkerhet används för mottagaren (krypteringsnyckeln är "
 "möjligen pålitlig). Klicka på ikonen för detaljerad information."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2357,7 +2362,7 @@
 "Kryptering med låg säkerhet används för mottagaren (krypteringsnyckeln är "
 "opålitlig). Klicka på ikonen för detaljerad information."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2368,7 +2373,7 @@
 "(krypteringsnyckeln kunde inte verifieras). Klicka på ikonen för detaljerad "
 "information."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Information om insticksprogrameditor"
@@ -2445,7 +2450,7 @@
 msgid "External editor was started."
 msgstr "Extern editor startades."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2454,19 +2459,19 @@
 "Överföringen hittades inte. Verifiera att du använder en korrekt "
 "brevöverföring."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "Korgen Skickat är inte definierad. Ställ in den innan brevet skickas."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 "Identiteten hittades inte. Verifiera att du använder en korrekt identitet."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2494,11 +2499,6 @@
 msgid "Message will not be encrypted"
 msgstr "Brevet kommer inte att krypteras"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Textsnuttar"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2542,27 +2542,27 @@
 msgid "Cannot move messages."
 msgstr "Kan inte flytta brev."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Kan inte hämta korg. Rapporterat fel: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Ingen korg returnerad."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Kan inte hämta överliggande korg. Rapporterat fel:  %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Kan inte returnera lista med korgar."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Brev arkiverade"
@@ -2603,48 +2603,48 @@
 msgid "&Existing identities:"
 msgstr "B&efintliga identiteter:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Fel vid försök att skapa nytt nyckelpar: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Fel för skapa nyckel"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Ingen nyckel"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Skapa ett nytt nyckelpar"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Skapar nytt nyckelpar..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Redigera identitet"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Allmänt"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Ditt namn:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2655,12 +2655,12 @@
 "att det ska visas i e-posthuvudet som skickas.</p><p>Om du lämnar det tomt, "
 "visas inte ditt riktiga namn, utan bara e-postadressen.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "Organi&sation:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2671,12 +2671,12 @@
 "organisation, om du vill att det ska visas i e-posthuvudet som skickas.</"
 "p><p>Det är ofarligt (och normalt) att lämna det tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-postadress:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2691,12 +2691,12 @@
 "till ytterligare adressalias i fältet nedan.</p><p>Om du lämnar det tomt, "
 "eller skriver in det fel, får andra svårt att svara dig.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "E-posta&lias:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2712,12 +2712,12 @@
 "td></tr><tr><th>Alias:</th><td>för@exempel.org<br>efter@exempel.org</td></"
 "tr></table><p>Skriv ett alias per rad.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Kryptografi"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2732,12 +2732,12 @@
 "postfunktioner påverkas inte.</p><p>Du kan ta reda på mer om nycklar på "
 "<a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP-signaturnyckel:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2754,12 +2754,12 @@
 "med OpenPGP. Normala e-postfunktioner påverkas inte.</p><p>Du kan ta reda på "
 "mer om nycklar på <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP-krypteringsnyckel:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2772,12 +2772,12 @@
 "Kmail signera e-post med S/MIME. Normala e-postfunktioner påverkas inte.</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-signaturcertifikat:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2792,39 +2792,39 @@
 "kopior av utgående brev till dig själv med S/MIME. Normala e-postfunktioner "
 "påverkas inte.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-krypteringscertifikat:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Format som föredras:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Signera brev automatiskt"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Kryptera automatiskt breven om möjligt"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Sva&rsadress:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2841,12 +2841,12 @@
 "postadress i fältet <tt>From:</tt>, men eventuella svar ska gå till en "
 "gruppadress.</p><p>Om du tvekar, lämna fältet tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adresser med dold &kopia:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2863,12 +2863,12 @@
 "kommatecken för att åtskilja mottagarna av dolda kopior.</p><p>Om du är "
 "osäker, lämna fältet tomt.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Adresser med dold &kopia:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2886,57 +2886,57 @@
 "mottagarna av dolda kopior.</p><p>Om du är osäker, lämna fältet tomt.</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "Ordl&ista:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Ski&ckade brev-korg:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "&Utkast-korg:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Mallkorg:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Utgående konto:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Lägg till mitt visitkort till brevet"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Skapa..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Språk för automatisk korrigering:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Återställ förvalt domännamn"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "F&örvald domän:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2945,33 +2945,33 @@
 "<qt><p>Den förvalda domänen används för att komplettera e-postadresser som "
 "endast består av användarens namn.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "An&vänd egna brevmallar för identiteten"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Brevfot"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Bild"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Ogiltigt e-postalias \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Ogiltig e-postadress"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2984,7 +2984,7 @@
 "Det kan orsaka varningsmeddelanden på mottagarsidan vid försök att verifiera "
 "signaturer som skapats med denna inställning."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2993,7 +2993,7 @@
 "En av de inställda OpenPGP-nycklarna innehåller inte någon "
 "användaridentifikation med identitetens inställda e-postadress (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3006,7 +3006,7 @@
 "Det kan orsaka varningsmeddelanden på mottagarsidan vid försök att verifiera "
 "signaturer som skapats med denna inställning."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3015,22 +3015,22 @@
 "Ett av de inställda S/MIME-signeringscertifikaten innehåller inte "
 "identitetens inställda e-postadress (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "E-postadress hittades inte i nyckel eller certifikat"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Den här signaturen är inte giltig"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Redigera identitet \"%1\""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3039,7 +3039,7 @@
 "Vissa egna korgar för identitet finns inte (längre). Därför används de "
 "förvalda korgarna."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Redigera..."
@@ -3070,6 +3070,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Det går inte att ta bort visitkortsfilen."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Vill du verkligen avbryta?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Bekräftelse"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3232,7 +3244,7 @@
 "Exempel finns tillgängliga på <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">http://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Bild"
@@ -3265,7 +3277,7 @@
 msgstr[0] "Distributionslistan %2 är tom. Den kan inte användas."
 msgstr[1] "Distributionslistorna %2 är tomma. De kan inte användas."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Lägg till i adressboken"
@@ -3275,22 +3287,22 @@
 msgid "Contact created successfully"
 msgstr "Kontakt skapad med lyckat resultat"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kontakten kan inte lagras: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Misslyckades lagra kontakt"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Vill du verkligen bilägga korgen \"%1\"?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Bilägg korg"
@@ -3503,14 +3515,14 @@
 msgstr "K&org"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Filtrera korg"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3536,7 +3548,7 @@
 msgstr "&Vidarebefordra"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Filtr&era"
@@ -3561,7 +3573,7 @@
 msgstr "&Hjälp"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Huvudverktygsrad"
@@ -3614,12 +3626,12 @@
 msgid "The file does not contain a message."
 msgstr "Filen innehåller inte ett brev."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Filen innehåller flera brev. Bara det första brevet visas."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3628,32 +3640,32 @@
 "Vill du vidarebefordra markerade brev som bilagor i ett brev (som ett MIME-"
 "sammandrag) eller som individuella brev?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Skicka som sammandrag"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Skicka individuellt"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Filtrerar brev"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Filtrerar brev %1 av %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Flyttar brev"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Tar bort brev"
@@ -3682,27 +3694,27 @@
 msgid "Text Direction Toolbar"
 msgstr "Textriktningsverktygsrad"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "Kmail är inställt att vara nerkopplad. Alla nätverksjobb är vilande."
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Skicka e-post"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Omöjligt att skicka e-post"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "Kmail är inställt att vara uppkopplad. Alla nätverksjobb återupptas."
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3711,37 +3723,37 @@
 "Kmail är inställt att vara uppkopplad. Alla nätverksjobb återupptas när en "
 "nätverksanslutning detekteras"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "Kmail är för närvarande i nerkopplat läge. Hur vill du fortsätta?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Uppkopplad/nerkopplad"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Arbeta uppkopplad"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Arbeta nerkopplad"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Nätverksanslutning detekterades, alla nätverksjobb återupptagna"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Ingen nätverksanslutning detekterades, alla nätverksjobb är vilande"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3750,12 +3762,12 @@
 "Misslyckades öppna automatiskt sparad fil på %1.\n"
 "Orsak: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Misslyckades öppna automatiskt sparad fil"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3763,7 +3775,7 @@
 msgstr[0] "Den här identiteten har ändrats att använda förvald överföring:"
 msgstr[1] "De här %1 identiteterna har ändrats att använda förvald överföring:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3773,43 +3785,47 @@
 msgstr[1] ""
 "De här %1 identiteterna har ändrats att använda den ändrade överföringen:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Skickar brev"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Initierar sändningsprocess..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Resursen %1 är felaktig."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Resursen %1 är felaktig.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Modulen för brevarkivering är inte registrerad."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Modulen för skicka senare är inte registrerad."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Modulen för påminnelse om uppföljning är inte registrerad."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3818,12 +3834,12 @@
 "Kunde inte starta certifikathanteraren. Försäkra dig om att Kleopatra är "
 "riktigt installerad."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Kmail-fel"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3832,28 +3848,28 @@
 "Kunde inte starta importguiden. Försäkra dig om att importguiden är riktigt "
 "installerad."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Kan inte starta importguiden"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Kunde inte starta programmet \"Export av inställningar för personlig "
+"Kunde inte starta programmet \"Export av data för personlig "
 "informationshantering\". Kontrollera installationen."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr ""
-"Kan inte starta programmet \"Export av inställningar för personlig "
+"Kan inte starta programmet \"Export av data för personlig "
 "informationshantering\""
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3862,69 +3878,69 @@
 "Kunde inte starta importguiden. Försäkra dig om att importguiden är riktigt "
 "installerad."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Kan inte starta importguiden"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Ett annat e-postprogram hittades på systemet. Vill du importera data från "
 "det?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Kunde inte starta importguiden. Kontrollera installationen."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Ingen rubrik"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(inga mallar)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Den här korgen har inga utgångsalternativ inställda"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Vill du verkligen att breven i korgen <b>%1</b> ska utgå?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Låt alla brev i korgen utgå"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Utgå"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Töm papperskorgen"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Flytta till papperskorg"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Vill du verkligen tömma papperskorgen?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3933,27 +3949,27 @@
 "<qt>Vill du verkligen flytta alla brev från korgen <b>%1</b> till "
 "papperskorgen?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Flyttade alla brev till papperskorgen"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Vill du verkligen att alla gamla brev ska utgå?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Låt gamla brev utgå?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Utgå"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3964,17 +3980,17 @@
 "skräppost och dessutom ökar sannolikheten för att nuvarande och möjliga "
 "framtida säkerhetsluckor utnyttjas för intrång i ditt system."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Säkerhetsvarning"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Ladda externa referenser"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3989,531 +4005,531 @@
 "<qt>Vill du verkligen ta bort de %1 markerade breven?<br />När de väl har "
 "tagits bort, kan de inte återställas.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Ta bort brev"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Ta bort brev"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Flyttar brev..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Tar bort brev..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Brev borttagna med lyckat resultat."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Brev flyttade med lyckat resultat."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Misslyckades med att ta bort brev."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Borttagning av brev avbruten."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Misslyckades med att flytta brev."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Förflyttning av brev avbruten."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Flytta brev till korg"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Kopierar brev..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Brev kopierade med lyckat resultat."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Misslyckades med att kopiera brev."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Kopiering av brev avbruten."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Kopiera brev till korg"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Flyttar brev till papperskorg..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Tar bort och flyttar brev till papperskorg..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Brev flyttade till papperskorgen med lyckat resultat."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Brev flyttade till papperskorgen eller borttagna med lyckat resultat."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Misslyckades med att flytta brev till papperskorgen."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "Ta bort eller flytta brev till papperskorgen misslyckades."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Förflyttning av brev till papperskorgen avbruten."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Ta bort eller flytta brev till papperskorgen avbrutet."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Gå till korg"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Spara s&om..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Alla br&ev i alla korgar utgår"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Ko&ntrollera post"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Kontrollera post i"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Kontrollera post"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "&Skicka köade brev"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Uppkopplad status (okänd)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Skicka köade brev via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Certifikathantering"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Importera brev..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Felsök Sieve..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Visning av filter&logg..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Importera från en annan e-postklient..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Redigera frånvarosvar..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Anpassa automatisk ar&kivering..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Försenade brev..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Brev med påminnelse om uppföljning..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Ta bort"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "&Flytta tråd till papperskorg"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Flytta tråd till papperskorg"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Ta bort tr&åd"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Sök efter brev..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Markera &alla brev"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Hantering av sändlistor..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Tilldela genväg..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Utgångsinställningar"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Arkivera korg..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Ladda e&xterna referenser"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Kopiera brev till..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Flytta brev till..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Nytt brev..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Nytt"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Brev från &mall"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Nytt brev till sän&dlista..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "S&kapa filter"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Filtrera på &Rubrik..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Filtrera på &Från..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Filtrera på &Till..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Filtrera på &Kopia..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Markera tr&åd"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Markera tråd som &läst"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Markera alla brev i den valda tråden som lästa"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Markera tråd som &oläst"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Markera alla brev i den valda tråden som olästa"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Markera tråd som v&iktig"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Ta bort markering som v&iktig tråd"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Markera tråd som åt&gärdas"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Ta bort markering som åt&gärdas från tråd"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "&Bevaka tråd"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ignorera tråd"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Spara &bilagor..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Kopiera avkodat till..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "&Filtrera med alla filter"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Expandera tråd eller grupp"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Expandera aktuell tråd eller grupp"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "&Komprimera tråd eller grupp"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Komprimera aktuell tråd eller grupp"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Ex&pandera alla trådar"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Expandera alla trådar i aktuell korg"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "K&omprimera alla trådar"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Komprimera alla trådar i aktuell korg"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Visa brev"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "&Nästa brev"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Gå till nästa brev"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Nästa &olästa brev"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Nästa"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Gå till nästa olästa brev"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Föregående brev"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Gå till föregående brev"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Föregående olästa &brev"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Föregående"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Gå till föregående olästa brev"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Nästa olästa &korg"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Gå till nästa korg med olästa brev"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Föregående olästa ko&rg"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Gå till föregående korg med olästa brev"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Nästa olästa &text"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Gå till nästa olästa text"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4522,223 +4538,228 @@
 "Gå neråt i aktuellt brev. Vid slutet på det aktuella brevet, gå till nästa "
 "olästa brev."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Anpassa &filter..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Hantera &Sieve-skript..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Lägg till konto..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Introduktion till Kmail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Visa Kmails välkomstsida"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Anpassa u&nderrättelser..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "A&npassa Kmail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Utgå..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Lägg till favoritkorg..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Prenumeration på serversidan..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Filtrera med alla filter"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Importera och exportera Kmail-data..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Ny adressbokskontakt..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Kopiera brev till korg"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Gå till korg..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Avbryt aktuell åtgärd"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Fokusera på nästa korg"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Fokusera på föregående korg"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Välj korgen med fokus"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Fokusera på första korg"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Fokusera på sista korg"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Fokusera på nästa brev"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Fokusera på föregående brev"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Markera första brev"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Markera sista brev"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Välj brev med fokus"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Ge fokus till snabbsökning"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Utöka markering till föregående brev"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Utöka markering till nästa brev"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Flytta brev till korg"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Använd mindre bandbredd"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Markera alla brev som lästa i korgen och dess underkorgar"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Ta bort dubbletter i korgen och alla dess underkorgar"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "Kontoin&ställningar"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Starta om konto"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Lägg till favoritkorg"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Töm &papperskorgen"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Flytta alla brev till papperskorg"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Ta bort sökkorg"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Redigera sökning..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "Å&ngra"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "Å&ngra: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filteråtgärd %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Sök... <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4749,12 +4770,12 @@
 "ökar risken att du till följd av säkerhetsluckor råkar ut för obehörigt "
 "intrång i ditt system."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Använd HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4769,118 +4790,118 @@
 "Du kan ställa in förenade brevlådor, skapa egna eller inaktivera\n"
 "funktionen helt och hållet i Kmails inställningar av insticksmoduler."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Aktivera förenade brevlådor?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Aktivera förenade brevlådor"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Startar..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Flytta till papperskor&g"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Till papperskorg"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Flytta brev till papperskorg"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Kan inte kopiera objekt. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Nytt brev till..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Skicka svar till..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Vidarebefordra till..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Lägg till i befintligt innehåll"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Öppna i adressboken"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Spara länken som bokmärke"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Redigera kontakt..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Spara länk som..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Hitta i brevet..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Spara bild på disk..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Visa HTML-format"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Visa HTML-format när brev kommer från den här kontakten"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Ladda externa referenser när brev kommer från den här kontakten"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Dela bild..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4889,64 +4910,64 @@
 "Kmail är nu baserat på Akonadi ramverk för personlig informationshantering, "
 "vilket orsakar många ändringar överallt."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Skicka e-post (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Förbättrad sökning"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Stöd för att lägga till anteckningar (anmärkningar) i brev"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Mindre låsningar av det grafiska användargränssnittet, brevkontroll sker i "
 "bakgrunden"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Stöd för insticksprogram"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Ny HTML-återgivning (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Kontroll av nätfiskewebbadress tillagd"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "KDE:s e-postklient"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Hämtar korginnehåll"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Vänta..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Nerkopplad"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4955,7 +4976,7 @@
 "Kmail är för närvarande i nerkopplat läge. Klicka <a href=\"kmail:goOnline"
 "\">här</a> för att koppla upp...</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4964,22 +4985,22 @@
 "Kontot är för närvarande i nerkopplat läge. Klicka <a href=\"kmail:"
 "goResourceOnline\">här</a> för att koppla upp...</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kontakt ändrad med lyckat resultat"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Nya brev i"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Det finns inga olästa brev"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5002,8 +5023,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5094,17 +5115,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Välj översiktskomponent att visa på översiktssidan."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "Kontact-översikt"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontact-översikt"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "©, 2004 Tobias Koenig"
@@ -5150,27 +5171,27 @@
 msgid "All"
 msgstr "Allt"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact-översikt"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontact-översiktsvy"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© 2003-2019 Kontact-utvecklarna"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5197,7 +5218,7 @@
 msgid "&Reply"
 msgstr "Sva&ra"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "Sva&ra..."
@@ -5207,12 +5228,12 @@
 msgid "Reply to A&uthor..."
 msgstr "&Svara till brevskrivaren..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Svara till &alla..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Svara till sänd&lista..."
@@ -5242,7 +5263,7 @@
 msgid "&Edit As New"
 msgstr "R&edigera som nytt"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5433,113 +5454,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Sökningen misslyckades, vissa fel hittades: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Sök efter brev"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Sök"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Direkt..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Som &bilaga"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Spara bilagor..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Rensa markering"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Gå till originalkorg"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 träff"
 msgstr[1] "%1 träffar"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Senaste sökning"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "En giltig korg har inte valts."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Du glömde välja samlingar."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Du glömde definiera villkor."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Alla markerade korgar är tomma eller har inte indexerats."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Du glömde lägga till villkor."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Villkoret Innehåller kan inte användas med färre antal tecken än 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Söker..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Kan inte hämta sökresultat. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Sökning misslyckades."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Sökning färdig."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Sökning stoppad."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5550,21 +5571,21 @@
 "det är att en annan sökkorg med samma namn redan finns. Felet som "
 "returnerades är \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Kopiera brev"
 msgstr[1] "Kopiera %1 brev"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Klipp ut brev"
 msgstr[1] "Klipp ut %1 brev"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Kontrollerar indexstatus..."
@@ -5697,7 +5718,7 @@
 "användning)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5707,7 +5728,7 @@
 "ett e-postkonto detekteras. Frågan ställs bara en gång."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5716,26 +5737,26 @@
 "Värdet används för att bestämma om introduktionen till Kmail ska visas."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Visa radeditorn för snabbsökning i korgar"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Vidarebefordra normalt på plats."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Varna om antal mottagare är fler än:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5746,19 +5767,19 @@
 "frågar om bekräftelse innan brevet skickas. Varningen kan stängas av."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Kontrollera stavning innan sändning"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Begär automatiskt &brevhanteringsbekräftelser"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5775,13 +5796,13 @@
 "</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Intervall för spara automatiskt:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5793,151 +5814,151 @@
 "kan inaktivera spara automatiskt genom att ställa in värdet 0."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Visa rutan för att hantera och infoga textsnuttar i brevfönstret."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "Om markerad, kommer skickade brev att lagras i krypterad form"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "En lista med alla senast använda webbadresser"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "En lista med alla senast använda kodningar"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Visa indikering av kryptografietikett"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Validera standardgenvägen för att skicka"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Identitetsdialogrutans storlek (bara för intern användning)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Sökfönstrets bredd (bara för intern användning)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Sökfönstrets höjd (bara för intern användning)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "Bredden på dialogrutan Anpassa Kmail (bara för intern användning)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "Höjden på dialogrutan Anpassa Kmail (bara för intern användning)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Brevförhandsgranskningsruta"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Visa inte en förhandsgranskningsruta för brev"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Visa förhandsgranskningsruta för brev under brevlistan"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Visa förhandsgranskningsruta för brev intill brevlistan"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Korglista"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Lång korglista"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kort korglista"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Brevmall för nya brev"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Brevmall för svar"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Brevmall för svar till alla"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Brevmall för vidarebefordran"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Citattecken"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Anger policy som används när policy visas"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5947,7 +5968,7 @@
 "användning)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5957,7 +5978,7 @@
 "användning)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5967,7 +5988,7 @@
 "användning)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5977,7 +5998,7 @@
 "användning)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5987,7 +6008,7 @@
 "användning)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6257,7 +6278,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6293,7 +6314,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6622,8 +6643,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Kontrollera webbadress för brevspårning"
+msgid "Scan emails for tracking URLs"
+msgstr "Sök igenom e-post för att spåra webbadresser"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7241,6 +7262,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Aktivera åter alla varningar med \"Fråga inte igen\""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 sekunder"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Ångra skicka"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7296,6 +7327,12 @@
 msgid "Zoom: %1%"
 msgstr "Zoom: %1 %"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Textsnuttar"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Kontrollera webbadress för brevspårning"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Korgnamn och storlek om nära kvot"
 
@@ -9935,10 +9972,6 @@
 #~ "><warning>Det finns inget sätt att ångra borttagningen.</warning>"
 
 #~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Vill du verkligen ta bort gruppen \"%1\"?"
-
-#~ msgctxt "@info"
 #~ msgid ""
 #~ "Do you really want to remove snippet \"%1\"?<nl/><warning>There is no way "
 #~ "to undo the removal.</warning>"
@@ -10960,9 +10993,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Definiera om kontot använder standardidentitet"
 
-#~ msgid "Identity account"
-#~ msgstr "Identitetskonto"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr "RID-sökväg till brevlådan för att bevaka ändringar"
 
diff -Nru kmail-19.04.3/po/sv/kmail-refresh-settings.po kmail-19.12.3/po/sv/kmail-refresh-settings.po
--- kmail-19.04.3/po/sv/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/sv/kmail-refresh-settings.po	2020-03-03 00:34:15.000000000 +0000
@@ -0,0 +1,106 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kmail package.
+#
+# Stefan Asserhäll <stefan.asserhall@bredband.net>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-07 16:44+0100\n"
+"Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
+"Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Stefan Asserhäll"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "stefan.asserhall@bredband.net"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Kmail-assistent för att uppdatera inställningar"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "© 2019 Laurent Montel <montel@kde.org>"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Upphovsman"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Kmail uppdatera inställningar"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Varning"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Rensa inställningar"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Slutför"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Rensa"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Ta bort föråldrade inställningar för \"Dagens tips\": Klar"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Ta bort dialoginställningar i filen `%1`: Klar"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Ta bort filterinställningar i filen `%1`: Klar"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Rensa kataloginställningar i inställningsfilen `%1`: Klar"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Rensa dialogstorlek i inställningsfilen `%1`: Klar"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr "Stäng Kmail och Kontact innan den används."
+
+#~ msgid "PIM Import Tool"
+#~ msgstr "Importverktyg för personlig information"
diff -Nru kmail-19.04.3/po/sv/ktnef.po kmail-19.12.3/po/sv/ktnef.po
--- kmail-19.04.3/po/sv/ktnef.po	2019-07-09 00:20:28.000000000 +0000
+++ kmail-19.12.3/po/sv/ktnef.po	2020-03-03 00:34:15.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-19 09:23+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
diff -Nru kmail-19.04.3/po/tr/akonadi_followupreminder_agent.po kmail-19.12.3/po/tr/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/tr/akonadi_followupreminder_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/tr/akonadi_followupreminder_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_followupreminder_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2017-08-17 08:30+0000\n"
 "Last-Translator: Kaan <kaanozdincer@gmail.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
@@ -17,86 +17,86 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Hatırlatıcıyı Takip Et"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Hatırlatmayı Takip Et"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, fuzzy, kde-format
 #| msgid "Copyright (C) 2014-2017 Laurent Montel"
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Telif Hakkı (C) 2014-2017 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Projeyi Yürüten"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kaan Özdinçer"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kaanozdincer@gmail.com"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Kime"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Konu"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Son Tarih"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Cevap"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Alındı"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "Beklemede"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "İletiyi Göster"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Sil"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, fuzzy, kde-format
 #| msgid "Do you want to remove selected item?"
 msgid "Do you want to remove this selected item?"
@@ -104,12 +104,12 @@
 msgstr[0] "Seçili ögeyi kaldırmak istiyor musunuz?"
 msgstr[1] "Seçili ögeyi kaldırmak istiyor musunuz?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Gelen %1 için cevap"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Bu postayla ilgili hala cevap bekliyorsunuz:"
diff -Nru kmail-19.04.3/po/tr/akonadi_mailfilter_agent.po kmail-19.12.3/po/tr/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/tr/akonadi_mailfilter_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/tr/akonadi_mailfilter_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2017-06-29 08:45+0000\n"
 "Last-Translator: Mete <metebilgin48@gmail.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
@@ -22,17 +22,17 @@
 msgid "Filter Log Viewer"
 msgstr "Süzgeç Günlüğü Görüntüleyici"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Süzgeç eylemlerinin günlüğünü &tut"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -42,23 +42,23 @@
 "düzenleyebilirsiniz. Günlük verisi yalnızca günlük tutma seçeneği aktif "
 "olduğunda toplanacaktır. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Günlük Ayrıntıları"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Günlük deseni tanımı"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Günlük süzgeci kural değerlendirmesi"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -73,34 +73,34 @@
 "verilen tek bir süzgeç için tüm kuralların değerlendirilme sonucu hakkında "
 "geribildirim almanızı sağlayacaktır."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Günlük süzgeci desen değerlendirmesi"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Günlük süzgeç eylemleri"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Günlük boyutu sınırı:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "sınırsız"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -113,7 +113,7 @@
 "günlük verisi miktarı seçtiğiniz değerden daha büyük olursa, en eski veriler "
 "sınır aşımı nedeni ile silinecektir. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -122,65 +122,65 @@
 "%1 dosyasına yazılamıyor:\n"
 "detaylı hata tanımı şöyle \"%2\"."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail Hatası"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "İletiler süzülüyor %2 iletinin %1 tanesi"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Posta süzgeç hareketi ekleme hatası"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Posta süzgeç silme hatası"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Posta süzgeç değiştirme hatası"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Süzgeç kuralları değerlendiriliyor:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Süzgeç kuralları uyuştu.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr ""
 "<b>\"%3\" konumundaki, \"%1\" iletisine, \"%2\" üzerinden süzgeçlemeye "
 "başla :</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "İletiler filtreleniyor"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Posta Süzgeç Günlüğü Etkin"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Hazır"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "%1 içinde süzgeç"
diff -Nru kmail-19.04.3/po/tr/akonadi_sendlater_agent.po kmail-19.12.3/po/tr/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/tr/akonadi_sendlater_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/tr/akonadi_sendlater_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2017-10-03 14:28+0000\n"
 "Last-Translator: Kaan <kaanozdincer@gmail.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@kde.org>\n"
@@ -62,124 +62,124 @@
 msgid "Your emails"
 msgstr "kaanozdincer@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Kime"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Başlık"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Gönder"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Tekrarla"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "İleti Id"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "Bekleyen ileti yok"
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Şimdi gönder"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Sil"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Evet"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Hayır"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "Seçili ögeyi silmek istiyor musunuz?"
 msgstr[1] "Seçili ögeleri silmek istiyor musunuz?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Ögeleri kaldır"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "İletileri de silmek istiyor musunuz?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "İletileri kaldır"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "İleti bulunamadı."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "İleti bulunamadı."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "İleti getirilirken hata oluştu."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "İleti getirilemiyor. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Taşıma oluşturamıyoruz"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "İleti, gerçek bir ileti değil"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "İleti gönderilemiyor."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "İleti gönderildi"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Bir hata oluştur. Tekrardan göndermek istiyor musunuz?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Hata bulundu"
diff -Nru kmail-19.04.3/po/tr/kmail.po kmail-19.12.3/po/tr/kmail.po
--- kmail-19.04.3/po/tr/kmail.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/tr/kmail.po	2020-03-03 00:34:16.000000000 +0000
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2017-10-23 09:32+0000\n"
 "Last-Translator: İşbaran <isbaran@gmail.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
@@ -193,8 +193,8 @@
 msgstr "Her adres için çoklu şifreleme anahtarı"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -301,27 +301,27 @@
 "KMail bu klasörde bir tam olarak bir e-posta listesi bulunamadı. Lütfen "
 "adresleri elle doldurun."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Kota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Kullanım:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Durum:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% tam"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "%1/%2 kullanılıyor"
@@ -343,7 +343,7 @@
 "aşağıdaki düğmeye tıklayın ve bu klasöre atayacağınız tuş(lar)a basın.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Şablonlar"
@@ -354,106 +354,106 @@
 msgstr "Bu klasör için özel ileti şablonları &kullan"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Genel Şablonları Kopyala"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Görünüm"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Ö&zel simgeleri kullan"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normal:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Okunmamış:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "İleti Listesinde Gönderen/Alıcı Sütununu Göster"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "Sütunu &göster:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Gönderen"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Alıcı"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "İleti Listesi"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Öntanımlı toplamayı kullan"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Toplama"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Öntanımlı temayı kullan"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tema"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Öntanımlı İleti Biçimi"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "HTML iletileri düz metne tercih et"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Düz Metni HTML'ye Tercih Et"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Genel Ayarları Kullan"
@@ -463,101 +463,106 @@
 msgid "Retrieval Options"
 msgstr "Alım Seçenekleri"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Ki&mlik"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Alma"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Gönderme"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Giden Hesaplar (en az bir hesap ekleyin):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Genel Seçenekler"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Göndermeden önce onayla"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Göndermeden önce yazım denetimi yap"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Hiç Bir Zaman Otomatik Gönderme"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "El ile E-Posta Kontrolünde Gönder"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "Tüm İleti Denetimlerinde"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Şimdi Gönder"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Sonra Gönder"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Giden Kutusu'ndaki iletileri:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Ö&ntanımlı gönderme yöntemi:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Posta Hesabı Ekle..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Özel Hesap..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -566,30 +571,30 @@
 "Hesap sihirbazı başlatılamıyor. AccountWizard'ın doğru şekilde yüklü "
 "olduğundan emin olun."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Hesap sihirbazı başlatılamadı"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Elle Posta Kontrolüne Dahil Et"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "KMail Kapanırken Çevrimdışı Kipe Geç"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Açılışta posta kontrolü yap"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -646,7 +651,7 @@
 msgid "Fixed Width Font"
 msgstr "Sabit Yazı Tipi Genişliği"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Düzenleyici"
@@ -948,61 +953,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Etiket oluşturamayız. Aynı isimde başka bir etiket var."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Genel"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Standart Şablonlar"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Özel Şablonlar"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Konu"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Karakter Kümesi"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Başlıklar"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Eklentiler"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Otomatik Düzeltme"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Resmi Otomatik Boyutlandır"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "İmza"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1011,12 +1016,12 @@
 "Bir ileti oluşturmaya başlarken yapılandırılmış\n"
 "imzayı otomatik olarak ekle"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "İmzayı alıntılanan metnin üstüne ekle"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1025,18 +1030,18 @@
 "İmzadan önce RFC uyumlu imza ayracını\n"
 "(iki çizgi ve satırda bir boşluk) ekle"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Yanıtlarken, mevcut imzayı alıntılama"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Biçim"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1047,7 +1052,7 @@
 "metin varsa; tüm mesaj yerine sadece\n"
 "sadece seçili mesaj alıntı yapılacaktır."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1058,17 +1063,17 @@
 "oluşturulduğunda bile, yanıtlarken,\n"
 "alıntı yapılmış tüm metnin önüne tırnak işareti ekle."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Belirtilen genişlikte otomatik sözcük kaydırmayı etkinleştir"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Otomatik sözcük kaydırma için metin genişliğini ayarla"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1079,7 +1084,7 @@
 "orijinal biçimdeki mesajı alıntıla. Seçili değilse,\n"
 "öntanımlı olarak düz metin şeklinde yanıtlanacaktır."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1090,34 +1095,34 @@
 "Kalın, eğik ve altı çizili metinler, listeler ve harici referanslar\n"
 "desteklenmektedir."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "İçinde"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Eklenti Olarak"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Öntanımlı yönlendirilen ileti biçimini ayarla"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Öntanımlı yönlendirme türü:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Alıcılar"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1128,17 +1133,17 @@
 "Bunu \"Seçenekler - İleti Okundu Bildirimi İste\" kullanarak her iletiye "
 "özel seçebilirsiniz."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Çok fazla sayıda alıcı belirtildiğinde uyar"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "Uyarı için en fazla alıcı sayısını ayarla"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1155,7 +1160,7 @@
 "Ancak bunun dağıtım veya posta listelerini hesaba\n"
 "katmadığını unutmayın."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1164,18 +1169,18 @@
 "En son girilen adresleri hatırla\n"
 "ve alıcı tamamlanmasında öner"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Kayıt yok"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "En fazla son kullanılan adres:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1184,24 +1189,24 @@
 "Tamamlanmak için hatırlanacak yakın zamanda kullanılan adreslerin\n"
 "azami sayısı."
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Tamamlamayı Yapılandır..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Otomatik kayıt yok"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Otomatik kayıt yok"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1209,18 +1214,18 @@
 msgstr[0] " dakika"
 msgstr[1] " dakika"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "İletiyi belirtilen aralıklarda otomatik olarak kaydet"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "&Yanıtlama Konusu Önekleri"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1229,59 +1234,59 @@
 "Aşağıdaki önekleri tanı\n"
 "(büyük-küçük harf duyarsız):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "&Ekle..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Kaldır"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Değiştir..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Yeni yanıt ön ekini girin:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Yönlendirme &Konusu Önekleri"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Ekle..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Ka&ldır"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Değiştir..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Yeni iletim önekini girin:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1290,88 +1295,88 @@
 "Bu liste, giden her e-posta için yukarıdan aşağıya doğru denetlenecektir."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Değiştir..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Karakter kümesini girin:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "&Yanıtlarken ya da iletirken asıl karakter kümesini koru (mümkünse)."
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Bu karakter kümesi desteklenmiyor."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "Ö&zel İleti kimliği son ekini kullan"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Özel &İleti-kimliği (message-id) son eki:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Özel mime başlık etiketleri tanımla:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "İsim"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Değer"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "Ye&ni"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "İsi&m:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Kaynak:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "Geçersiz tarih"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook uyumlu ek isimlendirmesi"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1380,39 +1385,39 @@
 "Outlook'un İngilizce olmayan eklenti isimlerini anlayabilmesi için bu "
 "seçeneği aktif hale getirin"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Eksik eklerin bulunmasını etki&nleştir"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Bu anahtar kelimelerin herhangi birini dosya eklentisi isteği olarak algıla:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Yeni anahtar kelimeyi girin:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Azami Eklenti Boyutu:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Sınır yok"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1500,7 +1505,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer Plugins"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Düzenleyici Eklentileri"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1614,7 +1619,7 @@
 msgid "Archive Folder"
 msgstr "Klasörü Arşivle"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1680,19 +1685,19 @@
 msgid "Notification"
 msgstr "Bildirim"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 eklenti (%2)"
 msgstr[1] "%1 eklenti (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Eklenti listesini gizle"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Eklenti listesini göster"
@@ -1709,330 +1714,330 @@
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "Bu mesajın yazım kontrolünü yapmak için kullanılacak sözlüğü seçin"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "Bu iletinin kaydedileceği gönderilmiş-posta klasörünü seçin"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "Bu mesajı gönderirken kullanılacak olan hesabı seçin"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Bu ileti için \"Kimden:\" e-posta adresini ayarla"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Bu mesaja için bir konu ayarlayın"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Kimlik:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Sözlük:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "&Gönderilmiş-İletiler klasörü:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "&Posta gönderici:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Kimden:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "&Konu:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "İletiyi &Gönder"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "Şunu Kullanarak G&önder"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Gönder"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Son&ra Gönder"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Şunu Kullanarak Son&ra Gönder"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Ta&slak Olarak Kaydet"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "E-postayı Taslak klasöründe kaydet"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Şablon Olarak K&aydet"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "E-postayı Şablon klasöründe kaydet"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Dos&yaya Kaydet"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "E-postayı metin veya html dosyası olarak kaydet"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Metin Dosyası Ekle"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Son Kullanılan Metin Dosyasını Ekle"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Ad&res Defteri"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Adres Defterini Aç"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Yeni Düzenleyici"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "&Alıcıları Seç..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "&Gönderim Listesini Kaydet..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "&Eklenti Olarak Yapıştır"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "B&oşlukları Temizle"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "S&abit Yazı Tipi Kullan"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Acil"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Silme Bildirimi İste"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Silme Bildirimi İste"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Sözcük kaydırma"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Kod Parçacıkları"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr " &Otomatik Yazım Denetimi"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Zengin Metin Düzenleme"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Zengin Metin"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Zengin metin düzenleme kipini aç/kapat"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Tüm Alanlar"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "Ki&mlik"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Sözlük"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "&Gönderilmiş-İletiler Klasörü"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Posta Gönderici"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Gönderen"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Ko&nu"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Alt İmz&a"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Üst İm&za"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "İ&mzayı İmleç Konumuna Ekle"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "Yazım &Denetleyici..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Yazım Denetleyici..."
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "İletiyi Şifr&ele"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Şifrele"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "İletiyi İm&zala"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "İmzala"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Şifreli İleti Biçimi"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Bu mesaj için bir kriptografik biçim seçin"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Hatırlatıcı Takip Etme Oluştur..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "KMail Uygulamasını Yapılandır..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2041,53 +2046,53 @@
 "<qt>Bu, menü çubuğunu tamamen gizleyecektir. Tekrar %1 yazarak "
 "gösterebilirsiniz.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Menü çubuğunu gizle"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Satır: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr "Sütun: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ÜZRYZ"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "EKL"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Yazım denetimi: açık"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Yazım denetimi: kapalı"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Şablon Olarak Yeniden Kay&det"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "Ta&slak Olarak Kaydet"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2095,7 +2100,7 @@
 msgstr ""
 "Bu iletiyi Şablonlar klasörüne yeniden kaydet. Daha sonra kullanılabilir."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2104,84 +2109,84 @@
 "Bu iletiyi Taslaklar klasörüne kaydet. Daha sonra düzenlenerek "
 "gönderilebilir."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
 "Bu iletiyi daha sonra düzenlemek üzere kaydetmek mi, silmek mi istiyorsunuz?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Düzenleyiciyi Kapat"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Mesajı otomatik kaydetme başarısız"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "İleti Gönderme Başarısız"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Dosya Ekle"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "&İleti İçi Resim Olarak Ekle"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "&Eklenti Olarak Ekle"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Eklenti adı:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "Geçersiz tarih"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "Adresi İletiye Ekle"
 msgstr[1] "Adresleri İletiye Ekle"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Dosyayı &Eklenti Olarak Ekle"
 msgstr[1] "Dosyaları &Eklenti Olarak Ekle"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Pano metinini eklenti olarak ekle"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "isimsiz"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2193,12 +2198,12 @@
 "bir şifreleme yöntemi (OpenPGP ya da S/MIME) belirtmediniz. </p><p>Lütfen bu "
 "kimlik için kullanılacak anahtarları seçin.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Tanımlanmamış Şifre Açma Anahtarı"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2209,12 +2214,12 @@
 "or S/MIME) imzalama anahtarı belirlemelisiniz.</p><p>Lütfen kimlik "
 "yapılandırmanızdan kullanmak istediğiniz anahtarı seçin</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Tanımlanmamış İmzalama Anahtarı"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2225,66 +2230,66 @@
 "kimlikleriniz için e-posta adresinizi belirlemelisiniz. Bu işlemden sonra "
 "her ileti için e-posta adresi girmek zorunda kalmayacaksınız."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr "Kime: veya CC/BCC alanına en az bir alıcı belirtmelisiniz."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Kime göndereceğinizi belirtmediniz. İleti yine de gönderilsin mi?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Kime: alanı belirtilmemiş"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Bir konu belirtmediniz. İleti yine de gönderilsin mi?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Bir Konu Belirtilmedi"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "&Bu şekliyle gönder"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Konuyu Belirt"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Bir taslağı şifreleyebilmek için en az bir alıcı belirtmelisiniz."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "E-posta göndermek hakkında..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Onay Gönder"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Şimdi Gö&nder"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2293,22 +2298,22 @@
 "%1 adet alıcıdan fazla kişiye posta yollamaya çalışıyorsunuz. Yine de ileti "
 "yollansın mı?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Çok fazla alıcı"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "&Bu şekilde gönder"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Alıcıları &Düzenle"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2317,22 +2322,22 @@
 "HTML kipinin kapatılması, metin biçimlendirmesinin kaybolmasına yol açacak. "
 "Emin misiniz?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Biçimlendirme kaldırılsın mı?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Biçimlendirmeyi Kapat"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Düz Metin Biçimlendirmesi Ekle"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2341,7 +2346,7 @@
 "Bu alıcı için yüksek güvenlik şifrelemesi kullanılacak (şifreleme anahtarına "
 "tamamen güveniliyor). Ayrıntılar için simgeye tıklayın."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2350,7 +2355,7 @@
 "Bu alıcı için orta güvenlik şifrelemesi kullanılacak (şifreleme anahtarına "
 "büyük ölçüde güveniliyor). Ayrıntılar için simgeye tıklayın."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2359,7 +2364,7 @@
 "Bu alıcı için düşük güvenlik şifrelemesi kullanılacak (şifreleme anahtarına "
 "güvenilmiyor). Ayrıntılar için simgeye tıklayın."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2369,7 +2374,7 @@
 "Bu alıcıya e-posta şifrelenecek, ancak şifrelemenin güvenliği bilinmiyor "
 "(şifreleme anahtarı doğrulanamadı). Ayrıntılar için buraya tıklayın."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2447,7 +2452,7 @@
 msgid "External editor was started."
 msgstr "Harici düzenleyici başlatıldı."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2456,14 +2461,14 @@
 "Aktarım bulunamadı. Lütfen kullandığınız mail aktarımını doğru olduğunu "
 "kontrol edin."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Sent Folder is not defined. Please verify it before to send it."
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Gönderilen Klasörü tanımlı değil. Lütfen göndermeden önce bunu kontrol edin."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2471,7 +2476,7 @@
 msgstr ""
 "Arşiv klasörü tanımlanmamış. Lütfen şu hesap için ayarları onaylayın: %1"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
@@ -2500,11 +2505,6 @@
 msgid "Message will not be encrypted"
 msgstr "İleti şifrelenmeyecek"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Metin Parçacıkları"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2549,27 +2549,27 @@
 msgid "Cannot move messages."
 msgstr "İletiler taşınamıyor."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Klasör alınamıyor. Bildirilen hata: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Klasör döndürülmedi."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Üst klasör alınamıyor. Bildirilen hata: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Klasör listesi döndürülmedi."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "İletiler arşivlendi"
@@ -2610,48 +2610,48 @@
 msgid "&Existing identities:"
 msgstr "&Mevcut kimlikler:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Yeni anahtar çifti oluşturulurken hata: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Anahtar Oluşturma Hatası"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Anahtar yok"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Yeni bir anahtar çifti oluştur"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Yeni anahtar çifti oluşturuluyor..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Kimliği Düzenle"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Genel"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Adınız:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2662,12 +2662,12 @@
 "adınızı içermelidir;</p><p>eğer bu alanı boş bırakırsanız, gerçek adınız "
 "gösterilmeyecek, yalnızca e-posta adresiniz gösterilecektir.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Kurum:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2678,12 +2678,12 @@
 "kurumunuzun adını içermelidir.</p><p>Genellikle bu alanı boş bırakmak "
 "normaldir.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&E-posta Adresi:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2698,12 +2698,12 @@
 "alana takma adresler girebilirsiniz.</p><p>Bu alanı boş bırakır ya da hatalı "
 "yazarsanız, insanlar size yanıt yazmakta sorun yaşayacaklardır.</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "&Takma E-postalar:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2720,12 +2720,12 @@
 "org<br>soyad@ornek.org</td></tr></table><p>Her satıra bir takma adres yazın</"
 "p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Şifreleme"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2747,12 +2747,12 @@
 "</p><p>Anahtarlar hakkında daha fazla bilgiyi <a>http://www.gnupg.org</a> "
 "adresinden bulabilirsiniz.</p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP imzalama anahtarı:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2776,12 +2776,12 @@
 "gönderme süreci etkilenmez.</p><p>Anahtarlar hakkında daha geniş bilgiyi "
 "<a>http://www.gnupg.org</a> adresinden edinebilirsiniz</p>.</qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP şifreleme anahtarı:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2794,12 +2794,12 @@
 "iletileri S/MIME kullanarak dijital imzalayamayacaktır; normal posta "
 "işlevleri bundan etkilenmeyecektir.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME imzalama sertifikası:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2814,39 +2814,39 @@
 "kullanarak dışarı giden iletilerin kopyalarını şifreleyemebilir; normal "
 "posta işlevleri bundan etkilenmeyecektir.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME şifreleme sertifikası:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Tercih edilen biçim:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "İletileri otomatik imzala"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Mümkün olduğunda iletileri şifrele"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "&Yanıt adresi:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2864,12 +2864,12 @@
 "göndermek isteyebilirsiniz.</p><p>Eğer emin değilseniz bu alanı boş bırakın."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "&CC adresleri:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2886,12 +2886,12 @@
 "posta adreslerinin arasına virgül koyun.</p><p>Eğer emin değilseniz bu alanı "
 "boş bırakın.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&BCC adresleri:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2908,57 +2908,57 @@
 "p><p>Birden fazla BCC alıcısı belirlemek için e-posta adreslerinin arasına "
 "virgül koyun.</p><p>Eğer emin değilseniz bu alanı boş bırakın.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "&Sözlük:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "&Gönderilmiş postalar klasörü:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Tas&laklar klasörü:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Şablon klasörü:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Giden E-posta Hesabı:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "İletiye vCard'ımı iliştir"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Oluştur..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Otomatik düzeltme dili:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Öntanımlı alan adını geri yükle"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Öntanımlı &alan:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2967,33 +2967,33 @@
 "<qt> <p>Öntanımlı alan. Kullanıcı adını tamamlamak için e-posta adreslerinin "
 "tamamınından meydana gelir.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "Bu kimlik için ö&zel ileti şablonları kullan"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "İmza"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Resim"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Geçersiz Takma E-posta\"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Geçersiz E-posta Adresi"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3006,7 +3006,7 @@
 "Bu yapılandırma ile ileti göndermek alıcı tarafında imzaların doğrulanması "
 "sırasında uyarılar çıkmasına neden olur."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3015,7 +3015,7 @@
 "Yapılandırılan OpenPGP şifreleme anahtarları, bu kimlik için tanımlanan e-"
 "posta adresine sahip hiç bir kimlik bilgisi (ID) içermiyor (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3028,7 +3028,7 @@
 "Bu durum, iletiyi alan tarafta, bu düzenle yapılmış imzaları doğrulamaya "
 "çalışırken hata iletileri görüntülenmesine neden olabilir."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3037,22 +3037,22 @@
 "Yapılandırılan S/MIME şifreleme sertifikalarından bir tanesi bu kimlik için "
 "yapılandırdığınız e-posta adresini içermiyor (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Anahtarda/Sertifikada E-Posta Adresi Bulunamadı"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "İmza dosyası geçerli değil."
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "\"%1\" Kimliğini Düzenle"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3061,7 +3061,7 @@
 "Kimlik için tanımlanmış olan bazı özel klasörler (artık) yok; bu nedenle "
 "öntanımlı klasörler kullanılacak."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Düzenle..."
@@ -3092,6 +3092,22 @@
 msgid "We cannot delete vCard file."
 msgstr "vCard dosyasını silemeyiz."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+#| msgctxt "@info"
+#| msgid "Do you really want to execute <filename>%1</filename>?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+"Gerçekten <filename>%1</filename> uygulamasını çalıştırmak istiyor musunuz?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Onay Gönder"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3259,7 +3275,7 @@
 "Örnekler <a href=\"http://ace.home.xs4all.nl/X-Faces/\">http://ace.home."
 "xs4all.nl/X-Faces/</a> adresinden bulunabilir."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Resim"
@@ -3292,7 +3308,7 @@
 msgstr[0] "%2 dağıtım listesi boş olduğundan bunu kullanamazsınız."
 msgstr[1] "%2 dağıtım listeleri boş olduğundan bunu kullanamazsınız."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Adres Defterine Ekle"
@@ -3302,22 +3318,22 @@
 msgid "Contact created successfully"
 msgstr "Başarılı bir şekilde oluşturuldu"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Kişi kaydedilemedi: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Kişi kaydetme başarısız"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "\"%1\" klasörünü iliştirmek istiyor musunuz?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Klasör İliştir"
@@ -3530,14 +3546,14 @@
 msgstr "&Klasör"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Klasöre Süzgeçleri Uygula"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3563,7 +3579,7 @@
 msgstr "&Yönlendir"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "&Filtre Uygula"
@@ -3588,7 +3604,7 @@
 msgstr "&Yardım"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Ana Araç Çubuğu"
@@ -3643,12 +3659,12 @@
 msgid "The file does not contain a message."
 msgstr "Dosya bir ileti içermiyor."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Dosya birden fazla ileti içeriyor. Yalnızca ilk ileti gösteriliyor."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3657,32 +3673,32 @@
 "Seçilmiş iletileri tek bir ileti içinde (MIME özeti şeklinde) ek dosyalar "
 "olarak mı, yoksa her birini ayrı ileti olarak mı yönlendirmek istersiniz?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Özet Olarak Gönder"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Ayrı Gönder"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "İletiler filtreleniyor"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "İletiler filtreleniyor %2 iletinin %1 tanesi"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "İletiler taşınıyor"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "İletiler siliniyor"
@@ -3711,29 +3727,29 @@
 msgid "Text Direction Toolbar"
 msgstr "Metin Yönü Araç Çubuğu"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail çevrimdışı olarak ayarlanmış; tüm ağ işleri beklemede"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "E-posta göndermek hakkında..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail çevrimiçi olarak ayarlandı; tüm ağ işlemleri devam ettiriliyor"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3742,39 +3758,39 @@
 "KMail çevrimiçi olarak ayarlandı; ağ bağlantısı tespit edildiğinde tüm ağ "
 "işlemlerine devam edilecek"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 "KMail şu anda çevrimdışı çalışıyor. İşlemi nasıl gerçekleştirmek "
 "istiyorsunuz?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Çevrimiçi/Çevrimdışı"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Çevrimiçi Çalış"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Ağ bağlantısı tespit edildi, tüm ağ görevlerine devam ediliyor"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "Ağ bağlantısı tespit edildi, tüm ağ görevleri durduruldu"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3783,12 +3799,12 @@
 "%1 konumundaki otomatik kaydetme dosyası açılamadı.\n"
 "Sebep: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Otokayıt Dosyayı Açma Başarısız"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3799,7 +3815,7 @@
 "Aşağıdaki %1 adet kimlik, öntanımlı taşıyıcıyı kullanacak şekilde "
 "değiştirildi:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3810,43 +3826,46 @@
 "Aşağıdaki %1 adet kimlik, değiştirilmiş taşıyıcıyı kullanacak şekilde "
 "ayarlandı:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "İletiler gönderiliyor"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Gönderme işlemi başlatılıyor..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "%1 kaynağı bozuk."
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Archive Posta Yardımcısı kayıtlı değildi."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Daha Sonra Gönder Yardımcısı kayıtlı değil."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Takip Et Anımsatıcı Aracı kayıtlı değil."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3855,12 +3874,12 @@
 "Sertifika yöneticisi başlatılamıyor; Kleopatra'nın doğru şekilde yüklü "
 "olduğundan emin olun."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail Hatası"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3869,28 +3888,32 @@
 "Aktarma sihirbazı başlatılamıyor. ImportWizard'ın doğru şekilde yüklü "
 "olduğundan emin olun."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Aktarma sihirbazı başlatılamadı"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "\"PIM (Kişisel Bilgi Yöneticisi) Dışa Aktarıcı Ayarı\" programı "
 "başlatılamadı. Lütfen kurulumunuzu kontrol edin."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr ""
 "\"PIM (Kişisel Bilgi Yöneticisi) Dışa Aktarıcı Ayarı\" programı "
 "başlatılamadı."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3899,69 +3922,69 @@
 "ImportWizard başlatılamıyor. ImportWizard'ın doğru şekilde yüklü olduğundan "
 "emin olun."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Aktarma sihirbazı başlatılamadı"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "Sistemde başka bir posta uygulaması bulundu. Verilerini içe aktarmak ister "
 "misiniz?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "Aktarma sihirbazı başlatılamıyor. Kurulumuzunu kontrol edin."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Konusuz"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(şablon yok)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Bu klasör için herhangi bir süre dolumu seçeneği ayarlanmamış"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt><b>%1</b> klasörünü gerçekten silmek istiyor musunuz?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Klasörün Süresini Doldur"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "&Süresini Doldur"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Çöp Kutusunu Boşalt"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Çöpe Taşı"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Çöp klasörünü gerçekten boşaltmak istiyor musunuz?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3970,27 +3993,27 @@
 "<qt>Gerçekten <b>%1</b> klasöründeki tüm iletileri çöpe taşımak istiyor "
 "musunuz?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Bütün iletiler çöp kutusuna taşındı"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Tüm eski iletilerin süresinin dolmasını istiyor musunuz?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Eski İletilerin Süresini Doldur?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Süresini doldur"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4001,17 +4024,17 @@
 "savunmasız yapar ve sisteminizin güvenlik açıklarını sezen programlarla "
 "saldırıya uğramasına sebep olabilir."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Güvenlik Uyarısı"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Dış Referansları Yükle"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4026,535 +4049,535 @@
 "<qt>Seçili %1 iletiyi gerçekten silmek istiyor musunuz?<br />Bir kez "
 "silinirse, bunları geri getiremezsiniz.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "İletileri Sil"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "İletiyi Sil"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "İletiler taşınıyor..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "İletiler siliniyor..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "İleti başarılı bir şekilde silindi."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "İleti başarılı bir şekilde taşındı."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "İletiler silinemedi."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "İletileri silme işlemi iptal edildi."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "İletiler taşınamadı."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "İletilerin taşınması işlemi iptal edildi."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "İletiyi Klasöre Taşı"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "İletiler kopyalanıyor..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "İleti başarılı bir şekilde kopyalandı."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "İletiler taşınamadı."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "İleti kopyalama işlemi iptal edildi."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "İletileri Klasöre Kopyala"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "İletiler çöp kutusuna taşınıyor..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "İletiler çöp kutusuna taşınıyor..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "İletiler başarılı bir şekilde çöp kutusuna taşındı."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "İletiler başarılı bir şekilde çöp kutusuna taşındı."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "İletiler çöp kutusuna taşınamadı."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "İletiler çöp kutusuna taşınamadı."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "İletileri çöp kutusuna taşıma işlemi iptal edildi."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "İletileri çöp kutusuna taşıma işlemi iptal edildi."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Klasöre Geç"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "&Farklı Kaydet..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "&Tüm Klasörlerin Süresini Doldur"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "&Postayı Kontrol Et"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Şu Hesaptaki Postayı Kontrol Et"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Postayı Kontrol Et"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Kuy&ruktaki İletileri Gönder"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Bağlantı durumu (bilinmiyor)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Kuyruktaki İletileri Gönder"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Sertifika Yöneticisi"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "İ&letileri İçeriye Aktar..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "Sieve &Hata Ayıklaması..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "&Filtre Günlüğü İzleyicisi..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Başka E-Posta İstemcisi'nden İçe Aktar..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "\"Ofis Dışında\" Yanıtlarını Düzenle..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "&Otomatik Arşivlemeyi Yapılandır..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Gecikmeli İletiler..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Takip Et Anımsatıcı İletileri..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Sil"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "&Tartışmayı Çöpe Taşı"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Tartışmayı çöp kutusuna taşı"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Ta&rtışmayı Sil"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "İ&leti Bul..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "&Tüm İletileri Seç"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&E-Posta Listesi Yönetimi..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Kısayol Ata..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Zaman Aşımı Ayarları"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "Klasörü &Arşivle..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Dış &Referansları Yükle"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Mesajı Kopyala..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Mesajı Taşı..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Yeni İleti..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Yeni"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Şablondan &İleti"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "&E-posta Listesine Yeni İleti..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Filtre &Oluştur"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Konuya Göre &Filtrele..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "&Gönderene Göre Filtrele..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "&Gidene Göre Filtrele..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "&Karbon Kopyaya Göre Filtrele..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "&Tartışmayı İşaretle"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Tartışmayı &Okunmuş İşaretle"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Bu tartışmadaki bütün iletileri okunmuş işaretle"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Tartışmayı &Okunmamış İşaretle"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Tartışmadaki bütün iletileri okunmamış işaretle"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Tartışmayı Ö&nemli İşaretle"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Tartışmanın Ö&nemli İşaretini Kaldır"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Tartışmayı Yapılacak &Ögesi İşaretle"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Tartışmanın &Eylem Ögesi İşaretini Kaldır"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Tartışmayı İ&zle"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Tartışmayı Yoksay"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "E&klentileri Kaydet..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Şifresi Açılmış Olanı şuraya Kopyala"
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Tüm &Filtreleri Uygula"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "T&artışmayı / Grubu Genişlet"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Yapılan tartışmayı veya grubu genişlet"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Ta&rtışmayı / Grubu Topla"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Yapılan tartışmayı veya grubu topla"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "B&ütün Tartışmaları Genişlet"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Geçerli klasördeki tüm tartışmaları genişlet"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Bü&tün Tartışmaları Kapat"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Geçerli klasördeki tüm tartışmaları topla"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "İ&letiyi Görüntüle"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "S&onraki İleti"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Sonraki iletiye git"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Sonraki Ok&unmayan"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Sonraki"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Sonraki okunmayan iletiye git"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "&Önceki İleti"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Önceki iletiye git"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Ö&nceki Okunmayan"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Önceki"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Önceki okunmayan iletiye git"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Sonraki Okunmamış &Klasör"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Okunmamış iletileri olan sonraki klasöre git"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Önceki Okunmamış Diz&in"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Okunmamış iletileri olan önceki klasöre git"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Sonraki Ok&unmamış Metin"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Sonraki okunmayan metine git"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4563,218 +4586,224 @@
 "Eğer okuduğunuz iletinin sonundaysanız, aşağı ok tuşuyla bir sonraki "
 "okunmamış iletiye geçebilirsiniz."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "&Filtreleri Yapılandır..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Sieve Betiklerini &Yönet..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Hesap Ekle..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail Uygulamasına &Giriş"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "KMail'in hoş geldiniz ekranını göster"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "&Bildirimleri Yapılandır..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "&KMail Uygulamasını Yapılandır..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Süresini Doldur..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Yer İmi Klasörü Ekle..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Sunucuya Üyelik..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Tüm Süzgeçleri Uygula"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "KMail Verisini İçe/Dışa Aktar..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Yeni Adres Defteri Kişisi..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "İletiyi Klasöre Kopyala"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Klasöre Geç..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Geçerli İşlem Hakkında"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Sonraki Klasöre Odaklan"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Önceki Klasöre Odaklan"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Klasörü Odaklanarak Seç"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Sonraki İlk Klasöre Odaklan"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Sonraki Son Klasöre Odaklan"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Sonraki İletiye Odaklan"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Önceki İletiye Odaklan"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Odaklanan İlk İletiyi Seç"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Odaklanan Son İletiyi Seç"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Odaklanan İletiyi Seç"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Hızlı Aramayı Odakla"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Seçimi Önceki İletiye Genişlet"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Seçimi Sonraki İletiye Genişlet"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "İletiyi Klasöre Taşı"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Daha Az Bant Genişliği Kullan"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Bu Klasör ve Tüm Alt Klasörlerindeki İletileri Okundu İşaretle"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Bu Klasör ve Tüm Alt Klasörlerindeki Yinelenmiş Girişleri Kaldır"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "A&yarlar"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "Kimlik Adı"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Sık Kullanılanlara Ekle"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "Çö&p Kutusunu Boşalt"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "Tüm İletileri &Çöp Kutusuna Taşı"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "Aramayı &Sil"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Aramayı Düzenle..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Geri al"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Geri al: \"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Filtre %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4782,7 +4811,7 @@
 msgid "Search... <%1>"
 msgstr "Ara...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4793,12 +4822,12 @@
 "ve sisteminizin güvenlik açıklarını sezen programlarla saldırıya uğramasına "
 "sebep olabilir."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "HTML Kullan"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4808,118 +4837,118 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "İ&ptal"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Başlatılıyor..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Sil"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Çöpe Gönder"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "İletiyi çöp kutusuna taşı"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Öge kopyalanamıyor. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Yeni İleti..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Yanıtla..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Yönlendir..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Mevcut Kişiye Ekle"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Adres Defterinden Aç"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Bu Bağlantıyı Yer İmlerine Kopyala"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Kişiyi düzenle..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Bağlantıyı Farklı Kaydet..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "İlet&i içerisinde Bul..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Resmi Diske Kaydet..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "HTML Biçimini Göster"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "Bu kişiden posta geldiğinde HTML biçimini göster"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "Bu kişiden gelen postalar için dış referansları yükle"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Resmi paylaş..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4928,62 +4957,62 @@
 "KMail her yönden birçok yenilik içeren Akonadi Kişisel Bilgi Yönetimi "
 "çatısını kullanıyor."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "E-posta gönder (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "İyileştirilmiş aramalar"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Postalara not (ek açıklama) ekleme desteği"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "Daha az arayüz takılmaları, posta kontrolleri arkaplanda yapılıyor"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Eklenti desteği"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Yeni HTML Motoru (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Sahte Adres Denetimi Eklendi"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "KDE E-Posta İstemcisi"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Klasör İçerikleri Alınıyor"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Lütfen Bekleyin . . ."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4992,7 +5021,7 @@
 "KMail şu anda çevrimdışı kipinde çalışıyor. Çevrimiçi kipine geçmek için <a "
 "href=\"kmail:goOnline\">buraya tıklayın...</a></p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5001,22 +5030,22 @@
 "Hesap şu anda çevrimdışı kipinde çalışıyor. Çevrimiçi kipine geçmek için <a "
 "href=\"kmail:goResourceOnline\">tıklayın...</a></p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Kişi başarılıyla düzenlendi"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Yeni İletiler"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Okunmamış mesaj yok"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5039,8 +5068,8 @@
 msgstr "Telif hakları © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5133,17 +5162,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Özel sayfasında görüntülenmesini istediğiniz eklenti özetlerini seçin."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsözet"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontact Özet"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -5189,28 +5218,28 @@
 msgid "All"
 msgstr "Tümü"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact Özet"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontact Özet Görünümü"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 2003-2017 The Kontact developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2017 Kontact geliştiricileri"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5237,7 +5266,7 @@
 msgid "&Reply"
 msgstr "&Yanıtla"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Yanıtla..."
@@ -5247,12 +5276,12 @@
 msgid "Reply to A&uthor..."
 msgstr "&Yazana Yanıtla..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "&Tümüne Yanıtla..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "E-posta &Listesine Yanıtla..."
@@ -5283,7 +5312,7 @@
 msgid "&Edit As New"
 msgstr "İletiyi Dü&zenle"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5474,113 +5503,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Arama başarısız, bulunan bazı hatalar: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "İletileri Bul"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Ara"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Alıntı Yaparak Yönlendir..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "&Eklenti Olarak..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Eklentileri Kaydet..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Seçimi Temizle"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Özgün klasöre geç"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 eşleşme"
 msgstr[1] "%1 eşleşme"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Son Arama"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Geçerli bir klasör seçmediniz."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Koleksiyon seçmeyi unuttunuz."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Koşul belirtmediniz."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Seçilen tüm klasörler boş veya dizinlenmemiş."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Koşul belirtmeyi unuttunuz."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "Koşul, 4'ten az karakter ile kullanılamaz."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Aranıyor..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Arama sonucu alınamadı. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Arama başarısız."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Arama tamamlandı."
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Arama durduruldu."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5590,21 +5619,21 @@
 "Arama klasörünüzü yeniden adlandırırken bir sorun oluştu. Bu sorun genelde "
 "aynı isimde başka bir arama klasörü olduğunda oluşur. Alınan hata \"%1\"."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "İletiyi Kopyala"
 msgstr[1] "%1 İletiyi Kopyala"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Mesajı Kes"
 msgstr[1] "%1 Mesajı Kes"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Klasör durumu denetleniyor..."
@@ -5741,7 +5770,7 @@
 "dahili kullanım için)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5749,7 +5778,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5759,26 +5788,26 @@
 "için kullanılır."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Hızlı klasör arama satırını göster"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "İleti içi metni Öntanımlı Olarak Yönlendir."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Alıcı sayısı bunu aşarsa uyar:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5789,19 +5818,19 @@
 "uyarı verecek ve bir onay isteyecektir. Uyarı iletisi kapatılabilir."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Göndermeden önce yazım denetimi yap"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "İleti okundu uyarılarını oto&matik gönder"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5817,13 +5846,13 @@
 "em>-><em>Durum Bildirimi İste</em> menü maddesini seçebilirsiniz.</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Otomatik kaydetme aralığı:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5835,152 +5864,152 @@
 "0 yaparak otomatik kaydetmeyi devre dışı bırakabilirsiniz."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "Düzenleyicide Metin Parçası Yönetimi ve Ekleme Panelini göster."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "İşaretlendiğinde, gönderilen mesajlar şifrelenmiş biçimde kaydedilecektir"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "En son kullanılan adreslerin listesi"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "En son kullanılan kodlamaların listesi"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Şifreleme simgelerini göster"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Gönderilen Öntanımlı Kısayolun Geçerliliğini Kontrol Et"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Hesap penceresinin boyutu (dahili kullanım için)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Arama penceresinin genişliği (dahili kullanım için)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Arama penceresinin yüksekliği (dahili kullanım için)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "KMail'i Yapılandırma penceresinin genişliği (dahili kullanım için)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "KMail'i Yapılandırma penceresinin yüksekliği (dahili kullanım için)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "İleti Önizleme Panosu"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "İleti önizleme bölümünü gösterme"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "İleti listesinin altında ileti önizleme bölümünü göster"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "İleti listesinin yanında ileti önizleme bölümünü göster"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Klasör Listesi"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Uzun klasör listesi"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Kısa klasör listesi"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Yeni iletiler için şablonlar"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Yanıtlamak için ileti şablonu"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Tümünü yanıtlamak için ileti şablonu"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Yönlendirmek için ileti şablonu"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Alıntı karakterleri"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "İlke görüntülenirken kullanılan kullanılan ilkeyi belirler"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5990,7 +6019,7 @@
 "belirtir (sadece dahili kullanım için)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6000,7 +6029,7 @@
 "(sadece dahili kullanım için)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6010,7 +6039,7 @@
 "(sadece dahili kullanım için)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6020,7 +6049,7 @@
 "(sadece dahili kullanım için)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6030,7 +6059,7 @@
 "(sadece dahili kullanım için)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6296,10 +6325,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6667,10 +6733,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Şu Hesaptaki Postayı Kontrol Et"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7285,6 +7350,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Tüm \"Bir Daha Sorma\" Uyarılarını Yeniden Etkinleştir"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7342,6 +7417,14 @@
 msgid "Zoom: %1%"
 msgstr "Büyüt"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Metin Parçacıkları"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Şu Hesaptaki Postayı Kontrol Et"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Klasör İsmi ve Boyutu Kotanın Dolmasına Yaklaşınca"
 
@@ -11089,11 +11172,6 @@
 #~ msgstr "Öntanımlı &kimliği kullan"
 
 #, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "Kimlik Adı"
-
-#, fuzzy
 #~| msgid "&Server supports Sieve"
 #~ msgid "Define if server supports sieve"
 #~ msgstr "&Sunucu Sieve destekliyor"
@@ -13054,12 +13132,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "URL açılıyor..."
 
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr ""
-#~ "Gerçekten <filename>%1</filename> uygulamasını çalıştırmak istiyor "
-#~ "musunuz?"
-
 #~ msgid "Execute"
 #~ msgstr "Komut Çalıştır"
 
diff -Nru kmail-19.04.3/po/tr/ktnef.po kmail-19.12.3/po/tr/ktnef.po
--- kmail-19.04.3/po/tr/ktnef.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/tr/ktnef.po	2020-03-03 00:34:16.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2017-06-09 14:24+0100\n"
 "Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
diff -Nru kmail-19.04.3/po/ug/akonadi_archivemail_agent.po kmail-19.12.3/po/ug/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/ug/akonadi_archivemail_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/ug/akonadi_archivemail_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2013-09-08 07:05+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur <kde-i18n-doc@kde.org>\n"
@@ -174,12 +174,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr ""
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/ug/akonadi_mailfilter_agent.po kmail-19.12.3/po/ug/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/ug/akonadi_mailfilter_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/ug/akonadi_mailfilter_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2013-09-08 07:05+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur <kde-i18n-doc@kde.org>\n"
@@ -22,40 +22,40 @@
 msgid "Filter Log Viewer"
 msgstr ""
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr ""
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr ""
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
 "data is collected and shown only when logging is turned on. "
 msgstr ""
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr ""
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr ""
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -65,34 +65,34 @@
 "given."
 msgstr ""
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr ""
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "سۈزگۈچ ھەرىكىتى خاتىرىسى"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr ""
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " كىلوبايت"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "چەكسىز"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -101,7 +101,7 @@
 "until the limit is no longer exceeded. "
 msgstr ""
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -110,63 +110,63 @@
 "ھۆججەت %1 غا يازغىلى بولمىدى:\n"
 "«%2» بولسا خاتالىقنىڭ تەپسىلاتىدۇر."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail  خاتالىقى"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "ئۇچۇرنى سۈزۈۋاتىدۇ %1/%2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr ""
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr ""
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr ""
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr ""
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr ""
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr ""
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "ئۇچۇرلارنى سۈزۈۋاتىدۇ"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr ""
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "تەييار"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr ""
diff -Nru kmail-19.04.3/po/ug/akonadi_sendlater_agent.po kmail-19.12.3/po/ug/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/ug/akonadi_sendlater_agent.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/ug/akonadi_sendlater_agent.po	2020-03-03 00:34:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2013-09-08 07:05+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur <kde-i18n-doc@kde.org>\n"
@@ -59,123 +59,123 @@
 msgid "Your emails"
 msgstr "sahran.ug@gmail.com,  gheyret@gmail.com"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "تاپشۇرۇپ ئالغۇچى"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "تېما"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "ئۇچۇر كىملىكى(Id)"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "ھەئە"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "ياق"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] ""
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "تۈرلەرنى چىقىرىۋەت"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr ""
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr ""
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr ""
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr ""
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr ""
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr ""
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr ""
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr ""
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr ""
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "ئۇچۇر يوللاندى"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr ""
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr ""
diff -Nru kmail-19.04.3/po/ug/kmail.po kmail-19.12.3/po/ug/kmail.po
--- kmail-19.04.3/po/ug/kmail.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/ug/kmail.po	2020-03-03 00:34:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2013-09-08 07:05+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
@@ -174,8 +174,8 @@
 msgstr ""
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -279,27 +279,27 @@
 "in the addresses by hand."
 msgstr ""
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "نورما"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "ئىشلىتىش ئۇسۇلى:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "ھالىتى:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr ""
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr ""
@@ -319,7 +319,7 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "قېلىپلار"
@@ -330,107 +330,107 @@
 msgstr ""
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "كۆرۈنۈش"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "ئىختىيارى سىنبەلگىلىرىنى ئىشلەت(&I)"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "كۆڭۈلدىكى"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "يوللىغۇچى"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "قوبۇللىغۇچى"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "ئۇچۇر تىزىمى"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "ئۆرنەك"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Messages"
 msgid "Message Default Format"
 msgstr "ئۇچۇرلار"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr ""
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Lose Formatting"
 msgid "Use Global Settings"
@@ -441,103 +441,108 @@
 msgid "Retrieval Options"
 msgstr "ئېلىش تاللانمىلىرى"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "كىملىك(&I)"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "قوبۇللاۋاتىدۇ"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "يوللاۋاتىدۇ"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "كېيىن ئەۋەتىش"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "&Add..."
 msgid "Add Mail Account..."
 msgstr "قوش(&A)…"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "&Add..."
 msgid "Custom Account..."
 msgstr "قوش(&A)…"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -545,30 +550,30 @@
 "properly installed."
 msgstr "ھېسابات يېتەكچىسىنى قوزغىتالمىدى. ئورنىتىشنى تەكشۈرۈپ كۆرۈڭ."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "ھېسابات يېتەكچىسىنى باشلىغىلى بولمىدى"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -624,7 +629,7 @@
 msgid "Fixed Width Font"
 msgstr ""
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "مۇزىكىسىنى ئىشلىگۈچى"
@@ -907,93 +912,93 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "ئادەتتىكى"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "تېما"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "بەلگە توپلىمى"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "بەت قېشى"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "قوشۇلمىلار"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "ئۆزلۈكىدىن تۈزەت"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "ئىمزا"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "پىچىمى(&O):"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1001,7 +1006,7 @@
 "there is text selected in the message window."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1009,17 +1014,17 @@
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1027,7 +1032,7 @@
 "If unchecked, the reply will be as plain text by default."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1035,34 +1040,34 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "سىڭدۈر"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1070,17 +1075,17 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1091,51 +1096,51 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "ئاپتوماتىك ساقلىمىسۇن"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "تولۇقلاش تەرتىپىنى سەپلەش"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "ئاپتوماتىك ساقلىمىسۇن"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "ئاپتوماتىك ساقلىمىسۇن"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1143,77 +1148,77 @@
 msgid_plural " minutes"
 msgstr[0] " مىنۇت"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "قوش(&D)…"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "چىقىرىۋەت(&M)"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "قوش…"
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "چىقىرىۋەت(&V)"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "ئۆزگەرت…"
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1221,128 +1226,128 @@
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "ئۆزگەرت(&M)..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "ئاتى"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "قىممەت"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "يېڭى(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "ئاتى(&N):"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "قىممىتى(&V):"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid header"
 msgstr "ئىناۋەتسىز ئېلخەت ئادرېسى"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgctxt "Config->Composer->Attachments"
 #| msgid "Attachments"
 msgid "Maximum Attachment Size:"
 msgstr "قوشۇلمىلار"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " كىلوبايت"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "چەك يوق"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1427,7 +1432,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "مۇزىكىسىنى ئىشلىگۈچى"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1541,7 +1546,7 @@
 msgid "Archive Folder"
 msgstr "ئارخىپلاش"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "Archive"
 msgctxt "@action"
@@ -1608,18 +1613,18 @@
 msgid "Notification"
 msgstr "ئۇقتۇرۇش"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] ""
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr ""
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr ""
@@ -1636,474 +1641,474 @@
 msgid "Encoding"
 msgstr "كودلاش"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "كىملىك(&I):"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "لۇغەت(&D):"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "ئورنى(&F):"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "ماۋزۇ(&U):"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "يوللا"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "كېيىن ئەۋەت(&L)"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "قاتار"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "دەسلەپكى نۇسخىدا ساقلاش(&D)"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "ئادرېس دەپتىرى(&A)"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "تەڭ كەڭلىكتىكى خەت نۇسخىسى(&X)"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "ئاپتوماتىك ئىملا تەكشۈرۈش(&A)"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "كىملىك(&I)"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "لۇغەت(&D)"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "ئىملا تەكشۈرگۈچ"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "شىفىر"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "ئىمزا"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "Delete Message"
 msgid "Create Follow Up Reminder..."
 msgstr "ئۇچۇر ئۆچۈر"
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "تىزىملىك بالدىقىنى يوشۇر"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " قۇر: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " ئىستون: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "OVR"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "INS"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "دەسلەپكى نۇسخىدا ساقلا(&S)"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "كېيىن ئىشلىتىش ئۈچۈن ئۇچۇرنى ساقلامسىز ياكى تاشلىۋېتەمسىز؟"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Composer نى يېپىش"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "Insert"
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "قىستۇر"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "قوشۇلما سۈپىتىدە قوش(&A)"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid Email Address"
 msgid "Invalid Attachment Name"
 msgstr "ئىناۋەتسىز ئېلخەت ئادرېسى"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Add 'header' to message"
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "ئۇچۇرغا «قاش» قوش"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] ""
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "ئاتسىز"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2112,12 +2117,12 @@
 "identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2125,12 +2130,12 @@
 "in the identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2138,131 +2143,131 @@
 "for each message."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "ئەۋەتىشنى جەزملە"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "ھازىر ئەۋەت(&S)"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "مۇشۇ پېتى يوللا(&S)"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "HTML ھالىتى تاقالسا تېكىستنىڭ پىچىمى يوقىلىدۇ. شۇنداق بولسا بولامدۇ؟"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "پىچىمىنى يوق قىلامسىز؟"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "پىچىمىنى يوق قىلىش"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2270,7 +2275,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Send Confirmation"
 msgid "Plugin Editor Information"
@@ -2346,25 +2351,25 @@
 msgid "External editor was started."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2391,11 +2396,6 @@
 msgid "Message will not be encrypted"
 msgstr ""
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr ""
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2441,27 +2441,27 @@
 msgid "Cannot move messages."
 msgstr "جەمئىي ئۇچۇر سانى:"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr ""
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Messages"
 msgid "Messages archived"
@@ -2503,48 +2503,48 @@
 msgid "&Existing identities:"
 msgstr ""
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr ""
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr ""
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "كىملىك تەھرىرلەش"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "ئادەتتىكى"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr ""
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2552,12 +2552,12 @@
 "this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr ""
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2565,12 +2565,12 @@
 "sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "ئېلخەت ئادرېسى(&E):"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2580,12 +2580,12 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr ""
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2596,12 +2596,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr ""
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2611,12 +2611,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr ""
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2627,12 +2627,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr ""
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2641,12 +2641,12 @@
 "not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr ""
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2656,39 +2656,39 @@
 "functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr ""
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr ""
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr ""
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr ""
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "ئالىي"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr ""
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2699,12 +2699,12 @@
 "address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr ""
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2715,12 +2715,12 @@
 "blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr ""
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2731,90 +2731,90 @@
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr ""
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr ""
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr ""
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr ""
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr ""
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr ""
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "قۇر…"
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr ""
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr ""
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr ""
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr ""
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "ئىمزا"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "سۈرەت"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr ""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "ئىناۋەتسىز ئېلخەت ئادرېسى"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2823,14 +2823,14 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
 "with the configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2839,36 +2839,36 @@
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr ""
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr ""
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr ""
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr ""
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "تەھرىر…"
@@ -2901,6 +2901,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "ئەۋەتىشنى جەزملە"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3049,7 +3062,7 @@
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3082,7 +3095,7 @@
 msgid_plural "Distribution lists %2 are empty, they cannot be used."
 msgstr[0] ""
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "ئادرېس دەپتىرىگە قوش"
@@ -3092,22 +3105,22 @@
 msgid "Contact created successfully"
 msgstr ""
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "ئالاقەداشنى ساقلىغىلى بولمىدى: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "ئالاقەداشنى ساقلاش مەغلۇپ بولدى"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr ""
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr ""
@@ -3307,14 +3320,14 @@
 msgstr ""
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr ""
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3340,7 +3353,7 @@
 msgstr "ئالدىغا(&F)"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr ""
@@ -3365,7 +3378,7 @@
 msgstr "ياردەم(&H)"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "ئاساسىي قورال بالداق"
@@ -3419,44 +3432,44 @@
 msgid "The file does not contain a message."
 msgstr ""
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
 "(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr ""
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr ""
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "ئۇچۇرلارنى سۈزۈۋاتىدۇ"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "ئۇچۇرنى سۈزۈۋاتىدۇ %1/%2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "ئۇچۇرلار يۆتكىلىۋاتىدۇ."
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr ""
@@ -3485,127 +3498,129 @@
 msgid "Text Direction Toolbar"
 msgstr ""
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "email"
 msgid "Send Email"
 msgstr "email"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr ""
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr ""
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail  ھازىر تورسىز ھالەتتە. قانداق قىلىسىز؟"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "توردا / توردا يوق"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "توردىكى خىزمەت"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "تورسىز خىزمەت"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
 "Reason: %2"
 msgstr ""
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr ""
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the default transport:"
 msgstr[0] ""
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the modified transport:"
 msgstr[0] ""
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr ""
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr ""
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr ""
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3613,12 +3628,12 @@
 "properly installed."
 msgstr "ئىسپاتنامە باشقۇرغۇچنى قوزغىتالمىدى. ئورنىتىشنى تەكشۈرۈپ كۆرۈڭ."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail  خاتالىقى"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -3626,24 +3641,26 @@
 "properly installed."
 msgstr "ھېسابات يېتەكچىسىنى قوزغىتالمىدى. ئورنىتىشنى تەكشۈرۈپ كۆرۈڭ."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr ""
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid "Could not start backupmail. Please check your installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
-msgstr ""
+msgstr "ھېسابات يېتەكچىسىنى قوزغىتالمىدى. ئورنىتىشنى تەكشۈرۈپ كۆرۈڭ."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr ""
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start account wizard"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "ھېسابات يېتەكچىسىنى باشلىغىلى بولمىدى"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -3651,95 +3668,95 @@
 "properly installed."
 msgstr "ھېسابات يېتەكچىسىنى قوزغىتالمىدى. ئورنىتىشنى تەكشۈرۈپ كۆرۈڭ."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start account wizard"
 msgid "Unable to start ImportWizard"
 msgstr "ھېسابات يېتەكچىسىنى باشلىغىلى بولمىدى"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "تېما يوق"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr ""
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr ""
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr ""
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "ئەخلەتخانىنى تازىلاش"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "ئەخلەتخانىغا يۆتكە"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr ""
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr ""
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr ""
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr ""
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "ئىناۋەتلىك ۋاقتى"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3747,17 +3764,17 @@
 "compromised by other present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "بىخەتەرلىك ئاگاھلاندۇرۇشى"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr ""
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3767,762 +3784,768 @@
 "deleted, they cannot be restored.</qt>"
 msgstr[0] ""
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr ""
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "ئۇچۇر ئۆچۈر"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr ""
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr ""
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr ""
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr ""
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr ""
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr ""
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr ""
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr ""
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Move message to trashcan"
 msgid "Deleting or moving messages to trash canceled."
 msgstr "ئۇچۇرنى ئەخلەتخانىغا يۆتكە"
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "باشقا ئاتتا ساقلا(&A)…"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr ""
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr ""
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr ""
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "ئېلخەت تەكشۈر"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr ""
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr ""
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr ""
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "گۇۋاھنامە باشقۇرغۇچ"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr ""
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr ""
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr ""
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr ""
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Delete Message"
 msgid "Delayed Messages..."
 msgstr "ئۇچۇر ئۆچۈر"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "Delete Message"
 msgid "Followup Reminder Messages..."
 msgstr "ئۇچۇر ئۆچۈر"
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "ئۆچۈر(&D)"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr ""
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr ""
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr ""
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr ""
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr ""
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr ""
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr ""
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr ""
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr ""
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr ""
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "يېڭى ئۇچۇر(&N)…"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "يېڭى"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr ""
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr ""
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr ""
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr ""
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr ""
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr ""
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr ""
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr ""
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr ""
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr ""
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr ""
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr ""
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr ""
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr ""
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr ""
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr ""
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr ""
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr ""
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr ""
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr ""
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr ""
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr ""
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr ""
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr ""
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr ""
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr ""
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "كېيىنكى"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "كېيىنكى ئوقۇلمىغان ئۇچۇرغا يۆتكىلىدۇ"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr ""
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "ئالدىنقى"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "ئالدىنقى ئوقۇلمىغان ئۇچۇرغا يۆتكىلىدۇ"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr ""
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr ""
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr ""
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr ""
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr ""
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr ""
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr ""
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "&Add..."
 msgid "&Add Account..."
 msgstr "قوش(&A)…"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr ""
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr ""
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "ئۇقتۇرۇش سەپلىمە(&N)…"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr ""
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr ""
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr ""
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr ""
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Available Filters"
 msgid "Apply All Filters"
 msgstr "ئىشلەتكىلى بولىدىغان سۈزگۈچلەر"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr ""
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr ""
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr ""
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr ""
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "كېيىنكى قىسقۇچقا فوكۇسلىنىش"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "ئالدىنقى قىسقۇچقا فوكۇسلىنىش"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "قىسقۇچنى فوكۇستا تاللاش"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr ""
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr ""
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr ""
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "تەڭشەك(&S)"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Restart"
+msgid "Restart Account"
+msgstr "قايتا قوزغات"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "ئەخلەتخانىنى تازىلا(&M)"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr ""
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr ""
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 #| msgid "Searching..."
 msgid "Edit Search..."
 msgstr "ئىزدەۋاتىدۇ…"
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "سۈزگۈچ %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Searching..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "ئىزدەۋاتىدۇ…"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4530,12 +4553,12 @@
 "present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr ""
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4545,213 +4568,213 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "باشلاۋاتىدۇ…"
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "ئەخلەتخانىغا يۆتكە(&M)"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "ئەخلەتخانا"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "ئۇچۇرنى ئەخلەتخانىغا يۆتكە"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr ""
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr ""
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr ""
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr ""
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Failed to store contact"
 msgid "Add to Existing Contact"
 msgstr "ئالاقەداشنى ساقلاش مەغلۇپ بولدى"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr ""
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "بۇ ئۇلانمىنى خەتكۈچكە قوش"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr ""
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr ""
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "خەتتىن تاپ(&F)…"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr ""
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr ""
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Create..."
 msgid "Share image..."
 msgstr "قۇر…"
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr ""
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr ""
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr ""
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr ""
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr ""
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr ""
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "سەل ساقلاڭ"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "توردا يوق"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
 "a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
 "\">here</a> to go online . . .</p>"
 msgstr ""
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr ""
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr ""
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr ""
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4773,8 +4796,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -4865,17 +4888,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -4921,27 +4944,27 @@
 msgid "All"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -4968,7 +4991,7 @@
 msgid "&Reply"
 msgstr ""
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr ""
@@ -4978,12 +5001,12 @@
 msgid "Reply to A&uthor..."
 msgstr ""
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr ""
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr ""
@@ -5013,7 +5036,7 @@
 msgid "&Edit As New"
 msgstr ""
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5205,113 +5228,113 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "ئىزدە(&S)"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "سىڭدۈر(&I)…"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "قوشۇلما سۈپىتىدە(&A)…"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "تاللانمىنى تازىلا"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "ماس كەلگىنى %1"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "ئىزدەۋاتىدۇ…"
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Searching..."
 msgid "Search failed."
 msgstr "ئىزدەۋاتىدۇ…"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5319,19 +5342,19 @@
 "\"%1\"."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] ""
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] ""
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr ""
@@ -5454,7 +5477,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5462,7 +5485,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5470,26 +5493,26 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr ""
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr ""
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5498,19 +5521,19 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr ""
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5521,13 +5544,13 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "ئاپتوماتىك ساقلاش ئىنتېرۋالى:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5536,151 +5559,151 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr ""
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "قىسقۇچ تىزىملىكى"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr ""
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "يېڭى ئۇچۇرلارنىڭ قېلىپى"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "جاۋاب ئۇچۇرنىڭ قېلىپى"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "ھەممىگە جاۋاب قايتۇرۇش ئۇچۇرىنىڭ قېلىپى"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr ""
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "نەقىل ھەرپلىرى"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5688,7 +5711,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5696,7 +5719,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5704,7 +5727,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5712,7 +5735,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5720,7 +5743,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -5970,7 +5993,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6276,10 +6299,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail"
-msgid "Check Mail Url Tracking"
-msgstr "ئېلخەت تەكشۈر"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -6788,6 +6810,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr ""
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -6846,6 +6878,11 @@
 msgid "Zoom: %1%"
 msgstr "كېڭەيت-تارايت"
 
+#, fuzzy
+#~| msgid "Check Mail"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "ئېلخەت تەكشۈر"
+
 #~ msgid "Zoom"
 #~ msgstr "كېڭەيت-تارايت"
 
@@ -7420,9 +7457,6 @@
 #~ msgid "R&emove"
 #~ msgstr "چىقىرىۋەت(&E)"
 
-#~ msgid "Restart"
-#~ msgstr "قايتا قوزغات"
-
 #, fuzzy
 #~| msgid "Messages"
 #~ msgid "Message Delayed..."
@@ -7511,10 +7545,6 @@
 #~ msgid "Exit"
 #~ msgstr "چېكىن"
 
-#~| msgid "Could not start the account wizard. Please check your installation."
-#~ msgid "Could not start backupmail. Please check your installation."
-#~ msgstr "ھېسابات يېتەكچىسىنى قوزغىتالمىدى. ئورنىتىشنى تەكشۈرۈپ كۆرۈڭ."
-
 #~| msgid "Unable to start account wizard"
 #~ msgid "Unable to start backupmail"
 #~ msgstr "ھېسابات يېتەكچىسىنى باشلىغىلى بولمىدى"
diff -Nru kmail-19.04.3/po/ug/ktnef.po kmail-19.12.3/po/ug/ktnef.po
--- kmail-19.04.3/po/ug/ktnef.po	2019-07-09 00:20:29.000000000 +0000
+++ kmail-19.12.3/po/ug/ktnef.po	2020-03-03 00:34:16.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2013-09-08 07:05+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur <kde-i18n-doc@kde.org>\n"
diff -Nru kmail-19.04.3/po/uk/akonadi_archivemail_agent.po kmail-19.12.3/po/uk/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/uk/akonadi_archivemail_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/uk/akonadi_archivemail_agent.po	2020-03-03 00:34:17.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_archivemail_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-12-29 08:32+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -181,14 +181,14 @@
 "Не можна додавати ще один архів для цієї теки. Слід внести зміни до "
 "поточного архіву."
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr ""
 "Каталогу не існує. Будь ласка, перевірте, чи правильно вказано параметри. "
 "Архівування відкладено."
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "Розпочато архівування %1"
diff -Nru kmail-19.04.3/po/uk/akonadi_followupreminder_agent.po kmail-19.12.3/po/uk/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/uk/akonadi_followupreminder_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/uk/akonadi_followupreminder_agent.po	2020-03-03 00:34:17.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_followupreminder_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2018-12-29 08:32+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -20,85 +20,85 @@
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "Агент нагадування щодо стеження"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "Нагадування щодо стеження"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "© Laurent Montel, 2014–2019"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "Супровідник"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Юрій Чорноіван"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "yurchor@ukr.net"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "Кому"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "Тема"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "Кінцевий строк"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "Відповідь"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "Отримано"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "На очікуванні"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "Показати повідомлення"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "Вилучити"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
@@ -107,12 +107,12 @@
 msgstr[2] "Хочете вилучити ці %1 позначених записів?"
 msgstr[3] "Хочете вилучити цей позначений запис?"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "Отримано відповідь від %1"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "Ви все ще очікуєте на відповідь щодо цього повідомлення:"
diff -Nru kmail-19.04.3/po/uk/akonadi_mailfilter_agent.po kmail-19.12.3/po/uk/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/uk/akonadi_mailfilter_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/uk/akonadi_mailfilter_agent.po	2020-03-03 00:34:17.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_mailfilter_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-09-29 09:23+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -25,17 +25,17 @@
 msgid "Filter Log Viewer"
 msgstr "Переглядач журналу фільтрування"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "Оприлюднити…"
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "Вести &журнал діяльності фільтра"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -45,23 +45,23 @@
 "дані в журнал будуть збиратися та відображатися, лише якщо ведення журналу "
 "ввімкнено. "
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "Подробиці в журналі"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "Записувати опис взірця"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "Записувати оцінювання &правил фільтра"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -76,34 +76,34 @@
 "окремого фільтра буде надано тільки результат оцінки всіх правил, з яких "
 "складається цей фільтр."
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "Заносити оцінювання взірця фільтра"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "Заносити дії фільтра"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "Обмеження розміру журналу:"
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " кБ"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "необмежений"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -116,7 +116,7 @@
 "потреби. Якщо розмір накопичених даних перевищить вказане обмеження, "
 "найстаріші дані буде вилучено: розмір даних не буде перевищувати обмеження. "
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -125,63 +125,63 @@
 "Не вдалося виконати запис до файла %1.\n"
 "Докладний опис помилки: «%2»."
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "Помилка KMail"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Фільтрування повідомлення %1 з %2"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "Помилка під час спроби застосування фільтра пересування пошти"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "Помилка під час спроби застосування фільтра вилучення пошти"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "Помилка під час спроби внесення змін до фільтра пошти"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>Оцінювання правил фільтра:</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>Повідомлення підпадає під правила фільтра.</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>Починаємо фільтрування з повідомлення «%1» з «%2», «%3»:</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "Фільтрування повідомлень"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "Увімкнено журнал фільтрування пошти"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "Готово"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "Фільтрування у %1"
diff -Nru kmail-19.04.3/po/uk/akonadi_sendlater_agent.po kmail-19.12.3/po/uk/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/uk/akonadi_sendlater_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/uk/akonadi_sendlater_agent.po	2020-03-03 00:34:17.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_sendlater_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2018-12-29 08:32+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -62,57 +62,57 @@
 msgid "Your emails"
 msgstr "yurchor@ukr.net"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "Кому"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "Тема"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "Надіслати приблизно"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "Регулярне"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "Ід. повідомлення"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "У черзі надсилання немає повідомлень…"
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "Надіслати зараз"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "Вилучити"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "Так"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "Ні"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
@@ -121,67 +121,67 @@
 msgstr[2] "Хочете вилучити позначені пункти?"
 msgstr[3] "Хочете вилучити позначений пункт?"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "Вилучення пунктів"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "Хочете вилучити і повідомлення?"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "Вилучення повідомлень"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "Не виявлено повідомлення."
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "Не виявлено повідомлення."
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "Помилка під час спроби отримання повідомлення."
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "Не вдалося отримати повідомлення. %1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "Не вдалося створити канал передавання"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "Повідомлення не є справжнім повідомленням"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "Не вдалося надіслати повідомлення."
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "Повідомлення надіслано"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "Виявлено помилку. Хочете повторити спробу надсилання?"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "Виявлено помилку"
diff -Nru kmail-19.04.3/po/uk/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/uk/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/uk/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/uk/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:17.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: akonadi_unifiedmailbox_agent\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2018-11-08 06:59+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -55,37 +55,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "Синхронізуємо уніфіковану поштову скриньку %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr "Додати уніфіковану поштову скриньку"
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "Назва:"
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "Вибрати піктограму…"
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "Піктограма:"
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "Надіслане"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "Чернетки"
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/uk/docs/akonadi_archivemail_agent/add-archive-mail.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/uk/docs/akonadi_archivemail_agent/add-archive-mail.png differ
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/uk/docs/akonadi_archivemail_agent/configure-archive-mail-agent.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/uk/docs/akonadi_archivemail_agent/configure-archive-mail-agent.png differ
diff -Nru kmail-19.04.3/po/uk/docs/akonadi_archivemail_agent/index.docbook kmail-19.12.3/po/uk/docs/akonadi_archivemail_agent/index.docbook
--- kmail-19.04.3/po/uk/docs/akonadi_archivemail_agent/index.docbook	2019-07-09 00:20:33.000000000 +0000
+++ kmail-19.12.3/po/uk/docs/akonadi_archivemail_agent/index.docbook	2020-03-03 00:34:22.000000000 +0000
@@ -55,9 +55,9 @@
 >&FDLNotice;</legalnotice>
 
 <date
->30 серпня 2013 року</date>
+>21 вересня 2019 року</date>
 <releaseinfo
->&kde; 4.11</releaseinfo>
+>Програми 19.12</releaseinfo>
 </articleinfo>
 
 <sect1 id="introduction">
@@ -75,7 +75,7 @@
 <para
 >Скористайтеся пунктом меню <menuchoice
 ><guimenu
->Інструменти</guimenu
+>Параметри</guimenu
 ><guimenuitem
 >Налаштувати автоматичне архівування...</guimenuitem
 > </menuchoice
@@ -123,7 +123,7 @@
 >, шляху до вказаної теки у ієрархії тек &kmail;, дати у форматі <userinput
 >рік-місяць-день</userinput
 > та вибраного суфікса назви файла, наприклад <filename
->Archive_Local Folder_inbox_2013-09-03.tar.bz2</filename
+>Archive_Local Folder_inbox_2019-09-03.tar.bz2</filename
 >. </para
 ></listitem>
 <listitem
@@ -176,6 +176,18 @@
 <para
 >Ви можете скористатися полем для позначки, розташованим ліворуч від кожного з записів, для того, щоб увімкнути або вимкнути відповідне завдання з архівування. </para>
 <para
+>Доступ до діалогового вікна налаштовування програми можна отримати будь-коли за допомогою пункту меню <menuchoice
+><guimenu
+>Параметри</guimenu
+> <guimenuitem
+>Налаштування &kmail;...</guimenuitem
+></menuchoice
+> головного вікна програми &kmail;. Далі, слід вибрати сторінку <guilabel
+>Додатки</guilabel
+> і натиснути кнопку налаштовування навпроти пункту <guilabel
+>Агент архівування пошти</guilabel
+>. </para>
+<para
 >За допомогою контекстного меню, яке можна відкрити клацанням правою кнопкою миші, ви можете відкрити теку, що містить архіви або наказати програмі виконати архівування негайно. Програма перезаписуватиме архіви, створені того самого дня раніше, без додаткових сповіщень. </para>
 
 </sect2>
@@ -188,9 +200,9 @@
 <para
 >&i18n-archivemailagent;</para>
 <para
->Авторські права на програму належать Laurent Montel montel@kde.org, 2013 </para>
+>Авторські права на програму належать Laurent Montel montel@kde.org, 2013–2019 </para>
 <para
->Авторські права на документацію належать Laurent Montel, 2013 </para>
+>Авторські права на документацію належать Laurent Montel, 2013–2019 </para>
 
 <para
 >Переклад українською: Юрій Чорноіван<email
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/uk/docs/akonadi_followupreminder_agent/add-followup-reminder.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/uk/docs/akonadi_followupreminder_agent/add-followup-reminder.png differ
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/uk/docs/akonadi_followupreminder_agent/followupreminder-configure.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/uk/docs/akonadi_followupreminder_agent/followupreminder-configure.png differ
diff -Nru kmail-19.04.3/po/uk/docs/akonadi_followupreminder_agent/index.docbook kmail-19.12.3/po/uk/docs/akonadi_followupreminder_agent/index.docbook
--- kmail-19.04.3/po/uk/docs/akonadi_followupreminder_agent/index.docbook	2019-07-09 00:20:33.000000000 +0000
+++ kmail-19.12.3/po/uk/docs/akonadi_followupreminder_agent/index.docbook	2020-03-03 00:34:22.000000000 +0000
@@ -47,9 +47,9 @@
 </copyright>
 
 <date
->10 червня 2014 року</date>
+>21 вересня 2019 року</date>
 <releaseinfo
->&kde; 4.14</releaseinfo>
+>Програми 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -60,6 +60,78 @@
 <para
 >&i18n-followupreminderagent; — агент Akonadi, призначений для нагадування за стеженнями за відповідями на поштові повідомлення. </para>
 
+<sect2 id="using-kapp">
+<title
+>Користування програмою &i18n-followupreminderagent;</title>
+
+<para
+>Скористайтеся пунктом <menuchoice
+><guimenu
+>Налаштування</guimenu
+><guimenuitem
+>Створити нагадування щодо стеження</guimenuitem
+></menuchoice
+> у вікні редактора повідомлень &kmail;, щоб відкрити діалогове вікно, за допомогою якого ви зможете створити нагадування щодо відповіді на ваше поточне повідомлення на певну дату.</para>
+
+<screenshot>
+<screeninfo
+>Діалогове вікно програми &i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="add-followup-reminder.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Діалогове вікно програми &i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para
+>Діалогове вікно програми &i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+<para
+>Натисніть кнопку зі стрілкою вниз, яку розташовано у пункті <guilabel
+>Дата</guilabel
+>, щоб вибрати дату за допомогою віджета календаря &kde;. Ви також можете вибрати ваш календар для нагадування за допомогою спадного списку <guilabel
+>Зберегти завдання у</guilabel
+>.</para>
+<para
+>Щоб вилучити заплановані нагадування, скористайтеся пунктом <menuchoice
+><guimenu
+>Параметри</guimenu
+> <guimenuitem
+>Налаштування &kmail;...</guimenuitem
+></menuchoice
+> головного вікна програми &kmail;. Далі, виберіть сторінку <guilabel
+>Додатки</guilabel
+> і натисніть кнопку налаштовування, яку розташовано навпроти пункту <guilabel
+>Агент нагадування про відповіді</guilabel
+>. Далі, скористайтеся контекстним меню, яке можна викликати клацанням правою кнопкою миші на пункті нагадування, щоб вибрати дію <guimenuitem
+>Вилучити</guimenuitem
+>. </para>
+
+<screenshot>
+<screeninfo
+>Налаштовування програми &i18n-followupreminderagent;</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="followupreminder-configure.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Налаштовування програми &i18n-followupreminderagent;</phrase>
+    </textobject>
+    <caption>
+      <para
+>Налаштовування програми &i18n-followupreminderagent;</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+</sect2>
+
 <sect2 id="credits">
 
 <title
@@ -68,9 +140,9 @@
 <para
 >&i18n-followupreminderagent;</para>
 <para
->Авторські права на програму належать &Laurent.Montel; &Laurent.Montel.mail;, 2014 </para>
+>Авторські права на програму належать &Laurent.Montel; &Laurent.Montel.mail;, 2014–2019 </para>
 <para
->Авторські права на документацію належать &Laurent.Montel; &Laurent.Montel.mail;, 2014 </para>
+>Авторські права на документацію належать &Laurent.Montel; &Laurent.Montel.mail;, 2014–2019 </para>
 
 <para
 >Переклад українською: Юрій Чорноіван<email
diff -Nru kmail-19.04.3/po/uk/docs/akonadi_sendlater_agent/index.docbook kmail-19.12.3/po/uk/docs/akonadi_sendlater_agent/index.docbook
--- kmail-19.04.3/po/uk/docs/akonadi_sendlater_agent/index.docbook	2019-07-09 00:20:33.000000000 +0000
+++ kmail-19.12.3/po/uk/docs/akonadi_sendlater_agent/index.docbook	2020-03-03 00:34:22.000000000 +0000
@@ -57,9 +57,9 @@
 </copyright>
 
 <date
->30 листопада 2013 року</date>
+>21 вересня 2019 року</date>
 <releaseinfo
->&kde; 4.12</releaseinfo>
+>Програми 19.12</releaseinfo>
 
 </articleinfo>
 
@@ -126,9 +126,13 @@
 ><guimenu
 >Параметри</guimenu
 > <guimenuitem
->Налаштувати агент відкладеного надсилання...</guimenuitem
+>Налаштування &kmail;...</guimenuitem
 ></menuchoice
-> у вікні &kmail;. </para>
+> у вікні &kmail;, потім виберіть сторінку <guilabel
+>Додатки</guilabel
+> і натисніть кнопку налаштовування навпроти пункту <guilabel
+>Агент відкладеного надсилання</guilabel
+>. </para>
 
 <screenshot>
 <screeninfo
@@ -164,9 +168,9 @@
 <para
 >&i18n-sendlateragent;</para>
 <para
->Авторські права на програму належать &Laurent.Montel; &Laurent.Montel.mail;, 2013 </para>
+>Авторські права на програму належать &Laurent.Montel; &Laurent.Montel.mail;, 2013–2019 </para>
 <para
->Авторські права на документацію належать &Laurent.Montel; &Laurent.Montel.mail;, 2013 </para>
+>Авторські права на документацію належать &Laurent.Montel; &Laurent.Montel.mail;, 2013–2019 </para>
 
 <para
 >Переклад українською: Юрій Чорноіван<email
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/uk/docs/akonadi_sendlater_agent/sendlateragent-configure.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/uk/docs/akonadi_sendlater_agent/sendlateragent-configure.png differ
Binary files /tmp/tmpb3rhOO/vNuqs8yopz/kmail-19.04.3/po/uk/docs/akonadi_sendlater_agent/sendlateragent-dialog.png and /tmp/tmpb3rhOO/7c3pyCKVXh/kmail-19.12.3/po/uk/docs/akonadi_sendlater_agent/sendlateragent-dialog.png differ
diff -Nru kmail-19.04.3/po/uk/kmail.po kmail-19.12.3/po/uk/kmail.po
--- kmail-19.04.3/po/uk/kmail.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/uk/kmail.po	2020-03-03 00:34:17.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-03-09 09:11+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-10-25 07:58+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 19.03.70\n"
+"X-Generator: Lokalize 19.11.70\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
@@ -190,8 +190,8 @@
 msgstr "Багато ключів шифрування для однієї адреси"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -297,27 +297,27 @@
 "KMail не вдалося виявити список листування у цій теці. Заповніть, будь "
 "ласка, адреси вручну."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Квота"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Використання:"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Стан:"
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "заповнено на %p%"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "Використано %1 з %2"
@@ -340,7 +340,7 @@
 "комбінацію клавіш буде пов’язано з відповідною текою.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Шаблони"
@@ -351,106 +351,106 @@
 msgstr "&Використовувати власні шаблони повідомлень у цій теці"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Копіювати глобальні шаблони"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Перегляд"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "&Використовувати нетипові піктограми"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Звичайна:"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Непрочитана:"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Відображати стовпчик з відправник/адресатом у списку повідомлень"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "П&оказувати стовпчик:"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Типове"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Відправник"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Отримувач"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Список повідомлень"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Використовувати типове складання"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Складання"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Використовувати типову тему"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Тема"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "Типовий формат повідомлень"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "Надавати перевагу HTML над текстом"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "Надавати перевагу тексту над HTML"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "Використовувати загальні параметри"
@@ -460,100 +460,105 @@
 msgid "Retrieval Options"
 msgstr "Параметри отримання пошти"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "Профілі"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Отримування"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Надсилання"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr "Сервер LDAP"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Вихідні облікові записи (додайте хоча б один):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Спільні параметри"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "&Підтверджувати перед надсиланням"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Перевірити правопис до надсилання"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Не робити це автоматично"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "при перевірці пошти вручну"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "при будь-який перевірці пошти"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Надіслати зараз"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Надіслати пізніше"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Надсилати пошту з &теки «вихідні»:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "&Типовий метод надсилання:"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "Уможливити скасування надсилання"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "Додати обліковий запис пошти…"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "Нетиповий обліковий запис…"
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
@@ -562,30 +567,30 @@
 "Не вдається запустити майстер створення облікових записів. Будь ласка, "
 "перевірте, чи належним чином встановлено AccountWizard."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Не вдалося запустити майстер створення облікових записів"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Включити до перевірки вручну"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Переходити у режим «поза мережею» під час закриття KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Перевіряти пошту при запуску"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -643,7 +648,7 @@
 msgid "Fixed Width Font"
 msgstr "Моноширинний шрифт"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Редактор"
@@ -947,61 +952,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "Створити мітку неможливо: мітка з такою назвою вже існує."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Загальні"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Стандартні шаблони"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Власні шаблони"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Тема"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Набір символів"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Заголовки"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Долучення"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Автовиправлення"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Автозміна розмірів зображень"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Підпис"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -1010,12 +1015,12 @@
 "Автоматично вставляти вказаний підпис під\n"
 "час створення нового повідомлення"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "Вставити підпис над цитованим текстом"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1024,18 +1029,18 @@
 "Вставляти сумісний з RFC відокремлювач підпису\n"
 "(два дефіси та пробіл у окремому рядку) перед підписом"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "Не цитувати у відповідях будь-які наявні підписи"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "Формат"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1046,7 +1051,7 @@
 "фрагмент тексту замість цілого повідомлення, якщо у\n"
 "вікні повідомлення позначено фрагмент тексту."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1057,17 +1062,17 @@
 "рядками цитованого тексту, навіть якщо рядок було створено додаванням\n"
 "розриву рядка під час розбиття на рядки для зручності читання."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "Увімкнути автоматичне перенесення слів на вказаній позиції у рядку"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "Встановити позицію автоматичного перенесення слів у рядку"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1079,7 +1084,7 @@
 "цього пункту, типово, текст повідомлення буде перетворено у\n"
 "звичайний текстовий формат."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1091,34 +1096,34 @@
 "Передбачено підтримку напівжирного, курсивного та підкресленого шрифту,\n"
 "списків та зовнішніх посилань."
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Вбудувати"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Як долучення"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "Встановити типовий формат переспрямовування повідомлень"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "Типовий тип переспрямовування:"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Адресати"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1130,19 +1135,19 @@
 "пункту\n"
 "«Параметри → Запитати сповіщення про долю листа»."
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "Попереджати, якщо кількість адресатів завелика"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr ""
 "Встановити максимальну кількість отримувачів. Якщо цю кількість буде "
 "перевищено, програма показуватиме попередження."
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1159,7 +1164,7 @@
 "кількості отримувачів. Втім, слід зауважити, що це не стосується надсилання\n"
 "повідомлень за списками розповсюдження або за допомогою списків листування."
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
@@ -1168,18 +1173,18 @@
 "Пам’ятати останні введені адреси і пропонувати їх для доповнення рядка "
 "отримувача."
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Без збереження"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "Макс. кількість недавніх адрес:"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
@@ -1188,23 +1193,23 @@
 "Максимальна кількість нещодавно введених адрес, які зберігатимуться\n"
 "для потреб автодоповнення."
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "Налаштувати автодоповнення…"
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Автозбереження"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Без автозбереження"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
@@ -1214,20 +1219,20 @@
 msgstr[2] " хвилин"
 msgstr[3] " хвилина"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr ""
 "Автоматично зберігати повідомлення з вказаним інтервалом між діями зі "
 "зберігання"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "П&рефікси теми відповіді"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1236,59 +1241,59 @@
 "Розпізнавати будь-яку послідовність\n"
 "наступних префіксів (без урахування регістру):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "Дод&ати…"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "Ви&лучити"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "&Змінити…"
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Введіть новий префікс відповіді:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "П&рефікси теми пересилання"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Додати…"
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "Ви&лучити"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Змінити…"
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Введіть новий префікс пересилки:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1299,90 +1304,90 @@
 "цьому листі."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Змінити…"
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Введіть назву кодування:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Зберігати початковий набір символів при відповіді або пересиланні (якщо "
 "можливо)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Цей набір символів ще не підтримується."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Використовувати власний суфікс ідентифікації повідомлення"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "В&ласний суфікс ідентифікації повідомлення:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Власні нетипові заголовки для листів:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "Назва"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Значення"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "&Створити"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&Назва:"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Значення:"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 "«Content-Type» не є дозволеним рядком. Цей заголовок не буде збережено."
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "Некоректний заголовок"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Надавати долученням сумісні з Outlook назви"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1391,38 +1396,38 @@
 "Позначте цей пункт, щоб програма Outlook™ могла зрозуміти назви долучень, що "
 "містять не латинські літери"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Уві&мкнути визначення відсутніх долучень"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "Вважати будь-яке з наступних слів наміром долучити файл:"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Введіть нове слово:"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "Максимальний розмір долучення:"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " кБ"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Не обмежувати"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1510,7 +1515,7 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Додатки перетворення тексту"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1627,7 +1632,7 @@
 msgid "Archive Folder"
 msgstr "Архівування теки"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1693,7 +1698,7 @@
 msgid "Notification"
 msgstr "Сповіщення"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
@@ -1702,12 +1707,12 @@
 msgstr[2] "%1 долучень (%2)"
 msgstr[3] "одне долучення (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Приховати список долучень"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Показати список долучень"
@@ -1724,334 +1729,334 @@
 msgid "Encoding"
 msgstr "Кодування"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Виберіть словник, який буде використано для перевірки правопису у цьому "
 "повідомленні"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Виберіть теку надісланої пошти, у якій зберігатиметься копія цього "
 "повідомлення"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 "Виберіть обліковий запис вихідної пошти для надсилання цього повідомлення"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Вкажіть адресу «Від:» для цього повідомлення"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Вкажіть тему цього повідомлення"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "П&рофіль:"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Словник:"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Тека &надісланих повідомлень:"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Канал надсилання по&шти:"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Від:"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "Т&ема:"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Надіслати пошту"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Надіслати пошту за допомогою"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Надіслати"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Надіслати &пізніше"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Надіслати &пізніше за допомогою"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Додати до черги"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "Зберегти як &чернетку"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Зберегти повідомлення до теки чернеток"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Зберегти як &шаблон"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Зберегти повідомлення у теці шаблонів"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Зберегти як &файл"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Зберегти повідомлення у текстовому файлі або файлі html"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Вставити текстовий файл…"
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Вставити недавній текстовий файл"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Адресна &книга"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Відкрити адресну книгу"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Новий редактор"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Вибрати &адресатів…"
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Зберегти &список розповсюдження…"
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Вставити як &долучення"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Оч&истити пропуски"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Використовувати &моноширинний шрифт"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Термінове"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Запитати сповіщення про долю листа"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "&Запитати сповіщення щодо отримання"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Перенесення слів"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Фрагменти"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "&Автоматична перевірка правопису"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Редагування з форматуванням"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Форматований текст"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "Увімкнути або вимкнути режим редагування форматованого тексту"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Всі поля"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Профіль"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Словник"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Тека для &надісланих повідомлень"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Надсилання пошти"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Від"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "Т&ема"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Додати п&ідпис"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Приєднати п&ідпис"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Вставити підпис у позицію к&урсора"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "П&еревірка правопису…"
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Перевірка правопису"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Зашифрувати повідомлення"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Зашифрувати"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "Підписати п&овідомлення"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Підписати"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Формат криптографічного повідомлення"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Виберіть формат шифрування для цього повідомлення"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "Створити нагадування щодо стеження…"
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Налаштування KMail…"
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2060,53 +2065,53 @@
 "<qt>За допомогою цього пункту можна повністю сховати смужку меню. Наказати "
 "програмі знову показувати цю смужку можна клавіатурним скороченням %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "Приховати смужку меню"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Рядок: %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Стовпчик: %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "ЗАМ"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "ВСТ"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Правопис: увімкнено"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Правопис: вимкнено"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Знову з&берегти як шаблон"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Зберегти як чернетку"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2115,7 +2120,7 @@
 "Знову зберегти це повідомлення у теці шаблонів. Ним можна буде скористатися "
 "пізніше."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2124,60 +2129,60 @@
 "Зберегти це повідомлення у теці чернеток. Його можна буде відредагувати "
 "надіслати пізніше."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr ""
 "Чи бажаєте ви зберегти повідомлення для подальшого використання або викинути "
 "його?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Закрити редактор"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Помилка під час спроби автозбереження повідомлення"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "Не вдалося надіслати повідомлення"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "Вставлення файла"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Додати як в&будоване зображення"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Додати як &долучення"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "Назва долучення:"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "Назва долучення не може бути порожньою"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "Некоректна назва долучення"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
@@ -2186,7 +2191,7 @@
 msgstr[2] "Додати адреси до повідомлення"
 msgstr[3] "Додати адресу до повідомлення"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
@@ -2195,17 +2200,17 @@
 msgstr[2] "Додати файли як &долучення"
 msgstr[3] "Додати файл як &долучення"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Вставити текст з буфера як долучення"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "без назви"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2218,12 +2223,12 @@
 "p><p>Виберіть, будь ласка, ключ(і) для цієї операції у діалоговому вікні "
 "налаштування профілів.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Невизначений ключ шифрування"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2235,12 +2240,12 @@
 "p><p>Вкажіть, будь ласка, ключ який потрібно використовувати для поточного "
 "профілю в діалоговому вікні налаштування профілів.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Ключ для підписування не вказано"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2251,7 +2256,7 @@
 "встановіть вашу адресу електронної пошти для кожної профілю, і вам не "
 "потрібно буде вводити її для кожного повідомлення окремо."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2260,37 +2265,37 @@
 "Ви повинні вказати щонайменше одну адресу отримувача в полях «Кому», «Копія» "
 "або «Потайна копія»."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Ви не вказали адресата. Надіслати повідомлення попри все?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Не вказано адресата"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "Ви не вказали тему повідомлення. Надсилати його попри все?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Не вказано тему"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Надіслати &як є"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "&Вказати тему"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
@@ -2299,22 +2304,22 @@
 "Вам слід вказати принаймні одну адресу отримувача, щоб програма могла "
 "зашифрувати чернетку."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Збираюся надсилати електронного листа…"
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Надіслати підтвердження"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Надіслати &зараз"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2323,22 +2328,22 @@
 "Ви намагаєтеся надіслати повідомлення більше, ніж %1 адресатам. Продовжити "
 "процедуру надсилання повідомлення?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Забагато адресатів"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Надіслати &як є"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "&Змінити адресатів"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2347,22 +2352,22 @@
 "Вимикання режиму HTML призведе до втрати форматування тексту. Ви справді "
 "цього бажаєте?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Відкинути форматування?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Відкинути форматування"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Додати форматування як простий текст"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
@@ -2372,7 +2377,7 @@
 "шифрування має необмежену довіру). Натисніть піктограму, щоб дізнатися "
 "більше."
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
@@ -2381,7 +2386,7 @@
 "Для цього отримувача буде використано посередньо безпечне шифрування (ключ "
 "шифрування має обмежену довіру). Натисніть піктограму, щоб дізнатися більше."
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
@@ -2391,7 +2396,7 @@
 "шифрування вважається не гідним довіри). Натисніть піктограму, щоб дізнатися "
 "більше."
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2402,7 +2407,7 @@
 "рівень захисту шифрування залишиться невідомим (ключ шифрування не вдалося "
 "перевірити). Натисніть піктограму, щоб дізнатися більше."
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "Інформація щодо додатка редактора"
@@ -2479,7 +2484,7 @@
 msgid "External editor was started."
 msgstr "Запущено зовнішній редактор."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
@@ -2488,14 +2493,14 @@
 "Каналу надсилання не знайдено. Будь ласка, переконайтеся, що "
 "використовується належний канал надсилання пошти."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 "Не визначено теку надісланої кореспонденції. Будь ласка, встановіть належні "
 "параметри теки, перш ніж надсилати повідомлення."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
@@ -2503,7 +2508,7 @@
 "Профілю не знайдено. Будь ласка, переконайтеся, що використовується належний "
 "профіль."
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2532,11 +2537,6 @@
 msgid "Message will not be encrypted"
 msgstr "Лист не буде зашифровано"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Фрагменти тексту"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2584,28 +2584,28 @@
 msgid "Cannot move messages."
 msgstr "Не вдалося пересунути повідомлення."
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Не вдалося отримати назву теки. Повідомлення про помилку: %1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "Не повернуто назви теки."
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr ""
 "Не вдалося отримати назву батьківської теки. Повідомлення про помилку: %1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "Не вдалося повернути список тек."
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "Повідомлення архівовано"
@@ -2646,48 +2646,48 @@
 msgid "&Existing identities:"
 msgstr "&Існуючі профілі:"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "Помилка під час спроби створити пару ключів: %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "Помилка під час створення ключа"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "Немає ключа"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "Створити пару ключів"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "Створюємо пару ключів…"
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Редагувати особу"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Загальні"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Ваше ім'я:"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2699,12 +2699,12 @@
 "p><p>Якщо залишити пустим, то заголовок буде містити тільки адресу "
 "електронної пошти.</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "&Установа:"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2716,12 +2716,12 @@
 "надісланих вами листів.</p><p>Нічого поганого не станеться (та за звичай це "
 "типова ситуація), якщо залишити це поле порожнім.</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "&Адреса пошти:"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2738,12 +2738,12 @@
 "користувачів виникнуть проблеми, якщо вони захочуть відповісти на ваші листи."
 "</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "А&льтернативні адреси:"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2760,12 +2760,12 @@
 "th><td>first@example.org<br>last@example.org</td></tr></table><p>Кожну з "
 "альтернативних адрес слід вказувати у окремому рядку.</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Криптографія"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2781,12 +2781,12 @@
 "функції зі створення листів.</p><p>Більш докладно про ключі можна прочитати "
 "на <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Ключ OpenPGP для підписів:"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2804,12 +2804,12 @@
 "впливає на всі інші функції зі створення листів.</p><p>Більш докладно про "
 "ключі можна прочитати на <a>https://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Ключ OpenPGP для шифрування:"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2823,12 +2823,12 @@
 "створювати цифрові підписи повідомлень; це не впливає на всі інші функції зі "
 "створення листів.</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME-сертифікат для підписування:"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2844,39 +2844,39 @@
 "використовуючи OpenPGP; це не впливає на всі інші функції зі створення "
 "листів.</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME-сертифікат для шифрування:"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Основний формат:"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "Автоматично підписувати повідомлення"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "Автоматично шифрувати повідомлення, якщо можливо"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Додатково"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Зво&ротна адреса:"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2894,12 +2894,12 @@
 "але всі відповіді на них надходили до адреси групи.</p><p>Якщо не знаєте, що "
 "тут ввести, залиште це поле пустим.</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Адреси &копій:"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2916,12 +2916,12 @@
 "розділені комами, якщо потрібно ввести декілька адрес отримувачів копій.</"
 "p><p>Якщо не знаєте, що тут ввести, залиште це поле порожнім.</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "&Потайні адреси:"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2939,57 +2939,57 @@
 "декілька адрес отримувачів потайних копій.</p><p>Якщо не знаєте, що тут "
 "ввести, залиште це поле порожнім.</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "С&ловник:"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Тека надіслани&х повідомлень:"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Тека &чернеток:"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "&Тека шаблонів:"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Обліковий запис вихідної пошти:"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Долучити до повідомлення вашу візитівку"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Створити…"
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Мова автовиправлення:"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "Відновити типову назву домену"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Тип&овий домен:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2998,33 +2998,33 @@
 "<qt><p>Типовий домен використовується, щоб завершити адресу електронної "
 "пошти, якщо вона складається тільки з імені користувача.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "&Використовувати власні шаблони повідомлень для цього профілю"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Підпис"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Зображення"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Помилкова альтернативна адреса «%1»"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Неправильна адреса електронної пошти"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -3038,7 +3038,7 @@
 "Такі налаштування призведуть до того, що отримувачі повідомлень будуть "
 "бачити попередження при спробі перевірити підписи."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3048,7 +3048,7 @@
 "ідентифікатора користувача, який би містив адресу електронної пошти для "
 "цього профілю (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3061,7 +3061,7 @@
 "Така конфігурація призведе до того, що отримувачі повідомлень будуть бачити "
 "попередження при спробі перевірити підписи."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3070,22 +3070,22 @@
 "Один з налаштованих S/MIME-сертифікатів для шифрування не містить адреси "
 "електронної пошти для цього профілю (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Електронну адресу не знайдено в ключах/сертифікатах"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Некоректний файл підпису"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Редагування профілю «%1»"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
@@ -3094,7 +3094,7 @@
 "Якоїсь із нетипових тек профілю вже не існує. Тому буде використано типові "
 "теки."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Редагувати…"
@@ -3125,6 +3125,18 @@
 msgid "We cannot delete vCard file."
 msgstr "Не вдалося вилучити файл візитівки."
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Ви справді бажаєте скасувати дію?"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Підтвердження"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3289,7 +3301,7 @@
 "Приклади можна взяти з <a href=\"https://ace.home.xs4all.nl/X-Faces/"
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "Зображення"
@@ -3324,7 +3336,7 @@
 msgstr[2] "Списки розповсюдження «%2» порожні. Ви не можете ним скористатися."
 msgstr[3] "Список розповсюдження «%2» порожній. Ви не можете ним скористатися."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Додати до адресної книги"
@@ -3334,22 +3346,22 @@
 msgid "Contact created successfully"
 msgstr "Запис контакту успішно створено"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Не вдалося зберегти запис контакту: %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Помилка під час збереження запису контакту"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Хочете долучити теку «%1»?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Долучення теки"
@@ -3561,14 +3573,14 @@
 msgstr "&Тека"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "Застосувати фільтри до теки"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3594,7 +3606,7 @@
 msgstr "&Переслати"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "За&стосувати фільтр"
@@ -3619,7 +3631,7 @@
 msgstr "&Довідка"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Головний пенал"
@@ -3676,12 +3688,12 @@
 msgid "The file does not contain a message."
 msgstr "Файл не містить повідомлення."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "Файл містить декілька повідомлень. Показано тільки перше повідомлення."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3690,32 +3702,32 @@
 "Ви бажаєте переслати вибрані повідомлення як долучення до одного "
 "повідомлення (тобто як дайджест MIME) чи як окремі повідомлення?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Надіслати дайджест"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Надіслати окремо"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Фільтрування повідомлень"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Фільтрування повідомлення %1 з %2"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Пересування повідомлень"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Вилучення повідомлень"
@@ -3744,27 +3756,27 @@
 msgid "Text Direction Toolbar"
 msgstr "Панель напрямку тексту"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail працює в автономному режимі; всі мережні дії не доступні"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "Надіслати пошту"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "Неможливо надіслати пошту"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail працює в мережі; всі мережні дії доступні"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3773,38 +3785,38 @@
 "KMail налаштовано на роботу у мережі. Щойно буде виявлено з’єднання, "
 "програма поновити виконання завдань з роботи у мережі."
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail працює в автономному режимі. Що робити далі?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "В мережі/Поза мережею"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Працювати в мережі"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Працювати автономно"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "Виявлено з’єднання з мережею; поновлено виконання всіх дій у мережі"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Не виявлено з’єднання з мережею; всі завдання з роботи у мережі відкладено"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3813,12 +3825,12 @@
 "Не вдалося відкрити файл автоматичного збереження у %1.\n"
 "Причина: %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Невдала спроба відкриття файла автозбереження"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3828,7 +3840,7 @@
 msgstr[2] "%1 профілів було змінено, щоб використовувати типовий транспорт:"
 msgstr[3] "%1 профіль було змінено, щоб використовувати типовий транспорт:"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3841,43 +3853,47 @@
 msgstr[3] ""
 "Цей %1 профіль було змінено, щоб використовувати змінений транспорт:"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Надсилання повідомлень"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Запуск процесу надсилання…"
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "Ресурс %1 пошкоджено."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"Ресурс %1 пошкоджено.\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "Агент архівування пошти не зареєстровано."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "Агент відкладеного надсилання не зареєстровано."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "Агент стеження за нагадуваннями не зареєстровано."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
@@ -3886,12 +3902,12 @@
 "Не вдається запустити менеджер сертифікатів. Будь ласка, перевірте чи "
 "належним чином встановлено Kleopatra."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Помилка Kmail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
@@ -3900,27 +3916,26 @@
 "Не вдалося запустити майстер імпортування. Будь ласка, перевірте, чи "
 "належним чином встановлено ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Не вдалося запустити майстер імпортування"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
-"Не вдалося запустити інструмент експортування параметрів програм для "
-"керування особистими даними. Будь ласка, перевірте, чи встановлено потрібні "
-"компоненти."
+"Не вдалося запустити інструмент експортування даних PIM для керування "
+"особистими даними. Будь ласка, перевірте, чи встановлено потрібні компоненти."
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "Не вдалося запустити інструмент експортування параметрів"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "Не вдалося запустити інструмент експортування даних"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
@@ -3929,73 +3944,73 @@
 "Не вдалося запустити майстер імпортування. Будь ласка, перевірте, чи "
 "належним чином встановлено ImportWizard."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "Не вдалося запустити майстер імпортування"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr ""
 "У системі виявлено іншу програму для роботи з поштою. Хочете імпортувати "
 "дані з цієї програми?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Не вдається запустити майстер імпортування. Будь ласка, перевірте, чи "
 "встановлено потрібні компоненти."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Без теми"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(немає шаблонів)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr ""
 "Для цієї теки не встановлені параметри для вилучення застарілих повідомлень"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>Ви дійсно хочете вилучити застарілі повідомлення з теки <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Вилучити застарілі повідомлення з теки"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "В&илучити застарілі повідомлення"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Спорожнити смітник"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Пересунути в смітник"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Ви дійсно хочете спорожнити теку смітника?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -4004,27 +4019,27 @@
 "<qt>Ви дійсно хочете пересунути всі повідомлення з теки <b>%1</b> в смітник?"
 "</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Всі повідомлення пересунуто у смітник"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Ви дійсно хочете вилучити всі застарілі повідомлення?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Вилучити застарілі повідомлення?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Вилучити застарілі повідомлення"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4035,17 +4050,17 @@
 "«спаму» та збільшує ймовірність використання зловмисниками інших відомих "
 "шпарин у безпеці системи."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Попередження безпеки"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Завантажувати зовнішні посилання"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4066,532 +4081,532 @@
 "<qt>Ви справді хочете вилучити %1 вибране повідомлення?<br />Цю дію буде "
 "неможливо скасувати.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Вилучити повідомлення"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Вилучити повідомлення"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Пересування повідомлень…"
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Вилучення повідомлень…"
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Повідомлення успішно вилучено."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Повідомлення успішно пересунуто."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Вилучення повідомлень зазнало невдачі."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Вилучення повідомлень перервано."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Помилка пересування повідомлень."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Пересування повідомлень перервано."
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Пересунути повідомлення в теку"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Копіювання повідомлень…"
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Повідомлення успішно скопійовано."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Спроба копіювання повідомлень завершилася невдало."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Копіювання повідомлень скасовано."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Скопіювати повідомлення до теки"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Пересування повідомлень до смітника…"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "Вилучення і пересування повідомлень до смітника…"
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Повідомлення успішно пересунуто до смітника."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Повідомлення успішно пересунуто до смітника або вилучено."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Спроба пересунути повідомлення до смітника завершилася невдало."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr ""
 "Спроба вилучити або пересунути повідомлення до смітника завершилася невдало."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Пересування повідомлень до смітника перервано."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Вилучення або пересування повідомлень до смітника перервано."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Перейти до теки"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Зберегти &як…"
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Вилучити &застарілі повідомлення зі всіх тек"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Перевірити &пошту"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Перевірити пошту у"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Перевірити пошту"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Н&адіслати повідомлення з черги"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Мережний стан (невідомий)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Надіслати повідомлення з черги за допомогою"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Керування сертифікатами"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Імпортувати повідомлення…"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Налагодження фільтрів…"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Переглядач журналу &фільтра…"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "&Імпортувати з іншої програми для роботи з ел. поштою…"
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Редагувати відповіді «Мене немає»…"
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "Налаштувати автоматичне а&рхівування…"
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "Відкладені повідомлення…"
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "Повідомлення стеження за нагадуваннями…"
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Вилучити"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "Пересунути &гілку в смітник"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Пересунути всю гілку в смітник"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Вилучити г&ілку"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Пошук повідомлень…"
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "Ви&брати всі повідомлення"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "&Керування списком листування…"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Призначити скорочення…"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "&Параметри вилучення застарілих повідомлень"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "&Архівувати теку…"
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Завантажити з&овнішні посилання"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Копіювати повідомлення до…"
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Пересунути повідомлення до…"
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "Н&ове повідомлення…"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Створити"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "Нове повідомлення на основі &шаблону"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "&Надіслати повідомлення до списку листування…"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Створити &фільтр"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Фільтр за темо&ю…"
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Фільтр &за відправником…"
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Фільтр за &адресатом…"
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "Фільтр за &копією…"
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Позначити &гілку"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Позначити гілку як &прочитану"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Позначити всі повідомлення у вибраній гілці як прочитані"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Позначити гілку як н&епрочитану"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Позначити всі повідомлення у вибраній гілці як непрочитані"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Позначити гілку як ва&жливу"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Зняти мітку про &важливість гілки"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Позначити гілку як &елемент дії"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Вилучити мітку про &елемент дії з гілки"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Наглядати за г&ілкою"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Ігнорувати гілку"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "&Зберегти долучення…"
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "Копіювати розшифроване до…"
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Застос&увати всі фільтри"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "&Розгорнути гілку/групу"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Розгорнути поточну гілку або групу"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "З&горнути гілку/групу"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Згорнути поточну гілку або групу"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "&Розгорнути всі гілки"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Розкриває всі гілки в поточній теці"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Зг&орнути всі гілки"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Згортає всі гілки в поточній теці"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "Показ&ати повідомлення"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "На&ступне повідомлення"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Перейти до наступного повідомлення"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Наступне н&епрочитане повідомлення"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Наступне"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Перейти до наступного непрочитаного повідомлення"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Попередн&є повідомлення"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Перейти до попереднього повідомлення"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "Попере&днє непрочитане повідомлення"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Попереднє"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Перейти до попереднього непрочитаного повідомлення"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "Наст&упна непрочитана тека"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Перейти до наступної теки з непрочитаними повідомленнями"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Попе&редня  непрочитана тека"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Перейти до попередньої теки з непрочитаними повідомленнями"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "Н&аступний непрочитаний текст"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Перейти до наступного непрочитаного тексту"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4600,223 +4615,228 @@
 "Прокрутити поточне повідомлення вниз. Якщо це кінець повідомлення, перейти "
 "до наступного."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Налаштувати &фільтри…"
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Керування скриптами &Sieve…"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&Додати запис…"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Вступ до KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Показати початкову сторінку KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Налаштування с&повіщень…"
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Налашту&вання KMail…"
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Вилучити застарілі повідомлення…"
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Додати теку улюбленого…"
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Підписка на сервері…"
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "Застосувати всі фільтри"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "Імпортувати або експортувати дані KMail…"
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Створити запис контакту у адресній книзі…"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Скопіювати повідомлення в теку"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Перейти до теки…"
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Припинити поточну дію"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Фокус до наступної теки"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Фокус до попередньої теки"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Вибрати теку з фокусом"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Фокус на першу теку"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Фокус на останню теку"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Фокус до наступного повідомлення"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Фокус до попереднього повідомлення"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Позначити перше повідомлення"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Позначити останнє повідомлення"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Вибрати повідомлення з фокусом"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Перевести фокус на швидкий пошук"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Включити до вибраного попереднє повідомлення"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Включити до вибраного наступне повідомлення"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Пересунути повідомлення в теку"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "Низьке споживання каналу"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "Позначити усі повідомлення у цій теці і усіх підтеках як прочитані"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "Вилучити дублікати у цій теці і усіх її підтеках"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "П&араметри облікового запису"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "Перезапустити обліковий запис"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "Додати теку улюбленого"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "С&порожнити смітник"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Пересунути всі повідомлення в смітник"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Вилучити пошук"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "Змінити пошук…"
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "&Вернути"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "&Вернути: «%1»"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Фільтр «%1»"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Шукати… <%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4826,12 +4846,12 @@
 "Використання HTML у пошті послаблює ваш захист від «спаму» та збільшує "
 "ймовірність використання шпарин у захисті вашої системи."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Використовувати HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4847,121 +4867,121 @@
 "Ви можете налаштувати уніфіковані поштові скриньки, створити нетипові або\n"
 "повністю вимкнути цю можливість за допомогою параметрів додатків KMail."
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "Увімкнути уніфіковані поштові скриньки?"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "Увімкнути уніфіковані поштові скриньки"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Запуск…"
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "&Пересунути в смітник"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Викинути"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Пересунути повідомлення в смітник"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "Не вдалося скопіювати пункт. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Нове повідомлення до…"
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Надіслати відповідь до…"
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Переслати до…"
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "Додати до наявного запису контакту"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Відкрити в адресній книзі"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Додати посилання до закладок"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Змінити запис контакту…"
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Зберегти посилання як…"
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Знайти в повідомленні…"
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Зберегти зображення на диску…"
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "Показувати дані у форматі HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 "Показувати дані у форматі HTML, якщо повідомлення надійшло від цього контакту"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 "Завантажувати дані за зовнішніми посиланнями, якщо повідомлення надійшло від "
 "цього контакту"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "Оприлюднити зображення…"
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4970,64 +4990,64 @@
 "Нову версію KMail засновано на оболонці керування особистою інформацією "
 "Akonadi, впровадження якої пов’язано зі значними змінами."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Надсилання повідомлень (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Покращені можливості пошуку"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Підтримка додавання нотаток (анотацій) до листів"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Менше гальмування у інтерфейсі, фонові перевірки надходження нової "
 "кореспонденції"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "Підтримка додатків"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "Новий засіб обробки і показу HTML (QtWebEngine)"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "Додано перевірку шахрайських адрес"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "Клієнт електронної пошти KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "Отримуємо вміст тек"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "Будь ласка, зачекайте…"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "Автономний режим"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -5036,7 +5056,7 @@
 "KMail працює в автономному режимі. Натисніть <a href=\"kmail:goOnline\">тут</"
 "a>, щоб з'єднатись з мережею…</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -5045,22 +5065,22 @@
 "Обліковий запис працює в автономному режимі. Натисніть <a href=\"kmail:"
 "goResourceOnline\">тут</a>, </p>щоб з'єднатись з мережею…"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Запис контакту успішно змінено"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Нові повідомлення у"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "Непрочитаних повідомлень немає"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5085,8 +5105,8 @@
 msgstr "© Tobias Koenig, 2004–2010"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5181,17 +5201,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "Вкажіть резюме додатка, які слід показати на сторінці резюме."
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "Зведення Kontact KDE"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "© Tobias Koenig, 2004"
@@ -5238,27 +5258,27 @@
 msgid "All"
 msgstr "Все"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Зведення Контакту"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Перегляд зведення Контакту"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© Розробники Kontact, 2003–2019"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5286,7 +5306,7 @@
 msgid "&Reply"
 msgstr "Ві&дповісти"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Відповісти…"
@@ -5296,12 +5316,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Відповісти автор&у…"
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Відповісти всі&м…"
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Відповісти до &списку листування…"
@@ -5331,7 +5351,7 @@
 msgid "&Edit As New"
 msgstr "&Редагувати як нове"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5522,45 +5542,45 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "Спроба пошуку зазнала невдачі. Виявлено помилки: <ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Пошук повідомлень"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Шукати"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Всередині…"
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Як &долучення…"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Зберегти долучення…"
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Зняти вибір"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "Перейти до початкової теки"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
@@ -5569,37 +5589,37 @@
 msgstr[2] "%1 відповідностей"
 msgstr[3] "%1 відповідність"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Останній пошук"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "Вами не вказано чинної теки."
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "Ви забули позначити збірки."
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "Ви забули визначити умову."
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "Усі позначені теки або порожні, або вміст цих тек не було індексовано."
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "Ви забули визначити умови."
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
@@ -5607,32 +5627,32 @@
 "Не можна використовувати умову щодо вмісту, якщо кількість символів у "
 "критерії є меншою за 4."
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Шукаємо…"
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "Не вдалося отримати результат пошуку. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "Невдалий пошук."
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "Пошук завершено"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "Пошук зупинено."
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5643,7 +5663,7 @@
 "причиною подібних проблем є існування іншої теки пошуку з тією самою назвою. "
 "Повернуте повідомлення про помилку: «%1»."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
@@ -5652,7 +5672,7 @@
 msgstr[2] "Скопіювати %1 повідомлень"
 msgstr[3] "Скопіювати %1 повідомлення"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
@@ -5661,7 +5681,7 @@
 msgstr[2] "Вирізати %1 повідомлень"
 msgstr[3] "Вирізати %1 повідомлення"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "Перевіряємо стан покажчика…"
@@ -5797,7 +5817,7 @@
 "використання)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5808,7 +5828,7 @@
 "Питання ставитиметься лише один раз."
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5818,26 +5838,26 @@
 "показувати сторінку вступу до KMail."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Показувати рядок швидкого пошуку у теці"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Типово, пересилати вбудованим."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "Попереджати, якщо кількість адресатів перевищує:"
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5849,19 +5869,19 @@
 "можна вимкнути."
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Перевірити правопис до надсилання"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "&Автоматично запитувати щодо сповіщення про долю листа"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5879,13 +5899,13 @@
 "qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Інтервал автозбереження:"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5898,14 +5918,14 @@
 "нулю."
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 "Показувати керування фрагментами тексту і панель вставки у редакторі листів."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
@@ -5913,49 +5933,49 @@
 "форматі"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Список всіх нещодавно використаних адрес"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Список всіх нещодавно використаних кодувань"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "Показувати індикатор мітки шифрування"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "Підтверджувати типове скорочення надсилання"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Розмір діалогового вікна профілів (лише для внутрішнього використання)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Ширина вікна пошуку (лише для внутрішнього використання)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Висота вікна пошуку (лише для внутрішнього використання)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
@@ -5963,7 +5983,7 @@
 "використання)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
@@ -5971,85 +5991,85 @@
 "використання)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Панель перегляду повідомлення"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Не відображати перегляд повідомлення"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "Відображати перегляд повідомлення під списком повідомлень"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "Відображати перегляд повідомлення збоку від списку повідомлень"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Список тек"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Великий список тек"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Малий список тек"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Шаблон повідомлення для нового повідомлення"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Шаблон повідомлення відповіді"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Шаблон повідомлення відповіді всім"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Шаблон повідомлення пересилання"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Символи цитування"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Визначає правила, які буде показано у вікні правил"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6059,7 +6079,7 @@
 "внутрішнього використання)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6069,7 +6089,7 @@
 "використання)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6079,7 +6099,7 @@
 "внутрішнього використання)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6089,7 +6109,7 @@
 "внутрішнього використання)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6099,7 +6119,7 @@
 "використання)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6369,7 +6389,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6405,7 +6425,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6735,8 +6755,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr "Перевірити стеження за адресою у пошті"
+msgid "Scan emails for tracking URLs"
+msgstr "Шукати у повідомленнях адреси для стеження за користувачем"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7365,6 +7385,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Ввімкнути знову всі попередження «більше не питати»"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 сек."
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "Скасувати надсилання"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7424,6 +7454,12 @@
 msgid "Zoom: %1%"
 msgstr "Масштаб: %1%"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Фрагменти тексту"
+
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Перевірити стеження за адресою у пошті"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "Назва теки і розмір при наближенні до квоти"
 
@@ -10129,10 +10165,6 @@
 #~ "зберігаються?<nl/><warning>Ви не зможете скасувати це вилучення.</warning>"
 
 #~ msgctxt "@info"
-#~ msgid "Do you really want to remove group \"%1\"?"
-#~ msgstr "Ви справді бажаєте вилучити групу «%1»?"
-
-#~ msgctxt "@info"
 #~ msgid ""
 #~ "Do you really want to remove snippet \"%1\"?<nl/><warning>There is no way "
 #~ "to undo the removal.</warning>"
@@ -11173,9 +11205,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Визначте, чи використовуватиме запис типовий профіль"
 
-#~ msgid "Identity account"
-#~ msgstr "Обліковий запис профілю"
-
 #~ msgid "RID path to the mailbox to watch for changes"
 #~ msgstr ""
 #~ "Шлях отримання даних з поштової скриньки, за яким слід спостерігати за "
diff -Nru kmail-19.04.3/po/uk/kmail-refresh-settings.po kmail-19.12.3/po/uk/kmail-refresh-settings.po
--- kmail-19.04.3/po/uk/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/uk/kmail-refresh-settings.po	2020-03-03 00:34:16.000000000 +0000
@@ -0,0 +1,111 @@
+# Translation of kmail-refresh-settings.po to Ukrainian
+# Copyright (C) 2019 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
+#
+# Yuri Chornoivan <yurchor@ukr.net>, 2019.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail-refresh-settings\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-07 08:35+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 19.11.70\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Юрій Чорноіван"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "yurchor@ukr.net"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr "Допоміжна програма KMail для оновлення параметрів"
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr "© Laurent Montel <montel@kde.org>, 2019"
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "Автор"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr "Оновлення параметрів KMail"
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr "Попередження"
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr "Спорожнення параметрів"
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr "Завершити"
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr "Спорожнити"
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr "Вилучення застарілих параметрів «Підказки дня»: завершено"
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr "Вилучення параметрів діалогових вікон з файла «%1»: завершено"
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr "Вилучення параметрів фільтрів з файла «%1»: завершено"
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr "Спорожнення параметрів тек у файлі параметрів «%1»: завершено"
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr "Вилучення параметрів розмірів вікон у файлі параметрів «%1»: завершено"
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr ""
+"Будь ласка, закрийте вікно KMail/Kontact, перш ніж користуватися цією "
+"програмою."
+
+#~ msgid "PIM Import Tool"
+#~ msgstr "Засіб імпортування PIM"
diff -Nru kmail-19.04.3/po/uk/ktnef.po kmail-19.12.3/po/uk/ktnef.po
--- kmail-19.04.3/po/uk/ktnef.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/uk/ktnef.po	2020-03-03 00:34:16.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ktnef\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2016-11-19 10:39+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
diff -Nru kmail-19.04.3/po/wa/kmail.po kmail-19.12.3/po/wa/kmail.po
--- kmail-19.04.3/po/wa/kmail.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/wa/kmail.po	2020-03-03 00:34:17.000000000 +0000
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
 "PO-Revision-Date: 2013-07-06 02:07+0200\n"
 "Last-Translator: Jean Cayron <jean.cayron@gmail.com>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -207,8 +207,8 @@
 msgstr "sacwantès clés d' ecriptaedje pa -z adresse"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -315,27 +315,27 @@
 "KMail n' a savou detecter totafwaitmint ene copinreye e ç' ridant ci. "
 "Rimplixhoz les adresses al mwin, s' i vs plait."
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "Cwota"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "Eployaedje :"
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "Statut : "
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% rimpli"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, fuzzy, kde-format
 #| msgid "%1 of %2 KiB used"
 msgid "%1 of %2 used"
@@ -359,7 +359,7 @@
 "vôrîz assoçner avou ç' ridant la.</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "Modeles"
@@ -370,109 +370,109 @@
 msgstr "E&ployî des modeles di messaedje a vosse môde dins ç' ridant ci"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "&Copyî globås modeles"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "Vey"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "Tchoezi vos prôpès &imådjetes"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "&Normå :"
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "&Nén léjhou :"
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "Mostrer colone Evoyeu/Riçuveu el djivêye des messaedjes"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "&Mostrer colone :"
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "Prémetou"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "Evoyeu"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "Riçuveu"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "Djivêye des messaedjes"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "Si siervi do f&yi di messaedjes prémetou"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "Fyi di messaedjes"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "Si siervi do tinme prémetou "
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "Tinme"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, fuzzy, kde-format
 #| msgid "Insecure Message Format"
 msgid "Message Default Format"
 msgstr "Cogne do messaedje nén såve"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "HTML pus rade ki peur tecse"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &HTML to Plain Text"
 msgid "Prefer text to HTML"
 msgstr "&HTML pus rade ki peur tecse"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Reset Font Settings"
 msgid "Use Global Settings"
@@ -483,103 +483,108 @@
 msgid "Retrieval Options"
 msgstr "Tchuzes d' abagaedje"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "&Idintité"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "Dji rçû"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "Dj' evoye"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "Contes rexhants (radjoutez è onk pol moens!):"
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "Kimonès tchuzes"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "Acertiner &divant d' evoyî"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "Verifyî l' ortografeye divant d' evoyî"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "Måy otomaticmint"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "Ås waitaedjes des emiles al mwin"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "A tos les waitaedjes des emiles"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "Evoyî sol côp"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "Evoyî pus tård"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "Evoyî &messaedjes e ridant d' rexhowe:"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "Prémet&owe metôde d' evoyaedje"
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "Radjouter on conte"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "Mete l' ôre des contes a vosse môde..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -589,30 +594,30 @@
 "Dji n' a savou abaguer l' macrea des contes. Verifyîz vost astalaedje, s' i "
 "vs plait."
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "Dji n' sai enonder l' macrea des contes"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "Mete divins l' waitaedje al mwin s' i gn a des emiles"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "Si disraloyî a l' aresse di KMail"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "Waitî s' i gn a des emiles a l' enondaedje"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -668,7 +673,7 @@
 msgid "Fixed Width Font"
 msgstr "Fonte a espåçmint ewal"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "Aspougneu"
@@ -979,94 +984,94 @@
 "Nos n' savans ahiver d' etikete. Ene etikete avou l' minme no egzistêye "
 "dedja."
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "Djenerå"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "Sitandårds modeles"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "Modeles a vosse môde"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "Sudjet"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "Ecôdaedje"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "Tiestires"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "Ataetchmints"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "Coridjaedje otomatike"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "Candjî otomaticmint l' grandeu d' imådje"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, fuzzy, kde-format
 #| msgid "Signature"
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "Sinateure"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, fuzzy, kde-format
 #| msgid "Use smaller font for quoted text"
 msgid "Insert the signature above any quoted text"
 msgstr "Eployî des pus ptitès fontes po l' tecse inte wiyemets"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, fuzzy, kde-format
 #| msgid "F&ormat:"
 msgctxt "@title:group"
 msgid "Format"
 msgstr "C&ogne :"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, only quote the selected text instead of the complete "
@@ -1079,7 +1084,7 @@
 "Cwand on respond, ni rdire kel sicrijhaedje di tchoezi al plaece do "
 "messaedje tot etir cwand i gn a do tecse di tchoezi el finiesse do messaedje."
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1096,17 +1101,17 @@
 "dpus et kel\n"
 "tecse a stî metou al roye otomaticmint."
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, fuzzy, kde-format
 #| msgid ""
 #| "When replying or forwarding, only quote the message in the original "
@@ -1120,7 +1125,7 @@
 "Cwand vs respondoz, ni rdijhoz l' messaedje kel cogne k' il a stî rçî ou "
 "ôtrumint, s' il est disclitchî, i srè respondou prémetou come do peur tecse."
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1128,36 +1133,36 @@
 "are supported."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "Dins l' messaedje"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "Come ataetchmint"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, fuzzy, kde-format
 #| msgid "Default Forwarding Type:"
 msgid "Default forwarding type:"
 msgstr "Prémetowe sôre di recassaedje :"
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, fuzzy, kde-format
 #| msgid "All Recipients"
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "Tos les riçuveus"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1165,18 +1170,18 @@
 "Disposition Notification\""
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "M' advierti si gn a trop d' riçuveus di specifyîs"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Set the maximum number of recipients for the warning"
 msgstr "M' advierti sel nombe di riçuveus est pus grand ki"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1187,52 +1192,52 @@
 "mailing lists."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, fuzzy, kde-format
 #| msgid "No save"
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "Nén schaper"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, fuzzy, kde-format
 #| msgid "Recent Addresses"
 msgid "Maximum recent addresses retained:"
 msgstr "Dierinnès adresses"
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "Apontyî ôre di completaedje..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "Pont di schapaedje tot seu"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "Pont di schapaedje tot seu"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, fuzzy, kde-format
 #| msgid " min"
 msgctxt "Interval suffix"
@@ -1241,19 +1246,19 @@
 msgstr[0] " mun"
 msgstr[1] " mun"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, fuzzy, kde-format
 #| msgid "Automatically request &message disposition notifications"
 msgid "Automatically save the message at this specified interval"
 msgstr "Dimander otomaticmint des notifiaedjes di lijhaedje des &messaedjes"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "Betchetes di re&sponse pol sudjet"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1262,59 +1267,59 @@
 "Ricnoxhe tot l' minme li kéne shûte des betchetes shuvantes\n"
 "(les intrêyes sont des erîlêyès ratourneures sins rwaitî al casse):"
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "R&adjouter..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "&Oister"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "Cand&jî..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "Dinez ene novele betchete di response:"
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "Betchetes di &rcassaedje pol sudjet"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "Radjouter..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "&Oister"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "Candjî..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "Dinez ene novele betchete di rcassaedje:"
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1324,90 +1329,90 @@
 "po -z en ecôdaedje des caracteres k' a tos les caracteres dimandés."
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "&Candjî..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "Dinez on ecôdaedje di caracteres:"
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 "&Wårder l' oridjinnå écôdaedje des caracteres cwand ås respondaedjes et "
 "ricassaedjes, si do moens c' est possibe"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "Cist ecôdaedje di caracteres la n' est nén sopoirté."
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "&Eployî cawete d' id di messaedje a vosse môde"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "Cawete d' &id di messaedje a vosse môde:"
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "Defini tchamps d' tiestire mime a vosse môde:"
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "No"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "Valixhance"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "No&vea"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "&No :"
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "&Valixhance :"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid header"
 msgstr "M&ete en alaedje sinateure"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Manire di lomer les ataetchmints copatibes avou Outlook"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
@@ -1416,41 +1421,41 @@
 "Eclitchîz cisse tchuze po k' Outlook(tm) copurde les nos d' ataetchmints k' "
 "ont des caracteres nén inglès"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "Mete e&n alaedje li deteccion des ataetchmints mankant"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Riconoxhe tolminme kés mots clés clé ki shuvèt come voleur ataetchî on "
 "fitchî :"
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "Intrez novea mot clé :"
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "Come ataetchmint"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " ko"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "Nole limite"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1542,7 +1547,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "Aspougneu"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1661,7 +1666,7 @@
 msgid "Archive Folder"
 msgstr "Ridant d' årtchivaedje"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, fuzzy, kde-format
 #| msgid "Archive"
 msgctxt "@action"
@@ -1728,19 +1733,19 @@
 msgid "Notification"
 msgstr "Notifiaedje"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "1 ataetchmint (%2)"
 msgstr[1] "%1 ataetchmints (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "Catchî l' djivêye des ataetchmints"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "Mostrer l' djivêye des ataetchmints"
@@ -1757,336 +1762,336 @@
 msgid "Encoding"
 msgstr "Ecôdaedje"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, fuzzy, kde-format
 #| msgid "KMail"
 msgid "KMail2"
 msgstr "KMail"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 "Tchoezixhoz l' motî a eployî po coridjî l' ortografeye di ç' messaedje ci"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 "Tchoezixhoz li ridant des emiles evoyîs ewou çk' ene copeye di ç' messaedje "
 "ci serè schapêye"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 "Tchoezixhoz l' conte rexhant a eployî a-z eployî po-z evoyî ç' messaedje ci"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "Definixhoz l' adresse emile « Di : » po ç' messaedje ci"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "Definixhoz on sudjet po ç' messaedje ci"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "&Idintité :"
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "&Motî :"
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "Ridant des messaedjes &evoyîs :"
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "Ber&wetaedje des emiles :"
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "&Di :"
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "S&udjet :"
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "&Evoyî emile"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "&Evoyî emile via"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "Evoyî"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "Evoyî &pus tård"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "Evoyî &pus tård via"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "Cawêye"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "&Schaper come brouyon"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "Schaper emile e ridant des brouyons"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "Schaper come &modele"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "Schaper emile e ridant des modeles"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "Schaper come &fitchî"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "Schaper emile come tecse ou fitchî html"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "&Stitchî on fitchî tecse..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "&Stitchî on fitchî tecse eployî dierinnmint"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "Cal&pin d' adresses"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "Drovi calpin d' adresses"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "&Novea purnea po scrire"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "Tchoezi &riçuveus..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "Schaper djivêye di &distribucion..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "Aclaper come ataetc&hmint"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "Oister les es&påçmints"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "Eployî ene ewa&le fonte"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "&Urdjint"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "&Dimander on notifiaedje di riçuvaedje"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "&Dimander on notifiaedje di riçuvaedje"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "&Rivni al roye"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "&Bokets"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "Coridjrece ortografike &otomatike"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Aspougnaedje e tecse eritchî"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Tecse eritchî"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "(Dis)mete môde d' aspougnaedje e tecse eritchî"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "&Tos les tchamps"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "&Idintité"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "&Motî"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "Ridant des messaedjes e&voyîs"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "&Berwetaedje des emiles"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "&Di"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "S&udjet"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "Adjouter l' s&inateure"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "Adjout&er l' sinateure"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "Sititchî l' sinateure a l' eplaeçmint do c&ursoe"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "&Coridjrece..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "Coridjrece"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "&Ecripter li messaedje"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "Ecripter"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "&Siner li Messaedje"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "Siner"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "&Cogne criptografike do messaedje"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "Tchoezixhoz ene cogne criptografike po ç' messaedje ci"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Create Follow Up Reminder..."
 msgstr "&Trover des messaedjes..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "Apontyî KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
@@ -2095,53 +2100,53 @@
 "<qt>Çoula catchrè ttafwait l' båre del dressêye. Vos l' savoz rmostrer tot "
 "tapant so %1.</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " Roye : %1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " Colone : %1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "SPO"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "STI"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "Waitaedje di l' ortografeye : metou"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "Waitaedje di l' ortografeye : dismetou"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "Ri&schaper come modele"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "&Schaper come brouyon"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
@@ -2150,7 +2155,7 @@
 "Rischaper ç' messaedje ci e ridant des Modeles. On sait eployî çoula pus "
 "tård."
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
@@ -2159,60 +2164,60 @@
 "Rischaper ç' messaedje ci e ridant des Brouyons. On l' sait candjî et evoyî "
 "pus tård."
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "Voloz vs leyî tchaire ci messadje oudonbén l' schaper po pus tård?"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "Clôre finiesse po scrire"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "Li schapaedje otomatike des messaedjes a fwait berwete"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "L' evoyaedje des messaedjes a fwait berwete."
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, fuzzy, kde-format
 #| msgid "&Insert Text File..."
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "&Stitchî on fitchî tecse..."
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "Radjouter come imådje d&ins l' messaedje"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "Radjouter come &ataetchmint"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "No di l' ataetchmint :"
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "&Enable signature"
 msgid "Invalid Attachment Name"
 msgstr "M&ete en alaedje sinateure"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, fuzzy, kde-format
 #| msgid "Add URL into Message &Text"
 #| msgid_plural "Add URLs into Message &Text"
@@ -2221,24 +2226,24 @@
 msgstr[0] "Radjouter l' URL e &tecse do messaedje"
 msgstr[1] "Radjouter les URL e &tecse do messaedje"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "Radjouter l' fitchî come &ataetchmint"
 msgstr[1] "Radjouter les fitchîs come &ataetchmint"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "Stitchî l' tecse do presse-papî come ataetchmint"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "co nou no"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2251,12 +2256,12 @@
 "(OpenPGP ou S/MIME) a eployî po çoula.</p><p>Tchoezixhoz li/les clé(s) a "
 "eployî e l' apontiaedje d' idintité, s' i vs plait.</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "Clé d' ecriptaedje nén defineye"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2264,12 +2269,12 @@
 "in the identity configuration.</p></qt>"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "Clé d' sinateure nén defineye"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2280,7 +2285,7 @@
 "adresse emile po totes les idintités, eto, po k' vos n' åyîz nén a l' taper "
 "po tchaeke messaedje."
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
@@ -2289,61 +2294,61 @@
 "Vos dvoz dner pol moens on riçuveu, soeye-t i e tchamp Di :, soeye-t i come "
 "Cc : ou Bcc :."
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "Li tchamp Po : est vude.  Fåt i tot l' minme evoyî li messaedje insi ?"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "Nou Po : di dné"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr ""
 "Vos n' avoz pont metou di sudjet.  Fåt i tot l' minme evoyî li messaedje "
 "insi ?"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "Nou sudjet di dné"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "Evoyî &come c' est"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "Dinez li &sudjet"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "Vos dvoz dné pol moens on riçuveu po saveur ecripter on brouyon."
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "Cåzu a l' evoyaedje di l' emile..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "Evoyî racertinaedje"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "Evoyî sol &côp"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
@@ -2352,22 +2357,22 @@
 "Vos sayîz d' evoyî l' emile a dpus ki %1 rçuveus. Fåt i tot l' minme evoyî "
 "li messaedje insi ?"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "Trop di rçuveus"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "Evoyî &come c' est"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "Candjî l&es riçuveus"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
@@ -2375,43 +2380,43 @@
 msgstr ""
 "Dismete li môde HTML ferè piede å tecse si epådjnaedje. Li fé po do bon ?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "Piede l' epådjnaedje ?"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "Piede l' epådjnaedje "
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "Radjouter rimarke e peur tecse"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2419,7 +2424,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2500,25 +2505,25 @@
 msgid "External editor was started."
 msgstr "Li dfoûtrin aspougneu di tecse a stî enondé"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2545,11 +2550,6 @@
 msgid "Message will not be encrypted"
 msgstr "Li messaedje ni serè nén ecripté"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "Bokets d' tecse"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2598,30 +2598,30 @@
 msgid "Cannot move messages."
 msgstr "Dji n' sai bodjî l' messaedje. %1"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "Dji n' a nén parvinou a fé l' ridant"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, fuzzy, kde-format
 #| msgid "No folder selected"
 msgid "No folder returned."
 msgstr "Nou ridant d' tchoezi"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, fuzzy, kde-format
 #| msgid "Failed to create folder"
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "Dji n' a nén parvinou a fé l' ridant"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, fuzzy, kde-format
 msgid "Unable to return list of folders."
 msgstr "Dji n' sai radjouter l' messaedje a ridant des messaedjes e rexhowe"
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, fuzzy, kde-format
 #| msgid "Message was signed by %1."
 msgid "Messages archived"
@@ -2664,50 +2664,50 @@
 msgid "&Existing identities:"
 msgstr "&Idintités egzistantes :"
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "Åk n' a nén stî come dji rloméve li ridant %1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "Intrez novea mot clé :"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "Candjî l' idintité"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "Djenerå"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "&Vosse no :"
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2715,12 +2715,12 @@
 "this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "So&ce :"
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2728,12 +2728,12 @@
 "sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "Adresse d' e&mile :"
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2743,12 +2743,12 @@
 "wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "A&liasses di l' emile :"
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2759,12 +2759,12 @@
 "alias address per line.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "Criptografeye"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2774,12 +2774,12 @@
 "<a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "Clé d' sinateure OpenPGP :"
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2790,12 +2790,12 @@
 "at <a>https://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "Clé d' ecriptaedje OpenPGP :"
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2804,12 +2804,12 @@
 "not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "Acertineure di sinateure S/MIME :"
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2819,41 +2819,41 @@
 "functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "Acertineure d' ecriptaedje S/MIME :"
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "Cogne ki dj' a ptchî :"
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, fuzzy, kde-format
 #| msgid "&Automatically sign messages"
 msgid "Automatically sign messages"
 msgstr "Siner les messaedjes otom&aticmint"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "Ecripter les &messaedjes otomaticmint cwand c' est possibe"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "Po les spepieus"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "Adresse po les &responses :"
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2864,12 +2864,12 @@
 "address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "Adresses &CC :"
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2880,12 +2880,12 @@
 "blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "Adresses &BCC :"
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2896,58 +2896,58 @@
 "list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "M&otî :"
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "Ridant des messaedjes &evoyîs :"
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "Ridant brou&yons :"
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "Ridan&t des modeles :"
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "Conte rexhant :"
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "Ataetchî m' vCard å messaedje"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "Ahiver..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "Lingaedje do coridjaedje otomatike :"
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, fuzzy, kde-format
 #| msgid "Defaul&t domain:"
 msgid "Restore default domain name"
 msgstr "Préme&tou dominne:"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "Préme&tou dominne:"
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
@@ -2956,33 +2956,33 @@
 "<qt><p>Li dominne prémetou est eployî po completer les adresses emile ki n' "
 "sont fwaites ki do no da l' uzeu.</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "E&ployî des modeles di messaedje a vosse môde po ciste idintité ci"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "Sinateure"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "Imådje"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "Aliasse d' emile « %1 » nén valåbe"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "Adresse emile nén valåbe"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2996,7 +2996,7 @@
 "k' aparexhront cwand i sayrè d' verifyî des sinateures fwaites avou cist "
 "apontiaedje ci."
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -3005,7 +3005,7 @@
 "Ene des clés d' ecriptaedje OpenPGP d' aponteye n' a pont d' ID d' uzeu avou "
 "l' adresse aponteye po ciste idintité ci (%1)."
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -3019,7 +3019,7 @@
 "k' aparexhront cwand i sayrè d' verifyî des sinateures fwaites avou cist "
 "apontiaedje ci."
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -3028,22 +3028,22 @@
 "Ene des acertineures d' ecriptaedje OpenPGP d' aponteye n' a nén l' adresse "
 "aponteye po ciste idintité ci (%1)."
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "Adresse emile nén trovêye ezès Clé/Acertineures"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "Li fitchî d' sinateure n' est nén valåbe"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "Candjî l' idintité « %1 »"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -3056,7 +3056,7 @@
 "(pus) ; ça fwait kel ridant prémetou des brouyons d' emiles serè eployî al "
 "plaece."
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "Aspougnî..."
@@ -3091,6 +3091,19 @@
 msgid "We cannot delete vCard file."
 msgstr ""
 
+#: identity/identityeditvcarddialog.cpp:135
+#, fuzzy, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "<qt>Voloz po do bon disfacer l' idintité lomêye <b>%1</b>?</qt>"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Evoyî racertinaedje"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3249,7 +3262,7 @@
 "\">https://ace.home.xs4all.nl/X-Faces/</a>."
 msgstr ""
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr ""
@@ -3283,7 +3296,7 @@
 msgstr[0] "Li djivêye d' emilaedje %2 est vude, on nel sait eployî."
 msgstr[1] "Les djivêyes d' emilaedje %2 sont vudes, on n' les sait eployî."
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "Radjouter å calpin d' adresses"
@@ -3293,22 +3306,22 @@
 msgid "Contact created successfully"
 msgstr "Contak ahivé comifåt"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "Dji n' sait schaper l' contak : %1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "Dji n' a savou schaper l' contak"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "Voloz vs ataetchî ci ridant « %1 » ci ?"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "Ataetchî l' ridant"
@@ -3526,7 +3539,7 @@
 msgstr "R&idant"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3534,7 +3547,7 @@
 msgstr "Mete totes les &passetes e-n alaedje sol ridant"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3560,7 +3573,7 @@
 msgstr "Rica&ssî:"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "Mete les &passetes èn alaedje"
@@ -3585,7 +3598,7 @@
 msgstr "&Aidance"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "Mwaisse båre ås usteyes"
@@ -3641,14 +3654,14 @@
 msgid "The file does not contain a message."
 msgstr "I gn a pont d' messaedje e fitchî."
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 "I gn a sacwants messaedjes e fitchî. I gn a kel prumî messaedje ki srè "
 "mostré."
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3657,32 +3670,32 @@
 "Voloz vs ricassî les messaedjes tchoezis come des ataetchmints dins on seu "
 "messaedje (come on MIME groupé) ou come de messaedjes diferins ?"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "Evoyî come groupé"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "Evoyî come diferins"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "Dji passe les messaedjes al passete"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "Dji passe li messaedje %1 di %2 al passete"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "Dji bodje les messaedjes"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "Dji disface les messaedjes"
@@ -3711,31 +3724,31 @@
 msgid "Text Direction Toolbar"
 msgstr "Bår ås usteyes di direccion do scrijhaedje"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 "KMail est metou disraloyî : totes les bouyes avå l' rantoele sont djokêyes"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "Cåzu a l' evoyaedje di l' emile..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 "KMail est metou raloyî : totes les bouyes avå l' rantoeles ont stî rprindowes"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
@@ -3744,40 +3757,40 @@
 "KMail est metou raloyî : totes les bouyes avå l' rantoeles seront rprindowes "
 "cwand on raloyaedje al rantoele serè trové"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail est pol moumint e môde disraloyî. Comint vloz vs fé ?"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "Raloyî/disraloyî"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "Ovrer raloyî"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "Ovrer disraloyî"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 "Raloyaedje al rantoele trové, totes les bouyes avå l' rantoele ont rprindou"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 "Nou raloyaedje al rantoele di trové, totes les bouyes avå l' rantoele sont "
 "djokêyes"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3786,12 +3799,12 @@
 "Li drovaedje do fitchî di schapaedje tot seu so %1 a fwait berwete.\n"
 "Råjhon : %2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "Li drovaedje do fitchî di schapaedje tot seu a fwait berwete"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
@@ -3801,7 +3814,7 @@
 msgstr[1] ""
 "Ces %1 idintités ci ont stî candjeyes po-z eployî l' berwetaedje prémetou :"
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
@@ -3811,46 +3824,48 @@
 msgstr[1] ""
 "Ces %1 idintités ci ont stî candjeyes po-z eployî l' berwetaedje candjî :"
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "Evoyaedje des messaedjes"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "Inicialijhaedje do processus d' evoyaedje..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, fuzzy, kde-format
 #| msgid "Resource %1 is broken. This resource is now %2"
-msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "Li rsource %1 est schetêye. Li rsource est asteure %2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1 : %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "L' adjint d' årtchivaedje des emiles n' a nén stî eredjistré."
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, fuzzy, kde-format
 #| msgid "Archive Mail Agent was not registered."
 msgid "Send Later Agent was not registered."
 msgstr "L' adjint d' årtchivaedje des emiles n' a nén stî eredjistré."
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, fuzzy, kde-format
 #| msgid "Archive Mail Agent was not registered."
 msgid "Followup Reminder Agent was not registered."
 msgstr "L' adjint d' årtchivaedje des emiles n' a nén stî eredjistré."
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3860,12 +3875,12 @@
 "Dji n' a savou enonder li manaedjeu d' acertineure ; verifyîz vost "
 "astalaedje, s' i vs plait."
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "Messaedje d' aroke di KMail"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3875,26 +3890,30 @@
 "Dji n' a savou abaguer l' macrea d' abagaedje. Verifyîz vost astalaedje, s' "
 "i vs plait."
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "Dji n' sai enonder l' macrea d' abagaedje"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr ""
 "Dji n' a savou enonder l' programe « Ebagueu d' apontiaedje PIM ». Verifyîz "
 "vost astalaedje, s' i vs plait."
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "Dji n' sai enonder l' programe « Ebagueu d' apontiaedje PIM »."
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3904,13 +3923,13 @@
 "Dji n' a savou abaguer l' macrea d' abagaedje. Verifyîz vost astalaedje, s' "
 "i vs plait."
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, fuzzy, kde-format
 #| msgid "Unable to start import wizard"
 msgid "Unable to start ImportWizard"
 msgstr "Dji n' sai enonder l' macrea d' abagaedje"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, fuzzy, kde-format
 #| msgid ""
 #| "An other mailer was found on system. Do you want to import data from it?"
@@ -3919,59 +3938,59 @@
 "Èn ôte emileu a stî trové sol sistinme. Voloz vs abaguer des dnêyes di ci "
 "ci ?"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr ""
 "Dji n' a savou abaguer l' macrea d' abagaedje. Verifyîz vost astalaedje, s' "
 "i vs plait."
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "Nou sudjet"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(pont d' modele)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "Ci ridant ci n' a nole tchuze d' espiraedje di defineye"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>Estoz seur di voleur fé espirer l' ridant <b>%1</b> ?</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "Fé espirer l' ridant"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "Fé &espirer"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "Vudî li batch"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "Taper å batch"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "Voloz vs vudî l' ridant do batch po do bon ?"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
@@ -3980,27 +3999,27 @@
 "<qt>Voloz vs po do bon bodjî tos les messaedjes do ridant <b>%1</b> viè l' "
 "batch ?</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "Tos les messaedjes ont stî tapés å batch"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "Voloz vs fé espirer tos les vîs messaedjes po do bon ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "Fé espirer les vîs messaedjes ?"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "Espirer"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -4012,17 +4031,17 @@
 "sistinme soeye fwait cron pa des ôtes espwets d' såvrité prezints ou "
 "anticipés."
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "Advertixhmint di såvrité"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "Tcherdjî dfoûtrinnès referinces"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -4037,539 +4056,539 @@
 "<qt>Voloz vs disfacer po do bon les %1 messaedjes tchoezis ?<br />On côp "
 "disfacés, on n' les sårè pus rapexhî.</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "Disfacer les messaedjes"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "Disfacer l' messaedje"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "Dji bodje les messaedjes..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "Dji disface les messaedjes..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "Messaedjes disfacés comifåt."
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "Messaedjes bodjîs comifåt."
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "Li disfaçaedje des messaedjes a fwait berwete."
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "Dj' a rnoncî a disfacé les messaedjes."
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "Li bodjaedje des messaedjes a fwait berwete."
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "Dj' a rnoncî a bodjî les messaedjes"
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "Bodjî les messaedjes e ridant"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "Dji copeye les messaedjes..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "Messaedjes copyîs comifåt."
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "Li copiaedje des messaedjes a fwait berwete."
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "Dj' a rnoncî a copyî les messaedjes."
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "Copyî les messaedjes e ridant"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "Dji tape les messaedjes å batch..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "Dji tape les messaedjes å batch..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "Messaedjes tapés å batch comifåt."
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "Messaedjes tapés å batch comifåt."
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "Li tapaedje å batch des messaedjes a fwait berwete."
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "Li tapaedje å batch des messaedjes a fwait berwete."
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "Dj' a rnoncî a taper les messaedjes å batch."
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "Dj' a rnoncî a taper les messaedjes å batch."
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "Potchî dins ç' ridant ci"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "Sch&aper et rlomer..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "Fé &espirer tos les ridants"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "Waitî s' i gn a des e&miles"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "Waitî s' i gn a des emiles e"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "Waitî s' i gn a des emiles"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "Evoyî li &cawêye des messaedjes"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "Estat do raloyaedje (nén cnoxhou)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "Evoyî li &cawêye des messaedjes via"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "Manaedjeu d' acertineures"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "&Abaguer des messaedjes..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, fuzzy, kde-format
 msgid "&Debug Sieve..."
 msgstr "&Radjouter siervice..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "Passete do håyneu des fitchîs d&journå..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "Candjî response foû do buro..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "A&pontyî l' årtchivaedje otomatike..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, fuzzy, kde-format
 #| msgid "Deleting messages..."
 msgid "Delayed Messages..."
 msgstr "Dji disface les messaedjes..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, fuzzy, kde-format
 #| msgid "&Find Messages..."
 msgid "Followup Reminder Messages..."
 msgstr "&Trover des messaedjes..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "&Disfacer"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "&Taper l' lignoûle å batch"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "Taper l' lignoûle å batch"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "Disfacer li f&yis di messaedjes"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "&Trover des messaedjes..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "T&choezi tos les messaedjes"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "Manaedjmint des c&opinreyes..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "&Aroyî rascourti..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "Apontiaedjes di l' &espiraedje"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "Ridant d' årtchiv&aedje..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "Tcherdjî d&foûtrinnès referinces"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "Copyî messaedje aviè..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "Bodjî messaedje aviè..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "&Novea messaedje..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "Novea"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "&Messaedje a pårti d' on modele"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "Novea messaedje po 'ne &djåspinreye"
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "Fé 'ne &passete"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "Fé 'ne passete sol &sudjet..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "Fé 'ne passete so l' &evoyeu..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "Fé 'ne passete sol &riçuveu..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, fuzzy, kde-format
 #| msgid "Filter on &To..."
 msgid "Filter on &Cc..."
 msgstr "Fé 'ne passete sol &riçuveu..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "Marker li Li&gnoûle"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "Marker li Lignoûle come &Léjhowe"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "Marker tos les messaedjes di cisse lignoûle come léjhous"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "Marker li Lignoûle come &Nén Léjhowe"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "Marker tos les messaedjes di cisse lignoûle come nén léjhous."
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "Marker li Lignoûle come &Impôrtante"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "Oister l' marke di lignoûle di messaedje &impôrtante"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "Marker li lignoûle come &Afwaire a fé"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "Oister l' marke di lignoûle d' &afwaire a fé impôrtante"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "Marker li Li&gnoûle"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "&Passer houte li lignoûle"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "Schaper a&taetchmints..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "Copyî cayet viè..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "Mete totes les &passetes èn alaedje"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "Totafwait &mostrer l' lignoûle / groupe"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "Totafwait mostrer l' lignoûle ou groupe do moumint"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "Totafwait &catchî l' lignoûle / groupe"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "Totafwait catchî l' lignoûle ou groupe do moumint"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "Totafwait m&ostrer totes les lignoûles"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "Totafwait mostrer totes les lignoûles dins l' ridant do moumint"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "Totafwait c&atchî totes les lignoûles"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "Totafwait catchî totes les lignoûles dins l' ridant do moumint"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "&Mostrer l' messaedje"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "Messaedje &shuvant"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "Potchî å messaedje shuvant"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "Messaedje &nén léjhou shuvant"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "Shuvant"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "Potchî å messaedje nén léjhou shuvant"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "Messaedje di d&vant"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "Potchî å messaedje di dvant"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "&Messaedje di dvant nén léjhou"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "Di dvant"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "Potchî å messaedje nén léjhou di dvant"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "&Ridant shuvant nén léjhou"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "Potchî å ridant d' après k' a des messaedjes nén léjhous"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "Ri&dant di dvant nén léjhou"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "Potchî å ridant di dvant k' a des messaedjes nén léjhous"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "&messaedje nén léjhou shuvant"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "Potchî å messaedje nén léjhou shuvant"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
@@ -4578,229 +4597,235 @@
 "Disrôler viè l' dizo l' messaedje do moumint. S' il est al difén do "
 "messaedje do moumint, va å messaedje nén léjhou shuvant."
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "Apontyî les &passetes..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, fuzzy, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "Profils k' i gn a"
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "Radjouter on conte"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "&Adrovaedje di KMail"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "Håyner l' pådje di bénvnowe da KMail"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "Apontyî les &Notifiaedjes..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "Apont&yî KMail..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "Espirer..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "Radjouter favori ridant..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "Abounmint do costé do sierveu..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "Mete totes les &passetes èn alaedje"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "&Ebaguer les dnêyes di KMail.."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "Novea contak e calpin d' adresses"
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "Copyî li messaedje e ridant"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "Potchî a c' ridant ci..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "Abandner operåcion do moumint"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "Mete èn evidince li ridant d' après"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "Mete èn evidince li ridant di dvant"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "Tchoezi l' ridant avou l' focusse"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "Mete e-n evidince li prumî ridant"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "Mete èn evidince li dierin ridant"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "Mete e-n evidince li messaedje shuvant"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "Focusse sol messaedje di dvant"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "Tchoezi prumî messaedje"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "Tchoezi dierin messaedje"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "Tchoezi li messaedje avou metaedje e-n evidince"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "Mete e-n evidince li roed cweraedje"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "Sitinde li tchoes å messaedje di dvant"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "Sitinde li tchoes å messaedje shuvant"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "Bodjî li messaedje e ridant"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Message Window"
 msgid "Use Less Bandwidth"
 msgstr "Purnea di messaedje"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "A&pontiaedjes"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Identity Name"
+msgid "Restart Account"
+msgstr "No del idintité"
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "Radjouter favori ridant"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "&Vudî li batch"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "&Taper tos les messaedjes å batch"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "&Disfacer cweraedje"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, fuzzy, kde-format
 msgid "Edit Search..."
 msgstr "Aspougnî..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr ""
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "Passete %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgid "Searching..."
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "Dji cwîre..."
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4811,12 +4836,12 @@
 "« spams » eyet pôreut agrandi l' possibilité k' vosse sistinme soeye fwait "
 "cron pa des ôtes espwets d' såvrité prezints ou anticipés."
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "Si siervi d' HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4826,123 +4851,123 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, fuzzy, kde-format
 #| msgid "C&ancel"
 msgid "Cancel"
 msgstr "&Rinoncî"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "Dj' enonde..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "Taper å &batch"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "Batch"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "Taper li messaedje å batch"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, fuzzy, kde-format
 #| msgid "Can not copy item. %1"
 msgid "Cannot copy item. %1"
 msgstr "Dji n' sai copyî l' cayet. %1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "Novea Messaedje a..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "Responde a..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "Ricassî a..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, fuzzy, kde-format
 #| msgid "Failed to store contact"
 msgid "Add to Existing Contact"
 msgstr "Dji n' a savou schaper l' contak"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "Drovi e calpin d' adresses"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "Fé ene rimåke po ç' hårdêye ci"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "Candjî contak..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "Schaper et rlomer hårdêye..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "&Cweri e messaedjes..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "Schaper l' imådje sol plake..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, fuzzy, kde-format
 #| msgid "Show HTML stat&us bar"
 msgid "Show HTML Format"
 msgstr "Mostrer l' båre d' estat &HTML"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr ""
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, fuzzy, kde-format
 #| msgid "Save Image On Disk..."
 msgid "Share image..."
 msgstr "Schaper l' imådje sol plake..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
@@ -4951,70 +4976,70 @@
 "KMails est asteure båzé so l' evironmint di manaedjmint des informåcions da "
 "vosse d' Akonadi, çou ki fwait k' i gn a bråmint des afwaires k' on candjî."
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Bouter les emiles (IMAP NI FWAIT RÉN)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "Cweraedjes ramidrés"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "Possibilité di radjouter des notes (des rawetes di tecse) ås emiles"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 "Moens d' edjalaedjes di l' eterface uzeu, li veriaedje des emiles si fwait "
 "dins l' fond"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "Sopoirt GnuPG"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "Verifyî l' ortografeye divant d' evoyî"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "On cliyint d' emilaedje po KDE"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "Dj' obtén les prôpietés des ridants"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "Tårdjîz s' i vs plait"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "disraloyî"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -5028,7 +5053,7 @@
 "disraloyî. Clitchîz <a href=\"kmail:goOnline\">chal</a> po vs raloyî . . .</"
 "p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -5042,22 +5067,22 @@
 "môde disraloyî. Clitchîz <a href=\"kmail:goResourceOnline\">chal</a> po vs "
 "raloyî . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "Contak candjî comifåt"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "Novea messaedje riçuvou"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "I gn a pont d' messaedje nén léjhou"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -5080,8 +5105,8 @@
 msgstr ""
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr ""
@@ -5174,18 +5199,18 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "Soçons"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr ""
@@ -5234,28 +5259,28 @@
 msgid "All"
 msgstr "Totafwait"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2008, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "© 1997-2008, les programeus di KMail"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5283,7 +5308,7 @@
 msgid "&Reply"
 msgstr "&Responde"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "&Responde..."
@@ -5293,12 +5318,12 @@
 msgid "Reply to A&uthor..."
 msgstr "Responde a l' &oteur..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "Responde a &tertos..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "Responde a ene &copinreye..."
@@ -5329,7 +5354,7 @@
 msgid "&Edit As New"
 msgstr "Aspou&gnî li messaedje"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5526,118 +5551,118 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "Trover des messaedjes"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "&Trover"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "&Dins l' messaedje..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "Come &ataetchmint..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "Schaper ataetchmints..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "Netyî l' tchoes"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, fuzzy, kde-format
 #| msgid "Jump to Folder"
 msgid "Jump to original folder"
 msgstr "Potchî dins ç' ridant ci"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 trové"
 msgstr[1] "%1 trovés"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "Dierin cweraedje"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr ""
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "Dji cwîre..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, fuzzy, kde-format
 #| msgid "Can not get search result. %1"
 msgid "Cannot get search result. %1"
 msgstr "Dji n' sai rçure les rzultats do cweraedje. %1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, fuzzy, kde-format
 #| msgid "Search canceled"
 msgid "Search failed."
 msgstr "Dj' a rnoncî å cweraedje"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, fuzzy, kde-format
 #| msgid " completed"
 msgid "Search complete."
 msgstr " fini"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, fuzzy, kde-format
 #| msgid "Search tag"
 msgid "Search stopped."
 msgstr "Trover etikete"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, fuzzy, kde-format
 #| msgid ""
 #| "There was a problem renaming your search folder. A common reason for this "
@@ -5651,21 +5676,21 @@
 "råjhon k' esplikêye çoula c' est k' i gn a ddja èn ôte ridant d' ricweraedje "
 "avou l' minme no."
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "Copyî messaedje"
 msgstr[1] "Copyî %1 messaedjes"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "Côper messaedje"
 msgstr[1] "Côper %1 messaedjes"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5798,7 +5823,7 @@
 "uzaedje seulmint)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5806,7 +5831,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5816,19 +5841,19 @@
 "esse håyné."
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "Mostrer l' roye aspougnåve do ridant di roed cweraedje"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "Ricassî dins l' messaedje come prémetou."
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, fuzzy, kde-format
 #| msgid "Warn if the number of recipients is larger than"
 msgid "Warn if the number of recipients is more than:"
@@ -5836,7 +5861,7 @@
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5845,19 +5870,19 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "Verifyî l' ortografeye divant d' evoyî"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "Dimander otomaticmint des notifiaedjes di lijhaedje des &messaedjes"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5868,13 +5893,13 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "Schaper otomaticmint totes les :"
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5883,7 +5908,7 @@
 msgstr ""
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
@@ -5891,83 +5916,83 @@
 "purnea po scrire."
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 "Si clitchî, les messaedjes evoyîs seront wårdés dzo ene cogne ecriptêye"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "Ene djivêye des URL eployîs dierinnmint"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "Ene djivêye des ecôdaedjes eployîs dierinnmint"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, fuzzy, kde-format
 #| msgid "Show crypto &icons"
 msgid "Show crypto label indicator"
 msgstr "Håyner les &imådjetes pol criptografeye"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr ""
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "Li grandeu do purnea d' idintité (po divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "Li lårdjeur do purnea di cweraedje (po divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "Li hôteur do purnea di cweraedje (po divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "Li lårdjeur do purnea d' Apontiaedje di KMail (po divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 "Li hôteur do purnea d' Apontiaedje di KMail (po divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "Panea d' prévoeyaedje des messaedjes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "Èn nén mostrer on panea d' prévoeyaedje des messaedjes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr ""
@@ -5975,7 +6000,7 @@
 "messaedjes"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr ""
@@ -5983,61 +6008,61 @@
 "messaedjes"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "Djivêye des ridants"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "Longue djivêye des ridants"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "Coûte djivêye des ridants"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "Modele di messaedje po novea messaedje"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "Modele di messaedje po response"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "Modele di messaedje po response a tertos"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "Modele di messaedje po rcassaedje"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "Wiyemets"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "Specifeye li politike eployeye å håynaedje del politike"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -6047,7 +6072,7 @@
 "divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -6057,7 +6082,7 @@
 "divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -6067,7 +6092,7 @@
 "divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -6077,7 +6102,7 @@
 "divintrin uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -6087,7 +6112,7 @@
 "uzaedje seulmint)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6348,7 +6373,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6662,10 +6687,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "Waitî s' i gn a des emiles e"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7205,6 +7229,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "Rimete e-n alaedje tos les adviertixhmints « Èn pus måy dimander »"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, fuzzy, kde-format
 #| msgid "Move to Trash"
@@ -7268,6 +7302,14 @@
 msgid "Zoom: %1%"
 msgstr "Zoumer"
 
+#~ msgid "Text Snippets"
+#~ msgstr "Bokets d' tecse"
+
+#, fuzzy
+#~| msgid "Check Mail In"
+#~ msgid "Check Mail Url Tracking"
+#~ msgstr "Waitî s' i gn a des emiles e"
+
 #~ msgid "Folder Name and Size When Close to Quota"
 #~ msgstr "No d' ridant eyet grandeu cwand on arive près do cwota"
 
@@ -10065,11 +10107,6 @@
 #~ msgid "Define if account uses the default identity"
 #~ msgstr "Novele Idintité"
 
-#, fuzzy
-#~| msgid "Identity Name"
-#~ msgid "Identity account"
-#~ msgstr "No del idintité"
-
 #~ msgid "Mail Expiry Properties"
 #~ msgstr "Prôpietés di l' espiraedje des emile"
 
@@ -11475,11 +11512,6 @@
 #~ msgid "Opening URL..."
 #~ msgstr "Dji drove èn URL..."
 
-#, fuzzy
-#~ msgctxt "@info"
-#~ msgid "Do you really want to execute <filename>%1</filename>?"
-#~ msgstr "<qt>Voloz po do bon disfacer l' idintité lomêye <b>%1</b>?</qt>"
-
 #~ msgid "Execute"
 #~ msgstr "Enonder"
 
diff -Nru kmail-19.04.3/po/zh_CN/akonadi_archivemail_agent.po kmail-19.12.3/po/zh_CN/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/zh_CN/akonadi_archivemail_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_CN/akonadi_archivemail_agent.po	2020-03-03 00:34:18.000000000 +0000
@@ -8,16 +8,15 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
-"PO-Revision-Date: 2019-06-02 13:15\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: /kf5-stable/messages/pim/akonadi_archivemail_agent.pot\n"
@@ -178,12 +177,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr "无法为此文件加添加第二个归档。请编辑已有的归档。"
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "目录不存在。请检验设置。归档已推迟。"
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "开始归档到 %1"
diff -Nru kmail-19.04.3/po/zh_CN/akonadi_followupreminder_agent.po kmail-19.12.3/po/zh_CN/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/zh_CN/akonadi_followupreminder_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_CN/akonadi_followupreminder_agent.po	2020-03-03 00:34:17.000000000 +0000
@@ -7,110 +7,109 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2019-06-02 13:15\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: /kf5-stable/messages/pim/akonadi_followupreminder_agent.pot\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "后续提醒代理"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "后续提醒"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "版权 (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "维护者"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KDE 中国"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kde-china@kde.org"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "收件人"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "主题"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "截止日期"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "回复"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "已接收"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "暂停"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "显示消息"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "删除"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "是否要移除这 %1 个选定项目？"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "收到来自 %1 的回复"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "您仍然在等待此邮件的应答："
diff -Nru kmail-19.04.3/po/zh_CN/akonadi_mailfilter_agent.po kmail-19.12.3/po/zh_CN/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/zh_CN/akonadi_mailfilter_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_CN/akonadi_mailfilter_agent.po	2020-03-03 00:34:17.000000000 +0000
@@ -7,16 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2019-06-02 13:15\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: /kf5-stable/messages/pim/akonadi_mailfilter_agent.pot\n"
@@ -26,17 +25,17 @@
 msgid "Filter Log Viewer"
 msgstr "过滤器日志查看器"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "分享..."
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "记录过滤器的活动日志(&L)"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
@@ -45,23 +44,23 @@
 "您可以选择开启或关闭过滤器的活动日志。当然，只有在日志开启时才会收集和显示日"
 "志。"
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "日志细节"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "日志模式描述"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "日志过滤规则求值(&R)"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -73,34 +72,34 @@
 "您可以控制如何记录应用的过滤器的过滤规则求值过程：选中此项将会获得每个单独的"
 "过滤规则的详细反馈；反之，只有将所有规则求值后的单独的过滤器的结果将会返回。"
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "记录过滤规则求值"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "记录过滤器动作"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "日志大小限制："
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "无限制"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -111,7 +110,7 @@
 "日志数据的收集使用内存临时存储日志数据；这里您可以限制使用内存的最大值：如果"
 "收集的日志大小超过了限额那么最老的数据将被丢弃直到不再超过限额为止。"
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -120,63 +119,63 @@
 "无法写入文件 %1：\n"
 "“%2”为详细错误描述。"
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail 错误"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "正在过滤 %2 封信件中的第 %1 封"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "应用过滤器的移动操作时发生错误"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "应用过滤器的删除操作时发生错误"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "应用过滤器的修改操作时发生错误"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>正在对过滤规则求值：</b> "
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>过滤规则已匹配。</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>开始过滤在“%3”来自“%2”的信件“%1”：</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "过滤信件"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "邮件过滤器日志已启用"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "就绪"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "正在 %1 中过滤"
diff -Nru kmail-19.04.3/po/zh_CN/akonadi_sendlater_agent.po kmail-19.12.3/po/zh_CN/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/zh_CN/akonadi_sendlater_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_CN/akonadi_sendlater_agent.po	2020-03-03 00:34:17.000000000 +0000
@@ -7,16 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2019-06-02 13:15\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: /kf5-stable/messages/pim/akonadi_sendlater_agent.pot\n"
@@ -63,123 +62,123 @@
 msgid "Your emails"
 msgstr "kde-china@kde.org"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "收件人"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "主题"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "发送于大约"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "重发间隔"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "信件编号"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "没有等待发送的信件..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "立即发送"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "删除"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "是"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "否"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "您将要删除所选的项目，是否继续？"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "移除项目"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "您想要同时移除信件吗？"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "移除信件"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "未找到信件。"
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "未找到信件。"
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "获取信件时出错。"
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "无法获取信件。%1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "无法创建传输"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "信件不是真正的信件"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "无法发送信件。"
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "已发出信件"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "遇到错误。您想重新发送吗？"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "发现错误"
diff -Nru kmail-19.04.3/po/zh_CN/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/zh_CN/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/zh_CN/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_CN/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:18.000000000 +0000
@@ -7,16 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2019-06-02 13:16\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: /kf5-stable/messages/pim/akonadi_unifiedmailbox_agent.pot\n"
@@ -56,37 +55,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr "同步聚合邮箱 %1"
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr "名称："
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr "选择图标..."
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr "图标："
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr "收件箱"
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr "已发送"
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr "草稿"
diff -Nru kmail-19.04.3/po/zh_CN/kmail.po kmail-19.12.3/po/zh_CN/kmail.po
--- kmail-19.04.3/po/zh_CN/kmail.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_CN/kmail.po	2020-03-03 00:34:17.000000000 +0000
@@ -15,16 +15,15 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2019-06-02 13:15\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: /kf5-stable/messages/pim/kmail.pot\n"
@@ -191,8 +190,8 @@
 msgstr "每个地址用多个加密密钥"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -296,27 +295,27 @@
 "in the addresses by hand."
 msgstr "KMail 在此文件夹中检测不到邮件列表，请手工填写地址。"
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "配额"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "用法："
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "状态："
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% 满"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "共 %2，已用 %1"
@@ -338,7 +337,7 @@
 "文件夹关联的按键。</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "模板"
@@ -349,106 +348,106 @@
 msgstr "在此文件夹中使用自定义信件模板(&U)"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "复制全局模板(&C)"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "查看"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "使用自定义图标(&I)"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "普通(&N)："
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "未读(&U)："
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "在信件列表中显示发件人/收件人列"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "显示列(&W)："
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "默认"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "发件人"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "收件人"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "信件列表"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "使用默认聚合模式"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "聚合模式"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "使用默认主题"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "主题"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "信件默认格式"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, kde-format
 msgid "Prefer HTML to text"
 msgstr "优先使用 HTML 格式"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, kde-format
 msgid "Prefer text to HTML"
 msgstr "优先使用纯文本格式(&P)"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, kde-format
 msgid "Use Global Settings"
 msgstr "使用全局设置"
@@ -458,130 +457,135 @@
 msgid "Retrieval Options"
 msgstr "获取选项"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "身份"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "接收"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "发送"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
-msgstr ""
+msgstr "LDAP 服务器"
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "发送账户(至少添加一个)："
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "公共选项"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "发送前确认(&B)"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "发送前检查拼写"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "不自动"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "手动检查邮件时"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "检查全部邮件时"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "现在发送"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "稍后发送"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "发送发件箱中的信件(&M)："
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "默认发送方式(&U)："
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr "启用撤销发送"
+
+#: configuredialog/configureaccountpage.cpp:241
 #, kde-format
 msgid "Add Mail Account..."
 msgstr "添加邮件帐户..."
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, kde-format
 msgid "Custom Account..."
 msgstr "自定义帐户..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, kde-format
 msgid ""
 "Could not start the account wizard. Please make sure you have AccountWizard "
 "properly installed."
 msgstr "无法启动账户向导。请确保您正确安装了账户向导。"
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "无法启动账户向导"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "手动检查邮件时包含"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "关闭 KMail 时切换到脱机模式"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "启动时检查邮件"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -637,7 +641,7 @@
 msgid "Fixed Width Font"
 msgstr "等宽字体"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "撰写器"
@@ -887,12 +891,12 @@
 #: settings/kmail.kcfg.cmake:88
 #, kde-format
 msgid "Start minimized to tray"
-msgstr ""
+msgstr "开始时最小化到托盘"
 
 #: configuredialog/configureappearancepage.cpp:893
 #, kde-format
 msgid "Show unread email in Taskbar"
-msgstr ""
+msgstr "在任务栏显示未读邮件"
 
 #: configuredialog/configureappearancepage.cpp:964
 #, kde-format
@@ -935,61 +939,61 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "无法创建标签，同名标签已经存在。"
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "常规"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "标准模板"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "自定义模板"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "主题"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "字符集"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "信头"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "附件"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "自动更正"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "自动缩放图片"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "签名"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
@@ -998,30 +1002,30 @@
 "在开始撰写邮件时自动\n"
 "插入配置的签名"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "在所有引用的文本前插入签名"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
 "(two dashes and a space on a line) before the signature"
 msgstr "在签名前插入 RFC 兼容格式的分隔符 (两个连字符和一个空格构成的行)"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "回复时不引用已经存在的签名"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "格式"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1031,7 +1035,7 @@
 "在回复时，如果您事先在信件窗口中选中了一段文字，将只把这部分文字作为引用内"
 "容。"
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1041,17 +1045,17 @@
 "在回复时，在引用文字的全部行的前面添加引用标记，即使这些行是由于在自动换行时"
 "添加了多余的换行而产生的。"
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "启用文字在特定宽度自动折行"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "设置自动折行的文字宽度"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1060,7 +1064,7 @@
 msgstr ""
 "回复或转发时只以接收时的原始格式引用信件。如果不选，则默认使用纯文本回复。"
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1070,34 +1074,34 @@
 "将信件的 HTML 标记格式化为纯文本标记。支持加粗，倾斜，下划线，列表和外部引"
 "用。"
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "在信件内"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "有附件"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "设定默认转发格式"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "默认转发类型："
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "收件人"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1107,17 +1111,17 @@
 "默认情况下，撰写邮件时会请求消息处置通知(MDN)。\n"
 "您可以在每封邮件中修改此选项，“选项 - 请求消息处置通知”。"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "收件人过多时警告"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "收件人大于一定数量时警告"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1131,66 +1135,66 @@
 "人，或使用“选择...”对话框。设置此限制帮助您避免意外地发送邮件给\n"
 "太多人。但是请注意，它对邮件列表和联系人列表无效。"
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr "记住最近输入的邮箱地址，用于自动补全提示"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "不保存"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "最近地址的最大数量："
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr "自动补全记忆邮箱地址数量的上限"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, kde-format
 msgid "Configure Completion..."
 msgstr "配置补全..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, kde-format
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "自动保存"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "不自动保存"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
 msgid_plural " minutes"
 msgstr[0] " 分钟"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "按指定的时间间隔自动保存信件"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "回信时主题的前缀(&Y)"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1199,59 +1203,59 @@
 "识别下列前缀的任意组合\n"
 "(各项都是不区分大小写的正则表达式)："
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "添加(&D)..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "删除(&M)"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "修改(&I)..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "输入新的回复前缀："
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "转发时主题的前缀(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "添加..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "删除(&V)"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "修改..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "输入新的转发前缀："
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1259,125 +1263,125 @@
 msgstr "这个列表将会由上而下的检查哪个字符集包括发送信件需要的所有字符。"
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "修改(&M)..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "输入字符集："
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "在回复或转发时尽可能保持原有字符集(&K)"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "不支持这个字符集。"
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "使用自定义的 message-id 后缀(&U)"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "自定义 message-&id 后缀："
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "定义 MIME 信头标记："
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "名称"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "值"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "新建(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "名称(&N)："
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "值(&V)："
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr "\"内容类型\" 不是授权字符串。此标头将不被保存。"
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid "Invalid header"
 msgstr "无效头部"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook 兼容的附件命名"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 msgstr "启用此选项，才能让 Outlook(tm) 理解包含非英语字符的附件名"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "启用对丢失附件的检测(&N)"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "识别下列关键字为附件："
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "输入新关键字："
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, kde-format
 msgid "Maximum Attachment Size:"
 msgstr "最大附件大小︰"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "无限制"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1431,7 +1435,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:202
 #, kde-format
 msgid "Grammar Checker Plugins"
-msgstr ""
+msgstr "语法检查插件"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:212
 #, kde-format
@@ -1460,13 +1464,13 @@
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, kde-format
-msgid "Convertor Text Plugins"
-msgstr "转换器文本插件"
+msgid "Text Conversion Plugins"
+msgstr "文本转换插件"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
 #, kde-format
 msgid "Misc"
-msgstr ""
+msgstr "杂项"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:279
 #, kde-format
@@ -1570,7 +1574,7 @@
 msgid "Archive Folder"
 msgstr "归档文件夹"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
@@ -1636,18 +1640,18 @@
 msgid "Notification"
 msgstr "通知"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "%1 个附件 (%2)"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "隐藏附件列表"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "显示附件列表"
@@ -1664,469 +1668,469 @@
 msgid "Encoding"
 msgstr "编码"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "选择对此信件拼写检查时所用的词典"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "选择保存此信件副本所用的发件夹"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "选择用于发送此信件的账户"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "设定此信件的“发件人”地址"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "设置信件主题"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "身份(&I)："
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "字典(&D)："
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "已发文件夹(&S)："
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "邮件传送(&M)："
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "发件人(&F)："
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "主题(&U)："
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "发送邮件(&S)"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "发送邮件的身份(&S)"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "发送"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "稍后发送(&L)"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "稍后发送的身份(&L)"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "队列"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "保存为草稿(&D)"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "保存邮件到草稿箱"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "保存为模板(&T)"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "保存邮件到模板文件夹"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "另存为文件(&F)"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "邮件另存为文本或 html 文件"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "插入文本文件(&I)..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "插入最近的文本文件(&I)"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "地址簿(&A)"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "打开地址簿"
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "新建撰写器(&N)"
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "选择收件人(&R)..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "保存分发列表(&D)..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "粘贴为附件(&H)"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "清理空格(&E)"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "使用等宽字体(&X)"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "标记为紧急(&U)"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "请求处理回执(&R)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, kde-format
 msgid "&Request Delivery Confirmation"
 msgstr "请求送达通知(&R)"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "自动换行(&W)"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "片断(&S)"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "自动拼写检查(&A)"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "富文本编辑"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "富文本"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "切换富文本编辑模式"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "全部字段(&A)"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "身份(&I)"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "字典(&D)"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "已发文件夹(&S)"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "邮件传送(&M)"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "发件人(&F)"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "主题(&U)"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "在结尾附加签名(&I)"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "在开头附加签名(&E)"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "在光标位置处插入签名(&U)"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "拼写检查器(&S)..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "拼写检查器"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "加密信件(&E)"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "加密"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "给信件签名(&S)"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "签名"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "密文信件格式(&C)"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "为这封信选择加密格式"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, kde-format
 msgid "Create Follow Up Reminder..."
 msgstr "创建后续提醒..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "配置 KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr "<qt>这将完全隐藏菜单栏。您可以按下 %1 使其重新显示。</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "隐藏菜单栏"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " 行：%1 "
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " 列：%1 "
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "覆盖"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "插入"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "拼写检查：开"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "拼写检查：关"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "重新保存为模板(&S)"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "保存为草稿(&S)"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "将这封信重新保存在模板文件夹中。您可以稍后再编辑或者发送。"
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr "将这封信保存在草稿文件夹中。您可以稍后再编辑或者发送。"
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "您想要丢弃信件，还是保存留作以后使用？"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "关闭撰写器"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "自动保存信件失败"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "发送信件失败"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "插入文件"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "添加为内嵌图像(&I)"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "添加为附件(&A)"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "附件名："
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr "附件名不能是空的。"
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, kde-format
 msgid "Invalid Attachment Name"
 msgstr "无效的附件名。"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "在邮件中添加链接"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "添加文件为附件(&A)"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "将剪贴板内的文字作为附件插入"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "未命名"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2137,12 +2141,12 @@
 "<qt><p>您请求了信件对您自己加密，但目前所选的身份尚未定义此用途的加密密钥"
 "(OpenPGP 或 S/MIME)。</p><p>请在身份配置中选择要使用的密钥。</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "未定义的加密密钥"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2152,12 +2156,12 @@
 "<qt><p>为了对此信件签名，您必须首先定义要使用的签名密钥(OpenPGP 或 S/MIME)。"
 "</p><p>请在身份配置中选择要使用的密钥。</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "未定义的签名密钥"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2167,131 +2171,131 @@
 "您必须在发件人字段中输入您自己的电子邮件地址。您还应该为全部身份都设置电子邮"
 "件地址，以免每封信都要重新输入一次。"
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr "您必须在收件人、抄送或密送字段中指定至少一个接收者。"
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "收件人字段为空。仍然要发送吗？"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "未指定收件人"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "您没有指定主题。仍然要发送吗？"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "未指定主题"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "原样发送(&E)"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "指定主题(&S)"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "您必须指定至少一个收件人才能加密草稿。"
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "即将发送信件..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "发送确认"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "立即发送(&S)"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr "您正尝试一次向多于 %1 名收件人发送邮件，确认要发送吗？"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "收件人过多"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "原样发送(&S)"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "编辑收件人(&E)"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "关闭 HTML 模式将使信件中的一些格式丢失。您确认吗？"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "丢弃格式吗？"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "丢弃格式"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "添加标记纯文本"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr "高级安全加密将被用于此收信人 (加密密钥完全可信)。点击图标查看详情。"
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr "中级安全加密将被用于此收信人 (加密密钥大致可信)。点击图标查看详情。"
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr "低级安全加密将被用于此收信人 (加密密钥不可信)。点击图标查看详情。"
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2301,7 +2305,7 @@
 "此收信人的邮件将被加密，但是加密的安全性位置 (加密密钥无法验证)。点击图标查看"
 "详情。"
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, kde-format
 msgid "Plugin Editor Information"
 msgstr "插件编辑器信息"
@@ -2374,25 +2378,25 @@
 msgid "External editor was started."
 msgstr "外部编辑器已启动。"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, kde-format
 msgid "Sent Folder is not defined. Please set it before sending the mail."
 msgstr "未定义发送的文件夹。请在发送邮件前设置。"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, kde-format
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
 msgstr "找不到标识。请验证是否使用正确的标识。"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, kde-format
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
@@ -2419,11 +2423,6 @@
 msgid "Message will not be encrypted"
 msgstr "将不对信件加密"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "文本片断"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2467,27 +2466,27 @@
 msgid "Cannot move messages."
 msgstr "无法移动信件。"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "无法获取文件夹。错误：%1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "未返回文件夹。"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "无法获取父文件夹。错误报告：%1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "无法返回文件夹列表。"
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
 msgstr "已经存档消息"
@@ -2528,48 +2527,48 @@
 msgid "&Existing identities:"
 msgstr "已有身份(&E)："
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, kde-format
 msgid "Error while generating new key pair: %1"
 msgstr "生成密钥对时出错：%1"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr "密钥生成出错"
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr "没有密钥"
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, kde-format
 msgid "Generate a new key pair"
 msgstr "生成新密钥对"
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr "正在生成新的密钥对..."
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "编辑身份"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "常规"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "您的名字(&Y)："
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2580,12 +2579,12 @@
 "头中的姓名；</p><p>如果您将此域留空，将不会出现您真实的姓名，而仅仅是电子邮件"
 "地址。</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "组织(&Z)："
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2595,12 +2594,12 @@
 "<qt><h3>组织</h3><p>您应该在此域中输入您组织的名称，如果您想要在发出信的信头"
 "中显示组织名称的话。</p><p>一般来说将此域留空很安全。</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "电子邮件地址(&E)："
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2614,12 +2613,12 @@
 "个身份，或者在下面的字段中加入额外的地址别名。</p><p>若是您将此字段留空，或者"
 "写错了，别人就无法回信给您。</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "电子邮件地址别名(&L)："
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2634,12 +2633,12 @@
 "td></tr><tr><th>别名：</th><td>first@example.org<br>last@example.org</td></"
 "tr></table><p>请每行输入一个别名地址。</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "加密"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2653,12 +2652,12 @@
 "邮件功能不会因此受到影响。</p><p>您可以在 <a>https://www.gnupg.org</a> 找到关"
 "于密钥得更多信息。</p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP 签名密钥："
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, kde-format
 msgid ""
 "<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
@@ -2673,12 +2672,12 @@
 "使用 OpenPGP 对您寄出信件的副本进行加密；普通的邮件功能不会因此受到影响。</"
 "p><p>您可以在 <a>https://www.gnupg.org</a> 找到关于密钥的更多信息</p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP 加密密钥："
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2690,12 +2689,12 @@
 "以将此处留空，但是 KMail 将无法使用 S/MIME 对电子邮件进行数字签名；普通的邮件"
 "功能不会因此受到影响。</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME 签名证书："
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2708,39 +2707,39 @@
 "的“附加我的证书”功能。</p><p>您可以将此处留空，但是 KMail 将无法使用 S/MIME "
 "对电子邮件进行数字签名；普通的邮件功能不会因此受到影响。</p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME 加密证书："
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "首选格式："
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "自动签名信件"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, kde-format
 msgid "Automatically encrypt messages when possible"
 msgstr "尽可能自动加密信件"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "高级"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "回信地址(&R)："
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2756,12 +2755,12 @@
 "却让回信发到一组地址。</p><p>如果您对此选项不太确定的话，请将此域留空。</p></"
 "qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "抄送地址(&C)："
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2776,12 +2775,12 @@
 "p><p>要指定多个地址，请使用逗号分隔抄送收件人列表。</p><p>如果您对此选项不太"
 "确定的话，请将此字段留空。</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "密件抄送地址(&B)："
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2796,90 +2795,90 @@
 "信件发送到您的另外一个账户中。</p><p>要指定多个地址，请使用逗号分隔密件抄送收"
 "件人列表。</p><p>如果您对此选项不太确定的话，请将此域留空。</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "字典(&I)："
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "已发文件夹(&F)："
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "草稿文件夹(&D)："
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "模板文件夹(&T)："
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "对外账户："
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "附加我的 vcard 名片到信件"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "创建..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "自动更正语言："
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "恢复默认域名"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "默认域名(&T)："
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 msgstr "<qt><p>默认域名用于在只有用户名的情况下补全电子邮件地址。</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "为此身份使用自定义信件模板(&U)"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "签名"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "图片"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "无效的电子邮件别名“%1”"
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "无效的电子邮件地址"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2890,14 +2889,14 @@
 "所配置的 OpenPGP 签名密钥之一不包含为此身份(%1)配置的电子邮件地址。\n"
 "这可能导致接收方试图校验此配置制作的签名时得到警告。"
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
 "with the configured email address for this identity (%1)."
 msgstr "所配置的 OpenPGP 加密密钥之一不包含为此身份(%1)配置的电子邮件地址。"
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2908,36 +2907,36 @@
 "所配置的 S/MIME 签名证书之一不包含为此身份(%1)配置的电子邮件地址。\n"
 "这可能导致接收方试图校验此配置制作的签名时得到警告。"
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr "所配置的 S/MIME 加密证书之一不包含为此身份(%1)配置的电子邮件地址。"
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "未在密钥/证书中找到电子邮件地址"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "签名文件无效"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "编辑身份“%1”"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, kde-format
 msgid ""
 "Some custom folder for identity does not exist (anymore); therefore, default "
 "folders will be used."
 msgstr "当前身份的一些自定义文件夹不存在；因此会使用默认的草稿文件夹。"
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "编辑..."
@@ -2968,6 +2967,18 @@
 msgid "We cannot delete vCard file."
 msgstr "不能删除 vCard 文件。"
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "您真的想要取消吗？"
+
+#: identity/identityeditvcarddialog.cpp:136
+#, kde-format
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "确认"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3124,7 +3135,7 @@
 "示例可在 <a href=\"https://ace.home.xs4all.nl/X-Faces/\">https://ace.home."
 "xs4all.nl/X-Faces/</a> 找到。"
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "图像"
@@ -3156,7 +3167,7 @@
 msgid_plural "Distribution lists %2 are empty, they cannot be used."
 msgstr[0] "分发列表“%2”为空，无法使用。"
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "添加到地址簿中"
@@ -3166,22 +3177,22 @@
 msgid "Contact created successfully"
 msgstr "成功创建联系人"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "无法保存联系人：%1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "无法保存账户"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "确定要附加文件夹\"%1\"吗？"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "附加文件夹"
@@ -3389,14 +3400,14 @@
 msgstr "文件夹(&O)"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, kde-format
 msgid "Apply Filters on Folder"
 msgstr "将过滤器应用于文件夹"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, kde-format
 msgid "Apply Filters on Folder and all its Subfolders"
@@ -3422,7 +3433,7 @@
 msgstr "转发(&F)"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "应用过滤器(&P)"
@@ -3447,7 +3458,7 @@
 msgstr "帮助(&H)"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "主工具栏"
@@ -3499,12 +3510,12 @@
 msgid "The file does not contain a message."
 msgstr "文件不包含信件。"
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "文件包含多封信。仅会显示第一封信。"
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3513,32 +3524,32 @@
 "您想要将所选信件作为单封信件的附件(即 MIME 摘要)来转发，还是分别作为独立信件"
 "来转发？"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "作为摘要发送"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "各自独立发送"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "过滤信件"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "正在过滤 %2 封信件中的第 %1 封"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "移动信件"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "删除信件"
@@ -3567,64 +3578,64 @@
 msgid "Text Direction Toolbar"
 msgstr "文本方向工具栏"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail 设置为脱机；所有的网络任务都将被推迟"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, kde-format
 msgid "Send Email"
 msgstr "发送电子邮件"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, kde-format
 msgid "Impossible to send email"
 msgstr "无法发送邮件。"
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail 设置为联机；所有的网络任务都已恢复"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr "KMail 已设置为联机；所有的网络任务都将在检测到网络链接时恢复"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail 目前工作于脱机模式中。您是否想要继续？"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "联机/脱机"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "联机工作"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "脱机工作"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "检测到网络连接，所有的网络任务都已恢复"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "未检测到网络连接，所有的网络任务都已挂起"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3633,192 +3644,196 @@
 "打开位于 %1 的自动保存文件失败。\n"
 "原因：%2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "打开自动保存文件失败"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the default transport:"
 msgstr[0] "这 %1 个身份已经更改为使用默认传送方式："
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the modified transport:"
 msgstr[0] "这 %1 个身份已经更改为使用修改的传送方式："
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "发送信件"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "正在初始化发送进程..."
 
-#: kmkernel.cpp:1629
+#: kmkernel.cpp:1633
 #, kde-format
-msgid "Resource %1 is broken."
-msgstr "资源 %1 已损坏。"
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
+msgstr ""
+"资源 %1 已损坏。\n"
+"%2"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1：%2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
 msgstr "存档邮件助手未注册。"
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "延迟发送助手未注册。"
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "后续提醒代理未注册。"
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, kde-format
 msgid ""
 "Could not start certificate manager; please make sure you have Kleopatra "
 "properly installed."
 msgstr "无法启动证书管理器；请确保 Kleopatra 已正确安装。"
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail 错误"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, kde-format
 msgid ""
 "Could not start the import wizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr "无法启动导入向导。请确保导入向导已正确安装。"
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "无法启动导入向导"
 
-#: kmlaunchexternalcomponent.cpp:101
+#: kmlaunchexternalcomponent.cpp:99
 #, kde-format
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
-msgstr "无法启动“PIM 设置导出”程序。请检查安装。"
+msgstr "无法启动“PIM 数据导出”程序。请检查安装。"
 
-#: kmlaunchexternalcomponent.cpp:103
+#: kmlaunchexternalcomponent.cpp:101
 #, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
-msgstr "无法启动“PIM 设置导出”程序"
+msgid "Unable to start \"PIM Data Exporter\" program"
+msgstr "无法启动“PIM 数据导出”程序"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, kde-format
 msgid ""
 "Could not start the ImportWizard. Please make sure you have ImportWizard "
 "properly installed."
 msgstr "无法启动导入向导。请确保您正确安装了导入向导。"
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "无法启动导入向导"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr "系统中检测到其他邮件客户端。您是否想要从它导入数据？"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "无法启动导入向导。请检查您的安装。"
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "无主题"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "(无模板)"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "文件夹没有设置任何过期选项"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>您确定要对文件夹 <b>%1</b> 进行过期删除？</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "将文件夹设为过期删除"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "过期(&E)"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "清空废件夹"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "移动到废件夹"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "您确定要清空废件夹？"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr "<qt>您确定要将文件夹 <b>%1</b> 中的全部信件移动到废件夹？</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "将所有信件放入废件夹"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "您确定要删除所有过期的旧信件？"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "删除过期旧信件？"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "删除过期信件"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3828,17 +3843,17 @@
 "在 HTML 邮件中装入外部引用将使您更容易受到“垃圾邮件”的攻击，还会增大被其它已"
 "有的和将有的安全漏洞危及的可能性。"
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "装入外部引用"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3848,754 +3863,759 @@
 "deleted, they cannot be restored.</qt>"
 msgstr[0] "<qt>您真要删除选中的 %1 封信件吗？<br />一旦删除将无法恢复。</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "删除信件"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "删除信件"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "移动信件中..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "删除信件中..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "信件删除成功。"
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "信件移动成功"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "信件删除失败。"
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "信件删除已取消。"
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "信件移动失败。"
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "信件移动已取消。"
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "移动信件到文件夹"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "复制信件中..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "信件复制成功。"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "信件复制失败。"
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "信件复制已取消。"
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "复制信件到文件夹"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "将信件放入废件夹"
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, kde-format
 msgid "Deleting and moving messages to trash..."
 msgstr "正在删除/移动此邮件至垃圾箱..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "信件成功放入废件夹。"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, kde-format
 msgid "Messages moved to trash or deleted successfully"
 msgstr "邮件移动至垃圾箱/删除成功。"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "信件放入废件夹的操作失败。"
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, kde-format
 msgid "Deleting or moving messages to trash failed."
 msgstr "删除/移动邮件至垃圾箱失败。"
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "信件放入废件夹的操作已取消。"
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, kde-format
 msgid "Deleting or moving messages to trash canceled."
 msgstr "删除/移动邮件至垃圾箱操作已取消。"
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "跳转到文件夹"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "另存为(&A)..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "所有文件夹设置为过期删除(&E)"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "检查邮件(&M)"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "检查邮件于"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "检查邮件"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "发出队列中的信件(&S)"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "在线状态(未知)"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "发出队列中的信件身份"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "证书管理器"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "导入信件(&I)..."
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "调试筛选(&D)..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "过滤器日志查看器(&L)..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr "从另一个电子邮件客户端导入(&I)..."
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "编辑“外出”自动回复..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
 msgstr "配置自动存档(&C)..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "已延迟信件..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "提醒后续邮件..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "删除(&D)"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "将线索移至废件夹(&O)"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "将线索放入废件夹"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "删除线索(&H)"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "查找信件(&F)..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "选中所有的信件(&A)"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "邮件列表管理(&M)..."
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "设定快捷键(&A)..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "过期设置(&E)"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
 msgstr "归档文件夹(&A)..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "装入外部引用(&X)"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "抄送信件给..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "移动信件到..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "新信件(&N)..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "新建"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "新建基于模板的信件(&T)"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "新建到邮件列表的新建(&O)..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "创建过滤器(&C)"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "按主题过滤(&S)..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "按发件人过滤(&F)..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "按收件人过滤(&T)..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "按抄送过滤(&C)..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "标记线索(&T)"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "将线索标为已读(&R)"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "将选中线索中的全部信件标为已读"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "将线索标为未读(&U)"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "将选中线索中的全部信件标为未读"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "将线索标为重要(&I)"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "删除重要线索标记(&I)"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "将线索标为活动项(&A)"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "删除活动项线索标记(&A)"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "观察线索(&W)"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "忽略线索(&I)"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "保存附件(&T)..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, kde-format
 msgid "Copy Decrypted To..."
 msgstr "复制解密的文件至..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "应用全部过滤器(&Y)"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "展开线索/群组(&E)"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "展开当前线索或群组"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "折叠线索/群组(&C)"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "折叠当前线索或群组"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "展开全部线索(&P)"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "展开当前文件夹内的所有线索"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "折叠全部线索(&O)"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "折叠当前文件夹内的所有线索"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "显示信件(&D)"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "下一封信件(&N)"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "跳转到下一封信件"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "下一封未读信件(&U)"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "下一封"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "跳转到下一封未读的信件"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "上一封信件(&P)"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "跳转到上一封信件"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "上一封未读信件(&M)"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "上一封"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "跳转到上一封未读的信件"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "下一个未读文件夹(&F)"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "跳转到下一个有未读信件的文件夹"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "上一个未读文件夹(&O)"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "跳转到上一个有未读信件的文件夹"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "下一段未读文本(&T)"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "移动到下一段未读的文本"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr "往下滚动当前信件。如果遇到了信件尾部，则跳到下一封未读信件。"
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "配置过滤器(&F)..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "管理筛选脚本(&S)..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, kde-format
 msgid "&Add Account..."
 msgstr "&添加账户..."
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail 介绍(&I)"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "显示 KMail 欢迎页"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "配置通知(&N)..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "配置 KMail(&C)..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "过期..."
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "新建收藏夹目录..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "服务器端订阅..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, kde-format
 msgid "Apply All Filters"
 msgstr "应用所有过滤器"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, kde-format
 msgid "Import/Export KMail Data..."
 msgstr "导入/导出 KMail 数据..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "新建地址簿联系人..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "复制信件到文件夹"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "跳转到文件夹..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "中止当前操作"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "焦点移到下一个文件夹"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "焦点移到上一个文件夹"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "选择带焦点的文件夹"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "焦点移到第一个文件夹"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "焦点移到最后一个文件夹"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "焦点移到下一封信"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "焦点移到上一封信"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "选中第一封信件"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "选中最后的信件"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "带焦点选中信件"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "焦点设置到快速搜索栏"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "延伸所选项到上一封信"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "延伸所选项到下一封信"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "移动信件到文件夹"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, kde-format
 msgid "Use Less Bandwidth"
 msgstr "使用较少的带宽"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr "标记此文件夹及其所有子文件夹的邮件为已读"
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr "移除此文件夹及其所有子文件夹的重复邮件"
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, kde-format
 msgid "Account &Settings"
 msgstr "帐号设置（&S）"
 
 #: kmmainwidget.cpp:3590
 #, kde-format
+msgid "Restart Account"
+msgstr "重新启动账户"
+
+#: kmmainwidget.cpp:3601
+#, kde-format
 msgid "Add Favorite Folder"
 msgstr "新建收藏夹目录"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "清空废件夹(&M)"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "将所有信件放入废件夹(&M)"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "删除搜索(&D)"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "编辑搜索..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "撤销(&U)"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "撤销(&U): “%1”"
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "过滤器 %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, kde-format
 msgctxt "Show shortcut for focus quick search. Don't change it"
 msgid "Search... <%1>"
 msgstr "搜索...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4605,12 +4625,12 @@
 "在邮件中使用 HTML 将使您更容易受到“垃圾邮件”的攻击，还会增大被其它已有的和将"
 "有的安全漏洞危及的可能性。"
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "使用 HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4619,181 +4639,185 @@
 "You can configure unified mailboxes, create custom ones or\n"
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
+"您设置了一个以上的电子邮件账户。\n"
+"您是否想要启用聚合邮箱功能以统一显示收件箱、已发送和草稿文件夹的内容？\n"
+"您可以于 KMail 插件设置中\n"
+"配置、创建自定义聚合邮箱或完全禁用此功能。"
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr "启动聚合邮箱？"
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr "启用聚合邮箱"
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr "取消"
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "开始..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "移到废件夹(&M)"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "废件夹"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "将信件放入废件夹"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "无法复制条目。%1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "撰写新信件给..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "回复给..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "转发给..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "添加到已有账户"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "在地址簿中打开"
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "将此链接加为书签"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "编辑联系人..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "链接另存为..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "在信件中查找(&F)..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "保存相片到本地..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "显示 HTML 格式"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "对来自此收件人的邮件显示 HTML 格式"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "对来自此收件人的邮件装载外部引用"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "共享图像..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr "KMail 现基于 Akonadi 个人信息管理框架，该框架带来了许多变化。"
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "推送邮件 (IMAP 空闲)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "改进搜索"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "支持向邮件添加便笺 (批注)"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "后台检查邮件，较低的图形界面冻结机率"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, kde-format
 msgid "Plugins support"
 msgstr "插件支持"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr "新的 HTML 渲染引擎（QtWebEngine）"
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, kde-format
 msgid "Added Check for Phishing URL"
 msgstr "添加了钓鱼链接检测"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, kde-format
 msgid "The KDE Mail Client"
 msgstr "KDE 电子邮件客户端"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, kde-format
 msgid "Retrieving Folder Contents"
 msgstr "正在获取文件夹内容"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, kde-format
 msgid "Please wait . . ."
 msgstr "请等待..."
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, kde-format
 msgid "Offline"
 msgstr "离线"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, kde-format
 msgid ""
 "KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</"
@@ -4801,7 +4825,7 @@
 msgstr ""
 "KMail 处于离线模式。点击<a href=\"kmail:goOnline\">此处</a>转为在线. . .</p>"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, kde-format
 msgid ""
 "Account is currently in offline mode. Click <a href=\"kmail:goResourceOnline"
@@ -4810,22 +4834,22 @@
 "账户处于离线模式。点击<a href=\"kmail:goResourceOnline\">此处</a>转为在"
 "线. . .</p>"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "成功修改联系人"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "新邮件位于"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "无未读信件"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4847,8 +4871,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -4937,17 +4961,17 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr "选择要在摘要页显示的摘要插件。"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, kde-format
 msgid "kontactsummary"
 msgstr "kontactsummary"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr "KDE Kontact 摘要"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, kde-format
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c), 2004 Tobias Koenig"
@@ -4992,27 +5016,27 @@
 msgid "All"
 msgstr "全部"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr "Kontact 摘要"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr "Kontact 摘要视图"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, kde-format
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 2003-2019 Kontact 开发者"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr "Sven Lueppken"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr "Cornelius Schumacher"
@@ -5039,7 +5063,7 @@
 msgid "&Reply"
 msgstr "回复(&R)"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "回复(&R)..."
@@ -5049,12 +5073,12 @@
 msgid "Reply to A&uthor..."
 msgstr "回复作者(&U)..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "回复所有人(&A)..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "回复到邮件列表(&L)..."
@@ -5084,7 +5108,7 @@
 msgid "&Edit As New"
 msgstr "作为新邮件编辑（&E）"
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5273,112 +5297,112 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "搜索失败，出现了错误：<ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "查找信件"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "搜索(&S)"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "在信件内转发(&I)..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "作为附件(&A)..."
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "保存附件..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "清除选择"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "跳转到原始文件夹"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 项匹配"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "上次搜索"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "您没有选择一个有效的文件夹。"
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "您忘了选择收藏。"
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "您忘了定义收藏。"
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "所选文件夹均为空，或是未被索引过。"
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "您忘了添加条件。"
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "包含的条件字符串长度不能小于4。"
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "无法获得搜索结果。%1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "搜索失败。"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "搜索完成。"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "搜索已停止。"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5387,19 +5411,19 @@
 msgstr ""
 "重命名搜索文件夹时出现问题，一个常见原因是存在重名文件夹。错误返回“%1”。"
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "复制 %1 封信件"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "剪切 %1 封信"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, kde-format
 msgid "Checking index status..."
 msgstr "正在检查索引状态..."
@@ -5454,7 +5478,7 @@
 #: settings/kmail.kcfg.cmake:92
 #, kde-format
 msgid "Show Unread Email in TaskBar"
-msgstr ""
+msgstr "在任务栏显示未读邮件"
 
 #. i18n: ectx: label, entry (ExternalEditor), group (General)
 #: settings/kmail.kcfg.cmake:96
@@ -5525,15 +5549,17 @@
 msgstr "指定此次是否为应用程序首次运行 (仅供内部使用)"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
 "email accounts are detected. We only ever ask once."
 msgstr ""
+"当发现一个以上的电子邮件账户时，是否询问用户是否希望启用聚合邮箱。程序仅询问"
+"一次。"
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5541,26 +5567,26 @@
 msgstr "此值用于决定是否显示 KMail 介绍界面。"
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "显示文件夹快速搜索条"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "默认在信件内转发。"
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "收件人大于此数量时警告："
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5571,19 +5597,19 @@
 "关闭。"
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "发送前检查拼写"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "自动请求信件投递通知(&M)"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5597,13 +5623,13 @@
 "请求，只需选择菜单项<em>选项</em>->&gt;<em>请求投递通知</em>。</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "自动保存间隔："
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5614,151 +5640,151 @@
 "此处得值设置为 0 可禁用自动保存。"
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "在撰写器中显示文本片断管理工具和插入面板。"
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "选中时以加密格式存储已发送信件"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "所有最近使用过的 URL 列表"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "所有最近使用过的编码列表"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "显示加密标签指示"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "验证发送默认快捷方式"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "身份对话框大小 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "搜索窗口宽度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "搜索窗口高度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "KMail 配置对话框宽度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "KMail 配置对话框高度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "信件预览面板"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "不显示信件预览面板"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "在信件列表下显示信件预览面板"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "在信件列表旁显示信件预览面板"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "文件夹列表"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "长文件夹列表"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "短文件夹列表"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "新信件模板"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "回复信件模板"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "回复全部信件模板"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "转发信件模板"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "引用字符"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "指定显示策略时使用的策略"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5766,7 +5792,7 @@
 msgstr "指定搜索窗口对话框中收藏字段的宽度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5774,7 +5800,7 @@
 msgstr "指定搜索窗口对话框中主题字段宽度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5782,7 +5808,7 @@
 msgstr "指定搜索窗口对话框中发件人字段宽度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5790,7 +5816,7 @@
 msgstr "指定搜索窗口对话框中收件人字段宽度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5798,7 +5824,7 @@
 msgstr "指定搜索窗口对话框中日期字段宽度 (仅供内部使用)"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6058,7 +6084,7 @@
 #, kde-format
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6094,7 +6120,7 @@
 "been marked with the folder property \"Act on new/unread mail in this folder"
 "\".</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6102,28 +6128,28 @@
 "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">当跳转到下一封未读信件时，"
-"可能下面已经没有未读信件了。</p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">当查找下一封未读邮件时，可"
+"能当前邮件后没有更多未读邮件了。</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">不循环：</span>停留在当前文件夹的最后一封信。</p>\n"
+"weight:600;\">不循环:</span> 查找将会于当前文件夹的最后一封未读邮件停止。</"
+"p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">在当前文件夹中循环：</span>返回当前文件夹的开头继续搜索，但不会"
-"转到其它文件夹。</p>\n"
+"weight:600;\">在当前文件夹中循环:</span> 查找将会从邮件列表的开头继续，但不会"
+"跳转至其他文件夹。</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">在所有文件夹中循环：</span>返回当前文件夹的开头继续搜索，如果仍"
-"然找不到未读信件，则会搜索下一个文件夹。</p>\n"
+"weight:600;\">在所有文件夹中循环:</span> 查找将会从邮件列表的开头继续。如果该"
+"文件夹中没有新邮件，则跳转至下一个文件夹进行查找。</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">类似的，程序在查找上一封信"
-"件时也会采取相同的搜索机制，查找操作在跳转到信件列表底部后，根据您的选项不"
-"同，搜索会继续循环当前文件夹或转到其它文件夹。</p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">同样的，在查找前一封未读邮"
+"件时，查找将会在邮件列表的末尾继续，并依据你的选项决定是否在前一个文件夹中继"
+"续查找。</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">在全部标记的文件夹中循环：</span>和“在所有文件夹中循环”选项类"
-"似，但搜索只限于在标记要检查新信件和未读信件的文件夹里进行。</p></body></"
-"html>"
+"weight:600;\">在全部标记的文件夹中循环: </span>与“在所有文件夹中循环”类似。但"
+"是只搜索被标记为“文件夹中有新/未读邮件时响应”的文件夹。</p></body></html>"
 
 #. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:64
@@ -6216,7 +6242,7 @@
 #: ui/miscpagemaintab.ui:180
 #, kde-format
 msgid "Allow deleting messages without confirmation"
-msgstr ""
+msgstr "允许删除邮件而无需确认"
 
 #. i18n: ectx: property (text), widget (QRadioButton, mChkbxAllFolders)
 #: ui/searchwindow.ui:17
@@ -6408,8 +6434,8 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
 #, kde-format
-msgid "Check Mail Url Tracking"
-msgstr ""
+msgid "Scan emails for tracking URLs"
+msgstr "扫描邮件以跟踪网址"
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -6993,6 +7019,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "重新启用全部“不再询问”警告"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr "%1 秒"
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr "撤销发送"
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
diff -Nru kmail-19.04.3/po/zh_CN/kmail-refresh-settings.po kmail-19.12.3/po/zh_CN/kmail-refresh-settings.po
--- kmail-19.04.3/po/zh_CN/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/zh_CN/kmail-refresh-settings.po	2020-03-03 00:34:17.000000000 +0000
@@ -0,0 +1,101 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: kdeorg\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese Simplified\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /kf5-stable/messages/pim/kmail-refresh-settings.pot\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KDE 中国"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kde-china@kde.org"
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr ""
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr ""
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr ""
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr "作者"
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr ""
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr ""
diff -Nru kmail-19.04.3/po/zh_CN/ktnef.po kmail-19.12.3/po/zh_CN/ktnef.po
--- kmail-19.04.3/po/zh_CN/ktnef.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_CN/ktnef.po	2020-03-03 00:34:17.000000000 +0000
@@ -7,16 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
-"PO-Revision-Date: 2019-06-02 13:15\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: crowdin.com\n"
 "X-Crowdin-Project: kdeorg\n"
 "X-Crowdin-Language: zh-CN\n"
 "X-Crowdin-File: /kf5-stable/messages/pim/ktnef.pot\n"
diff -Nru kmail-19.04.3/po/zh_TW/akonadi_archivemail_agent.po kmail-19.12.3/po/zh_TW/akonadi_archivemail_agent.po
--- kmail-19.04.3/po/zh_TW/akonadi_archivemail_agent.po	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/zh_TW/akonadi_archivemail_agent.po	2020-03-03 00:34:18.000000000 +0000
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-29 07:28+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: 2019-01-19 19:35+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
-"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
+"Language-Team: Chinese <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -174,12 +174,12 @@
 "Cannot add a second archive for this folder. Modify the existing one instead."
 msgstr "同一個資料夾無法新增第二個歸檔。將改為變更現有的歸檔。"
 
-#: job/archivejob.cpp:73
+#: job/archivejob.cpp:71
 #, kde-format
 msgid "Directory does not exist. Please verify settings. Archive postponed."
 msgstr "目錄不存在。請檢查設定。壓縮將延後。"
 
-#: job/archivejob.cpp:91
+#: job/archivejob.cpp:89
 #, kde-format
 msgid "Start to archive %1"
 msgstr "開始歸檔 %1"
@@ -235,6 +235,3 @@
 #, kde-format
 msgid "Years"
 msgstr "年"
-
-#~ msgid "Archive now"
-#~ msgstr "現在歸檔"
diff -Nru kmail-19.04.3/po/zh_TW/akonadi_followupreminder_agent.po kmail-19.12.3/po/zh_TW/akonadi_followupreminder_agent.po
--- kmail-19.04.3/po/zh_TW/akonadi_followupreminder_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_TW/akonadi_followupreminder_agent.po	2020-03-03 00:34:18.000000000 +0000
@@ -8,10 +8,10 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-22 08:03+0100\n"
 "PO-Revision-Date: 2019-01-19 19:35+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
-"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
+"Language-Team: Chinese <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,96 +19,96 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Lokalize 18.12.1\n"
 
-#: followupreminderinfoconfigwidget.cpp:43
+#: followupreminderinfoconfigwidget.cpp:38
 #, kde-format
 msgid "Follow Up Reminder Agent"
 msgstr "回覆提醒代理程式"
 
-#: followupreminderinfoconfigwidget.cpp:45
-#: followupremindernoanswerdialog.cpp:36
+#: followupreminderinfoconfigwidget.cpp:40
+#: followupremindernoanswerdialog.cpp:45
 #, kde-format
 msgid "Follow Up Reminder"
 msgstr "回覆提醒"
 
-#: followupreminderinfoconfigwidget.cpp:47
+#: followupreminderinfoconfigwidget.cpp:42
 #, kde-format
 msgid "Copyright (C) 2014-2019 Laurent Montel"
 msgstr "Copyright (C) 2014-2019 Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:49
+#: followupreminderinfoconfigwidget.cpp:44
 #, kde-format
 msgid "Laurent Montel"
 msgstr "Laurent Montel"
 
-#: followupreminderinfoconfigwidget.cpp:50
+#: followupreminderinfoconfigwidget.cpp:45
 #, kde-format
 msgid "Maintainer"
 msgstr "維護者"
 
-#: followupreminderinfoconfigwidget.cpp:52
+#: followupreminderinfoconfigwidget.cpp:47
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Franklin Weng"
 
-#: followupreminderinfoconfigwidget.cpp:53
+#: followupreminderinfoconfigwidget.cpp:48
 #, kde-format
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "franklin@goodhorse.idv.tw"
 
-#: followupreminderinfowidget.cpp:75
+#: followupreminderinfowidget.cpp:74
 #, kde-format
 msgid "To"
 msgstr "收件者"
 
-#: followupreminderinfowidget.cpp:76
+#: followupreminderinfowidget.cpp:75
 #, kde-format
 msgid "Subject"
 msgstr "主旨"
 
-#: followupreminderinfowidget.cpp:77
+#: followupreminderinfowidget.cpp:76
 #, kde-format
 msgid "Dead Line"
 msgstr "期限"
 
-#: followupreminderinfowidget.cpp:78
+#: followupreminderinfowidget.cpp:77
 #, kde-format
 msgid "Answer"
 msgstr "回答"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "Received"
 msgstr "已接收"
 
-#: followupreminderinfowidget.cpp:143
+#: followupreminderinfowidget.cpp:142
 #, kde-format
 msgid "On hold"
 msgstr "保留中"
 
-#: followupreminderinfowidget.cpp:200
+#: followupreminderinfowidget.cpp:199
 #, kde-format
 msgid "Show Message"
 msgstr "顯示訊息"
 
-#: followupreminderinfowidget.cpp:204 followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:203 followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Delete"
 msgstr "刪除"
 
-#: followupreminderinfowidget.cpp:228
+#: followupreminderinfowidget.cpp:227
 #, kde-format
 msgid "Do you want to remove this selected item?"
 msgid_plural "Do you want to remove these %1 selected items?"
 msgstr[0] "您確定要移除這些選取的項目 %1 嗎？"
 
-#: followupremindermanager.cpp:160
+#: followupremindermanager.cpp:157
 #, kde-format
 msgid "Answer from %1 received"
 msgstr "接收到從 %1 來的回答"
 
-#: followupremindernoanswerdialog.cpp:42
+#: followupremindernoanswerdialog.cpp:51
 #, kde-format
 msgid "You still wait an answer about this mail:"
 msgstr "您仍在等待此郵件的回覆："
diff -Nru kmail-19.04.3/po/zh_TW/akonadi_mailfilter_agent.po kmail-19.12.3/po/zh_TW/akonadi_mailfilter_agent.po
--- kmail-19.04.3/po/zh_TW/akonadi_mailfilter_agent.po	2019-07-09 00:20:31.000000000 +0000
+++ kmail-19.12.3/po/zh_TW/akonadi_mailfilter_agent.po	2020-03-03 00:34:18.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 03:12+0200\n"
 "PO-Revision-Date: 2018-10-31 01:27+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
 "Language-Team: Chinese <kde-i18n-doc@kde.org>\n"
@@ -23,40 +23,40 @@
 msgid "Filter Log Viewer"
 msgstr "過濾信件紀錄顯示器"
 
-#: filterlogdialog.cpp:102
+#: filterlogdialog.cpp:101
 #, kde-format
 msgid "Share..."
 msgstr "分享…"
 
-#: filterlogdialog.cpp:111
+#: filterlogdialog.cpp:107
 #, kde-format
 msgid "&Log filter activities"
 msgstr "紀錄過濾的動作(&L)"
 
-#: filterlogdialog.cpp:116
+#: filterlogdialog.cpp:112
 #, kde-format
 msgid ""
 "You can turn logging of filter activities on and off here. Of course, log "
 "data is collected and shown only when logging is turned on. "
 msgstr "您可以打開過濾紀錄功能。打開後過濾信件都將會有紀錄。"
 
-#: filterlogdialog.cpp:120
+#: filterlogdialog.cpp:116
 #, kde-format
 msgid "Logging Details"
 msgstr "紀錄詳情"
 
-#: filterlogdialog.cpp:127
+#: filterlogdialog.cpp:123
 #, kde-format
 msgid "Log pattern description"
 msgstr "紀錄比對描述"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:136
+#: filterlogdialog.cpp:132
 #, kde-format
 msgid "Log filter &rule evaluation"
 msgstr "紀錄過濾規則比對計算(&R)"
 
-#: filterlogdialog.cpp:142
+#: filterlogdialog.cpp:138
 #, kde-format
 msgid ""
 "You can control the feedback in the log concerning the evaluation of the "
@@ -68,34 +68,34 @@
 "您可以控制要怎麼紀錄過濾的動作：這個選項打開後會紀錄跟每一個規則比對的結果，"
 "否則就只紀錄符合的規則。"
 
-#: filterlogdialog.cpp:149
+#: filterlogdialog.cpp:145
 #, kde-format
 msgid "Log filter pattern evaluation"
 msgstr "紀錄過濾規則比對計算"
 
 #. i18n( "" ) );
-#: filterlogdialog.cpp:158
+#: filterlogdialog.cpp:154
 #, kde-format
 msgid "Log filter actions"
 msgstr "過濾器動作"
 
-#: filterlogdialog.cpp:172
+#: filterlogdialog.cpp:168
 #, kde-format
 msgid "Log size limit:"
 msgstr "紀錄檔大小："
 
-#: filterlogdialog.cpp:180
+#: filterlogdialog.cpp:176
 #, kde-format
 msgid " KB"
 msgstr " KB"
 
-#: filterlogdialog.cpp:182
+#: filterlogdialog.cpp:178
 #, kde-format
 msgctxt "@label:spinbox Set the size of the logfile to unlimited."
 msgid "unlimited"
 msgstr "不限制"
 
-#: filterlogdialog.cpp:185
+#: filterlogdialog.cpp:181
 #, kde-format
 msgid ""
 "Collecting log data uses memory to temporarily store the log data; here you "
@@ -106,7 +106,7 @@
 "要紀錄過濾資料需要使用記憶體，這裡您可以限制使用記憶體的大小。如果超過的話，"
 "會將最舊的紀錄丟棄。"
 
-#: filterlogdialog.cpp:375
+#: filterlogdialog.cpp:371
 #, kde-format
 msgid ""
 "Could not write the file %1:\n"
@@ -115,63 +115,63 @@
 "無法寫入檔案 %1：\n"
 "%2 中有錯誤描述。"
 
-#: filterlogdialog.cpp:379
+#: filterlogdialog.cpp:375
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail 錯誤"
 
-#: filtermanager.cpp:124
+#: filtermanager.cpp:121
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "過濾 %1 封信件（共 %2 封）"
 
-#: filtermanager.cpp:211
+#: filtermanager.cpp:208
 #, kde-format
 msgid "Error applying mail filter move"
 msgstr "套用郵件過濾器移動錯誤"
 
-#: filtermanager.cpp:219
+#: filtermanager.cpp:216
 #, kde-format
 msgid "Error applying mail filter delete"
 msgstr "套用郵件過濾器刪除錯誤"
 
-#: filtermanager.cpp:227
+#: filtermanager.cpp:224
 #, kde-format
 msgid "Error applying mail filter modifications"
 msgstr "套用郵件過濾器變更錯誤"
 
-#: filtermanager.cpp:244
+#: filtermanager.cpp:241
 #, kde-format
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>計算過濾規則：</b>"
 
-#: filtermanager.cpp:251
+#: filtermanager.cpp:248
 #, kde-format
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>符合過濾規則</b>"
 
-#: filtermanager.cpp:271
+#: filtermanager.cpp:268
 #, kde-format
 msgid "<b>Begin filtering on message \"%1\" from \"%2\" at \"%3\" :</b>"
 msgstr "<b>開始過濾從 \"%2\" 於 \"%3\" 來的信件 \"%1\"：</b>"
 
-#: filtermanager.cpp:607 filtermanager.cpp:635
+#: filtermanager.cpp:604 filtermanager.cpp:632
 #, kde-format
 msgid "Filtering messages"
 msgstr "過濾信件中"
 
-#: mailfilteragent.cpp:119
+#: mailfilteragent.cpp:117
 #, kde-format
 msgctxt "Notification when the filter log was enabled"
 msgid "Mail Filter Log Enabled"
 msgstr "過濾信件紀錄已開啟"
 
-#: mailfilteragent.cpp:188
+#: mailfilteragent.cpp:186
 #, kde-format
 msgid "Ready"
 msgstr "已就緒"
 
-#: mailfilteragent.cpp:275
+#: mailfilteragent.cpp:273
 #, kde-format
 msgid "Filtering in %1"
 msgstr "正在 %1 中過濾"
diff -Nru kmail-19.04.3/po/zh_TW/akonadi_sendlater_agent.po kmail-19.12.3/po/zh_TW/akonadi_sendlater_agent.po
--- kmail-19.04.3/po/zh_TW/akonadi_sendlater_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_TW/akonadi_sendlater_agent.po	2020-03-03 00:34:18.000000000 +0000
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-11-16 08:00+0100\n"
 "PO-Revision-Date: 2019-01-19 19:36+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
-"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
+"Language-Team: Chinese <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,123 +60,123 @@
 msgid "Your emails"
 msgstr "franklin@goodhorse.idv.tw"
 
-#: sendlaterconfigurewidget.cpp:69
+#: sendlaterconfigurewidget.cpp:67
 #, kde-format
 msgid "To"
 msgstr "收件者"
 
-#: sendlaterconfigurewidget.cpp:70
+#: sendlaterconfigurewidget.cpp:68
 #, kde-format
 msgid "Subject"
 msgstr "主題"
 
-#: sendlaterconfigurewidget.cpp:71
+#: sendlaterconfigurewidget.cpp:69
 #, kde-format
 msgid "Send around"
 msgstr "傳送於"
 
-#: sendlaterconfigurewidget.cpp:72
+#: sendlaterconfigurewidget.cpp:70
 #, kde-format
 msgid "Recurrent"
 msgstr "循環"
 
-#: sendlaterconfigurewidget.cpp:74
+#: sendlaterconfigurewidget.cpp:72
 #, kde-format
 msgid "Message Id"
 msgstr "信件代碼"
 
-#: sendlaterconfigurewidget.cpp:85
+#: sendlaterconfigurewidget.cpp:83
 #, kde-format
 msgid "No messages waiting..."
 msgstr "沒有等待中的信件..."
 
-#: sendlaterconfigurewidget.cpp:108
+#: sendlaterconfigurewidget.cpp:106
 #, kde-format
 msgid "Send now"
 msgstr "立即傳送"
 
-#: sendlaterconfigurewidget.cpp:111
+#: sendlaterconfigurewidget.cpp:109
 #, kde-format
 msgid "Delete"
 msgstr "刪除"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "Yes"
 msgstr "是"
 
-#: sendlaterconfigurewidget.cpp:172
+#: sendlaterconfigurewidget.cpp:170
 #, kde-format
 msgid "No"
 msgstr "否"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Do you want to delete the selected item?"
 msgid_plural "Do you want to delete the selected items?"
 msgstr[0] "您確定要刪除選取的項目嗎？"
 
-#: sendlaterconfigurewidget.cpp:217
+#: sendlaterconfigurewidget.cpp:215
 #, kde-format
 msgid "Remove items"
 msgstr "移除項目"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Do you want to remove the messages as well?"
 msgstr "您要順便移除信件嗎？"
 
-#: sendlaterconfigurewidget.cpp:222
+#: sendlaterconfigurewidget.cpp:220
 #, kde-format
 msgid "Remove messages"
 msgstr "移除信件"
 
-#: sendlaterjob.cpp:70 sendlaterjob.cpp:73
+#: sendlaterjob.cpp:68 sendlaterjob.cpp:71
 #, kde-format
 msgid "Not message found."
 msgstr "找不到信件。"
 
-#: sendlaterjob.cpp:81
+#: sendlaterjob.cpp:79
 #, kde-format
 msgid "No message found."
 msgstr "找不到信件。"
 
-#: sendlaterjob.cpp:90
+#: sendlaterjob.cpp:88
 #, kde-format
 msgid "Error during fetching message."
 msgstr "抓取信件時發生錯誤。"
 
-#: sendlaterjob.cpp:96
+#: sendlaterjob.cpp:94
 #, kde-format
 msgid "Cannot fetch message. %1"
 msgstr "無法抓取信件。%1"
 
-#: sendlaterjob.cpp:101
+#: sendlaterjob.cpp:99
 #, kde-format
 msgid "We can't create transport"
 msgstr "無法建立傳送"
 
-#: sendlaterjob.cpp:108
+#: sendlaterjob.cpp:106
 #, kde-format
 msgid "Message is not a real message"
 msgstr "信件不是真的信件"
 
-#: sendlaterjob.cpp:115
+#: sendlaterjob.cpp:113
 #, kde-format
 msgid "Cannot send message."
 msgstr "無法傳送信件。"
 
-#: sendlaterjob.cpp:146
+#: sendlaterjob.cpp:144
 #, kde-format
 msgid "Message sent"
 msgstr "信件已送出"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "An error was found. Do you want to resend it?"
 msgstr "發現了一個錯誤。您要重新傳送嗎？"
 
-#: sendlatermanager.cpp:196
+#: sendlatermanager.cpp:204
 #, kde-format
 msgid "Error found"
 msgstr "發現錯誤"
diff -Nru kmail-19.04.3/po/zh_TW/akonadi_unifiedmailbox_agent.po kmail-19.12.3/po/zh_TW/akonadi_unifiedmailbox_agent.po
--- kmail-19.04.3/po/zh_TW/akonadi_unifiedmailbox_agent.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_TW/akonadi_unifiedmailbox_agent.po	2020-03-03 00:34:18.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-06-19 03:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese <kde-i18n-doc@kde.org>\n"
@@ -52,37 +52,37 @@
 msgid "Synchronizing unified mailbox %1"
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:96
+#: unifiedmailboxeditor.cpp:95
 #, kde-format
 msgid "Add an Unified MailBox"
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:108
+#: unifiedmailboxeditor.cpp:107
 #, kde-format
 msgid "Name:"
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:115
+#: unifiedmailboxeditor.cpp:114
 #, kde-format
 msgid "Pick icon..."
 msgstr ""
 
-#: unifiedmailboxeditor.cpp:116
+#: unifiedmailboxeditor.cpp:115
 #, kde-format
 msgid "Icon:"
 msgstr ""
 
-#: unifiedmailboxmanager.cpp:311
+#: unifiedmailboxmanager.cpp:309
 #, kde-format
 msgid "Inbox"
 msgstr ""
 
-#: unifiedmailboxmanager.cpp:318
+#: unifiedmailboxmanager.cpp:316
 #, kde-format
 msgid "Sent"
 msgstr ""
 
-#: unifiedmailboxmanager.cpp:325
+#: unifiedmailboxmanager.cpp:323
 #, kde-format
 msgid "Drafts"
 msgstr ""
diff -Nru kmail-19.04.3/po/zh_TW/kmail.po kmail-19.12.3/po/zh_TW/kmail.po
--- kmail-19.04.3/po/zh_TW/kmail.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_TW/kmail.po	2020-03-03 00:34:18.000000000 +0000
@@ -1,29 +1,30 @@
 # translation of kmail.po to Chinese Traditional
 # translation of kmail.po to
 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
 # Eric Cheng <ericc@shinewave.com.tw>, 2001.
 # AceLan <acelan@kde.linux.org.tw>, 2002.
 # Kenduest Lee <kenduest@i18n.linux.org.tw>, 2002.
 # Chia-Lin, Kao <acelan@linux.org.tw>, 2003.
 # Franklin Weng <franklin@goodhorse.idv.tw>, 2008, 2010, 2011, 2012, 2013, 2014, 2015.
 # Frank Weng (a.k.a. Franklin) <franklin@goodhorse.idv.tw>, 2009.
-#
 # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2005.
 # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006, 2007, 2008, 2009, 2010.
 # Franklin Weng <franklin at goodhorse dot idv dot tw>, 2007, 2008.
+# pan93412 <pan93412@gmail.com>, 2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-07-06 07:27+0200\n"
-"PO-Revision-Date: 2015-06-14 13:30+0800\n"
-"Last-Translator: Franklin\n"
-"Language-Team: Chinese Traditional <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2020-02-20 08:26+0100\n"
+"PO-Revision-Date: 2019-05-14 22:35+0800\n"
+"Last-Translator: pan93412 <pan93412@gmail.com>\n"
+"Language-Team: Chinese <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 19.04.1\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #, kde-format
@@ -200,8 +201,8 @@
 msgstr "一個位址可使用多組加密金鑰的功能"
 
 #: aboutdata.cpp:361 collectionpage/collectionmailinglistpage.cpp:102
-#: editor/kmcomposerwin.cpp:2102 kmreaderwin.cpp:297 kmsystemtray.cpp:58
-#: kmsystemtray.cpp:88
+#: editor/kmcomposerwin.cpp:2171 kmreaderwin.cpp:309 kmsystemtray.cpp:57
+#: kmsystemtray.cpp:87
 #, kde-format
 msgid "KMail"
 msgstr "KMail"
@@ -306,27 +307,27 @@
 "in the addresses by hand."
 msgstr "KMail 無法在這個資料夾完整偵測郵件論壇的信件。請自行輸入位址。"
 
-#: collectionpage/collectionquotapage.cpp:45
+#: collectionpage/collectionquotapage.cpp:44
 #, kde-format
 msgid "Quota"
 msgstr "大小限制"
 
-#: collectionpage/collectionquotawidget.cpp:47
+#: collectionpage/collectionquotawidget.cpp:46
 #, kde-format
 msgid "Usage:"
 msgstr "使用量："
 
-#: collectionpage/collectionquotawidget.cpp:54
+#: collectionpage/collectionquotawidget.cpp:53
 #, kde-format
 msgid "Status:"
 msgstr "狀態："
 
-#: collectionpage/collectionquotawidget.cpp:58
+#: collectionpage/collectionquotawidget.cpp:57
 #, no-c-format, kde-format
 msgid "%p% full"
 msgstr "%p% 滿"
 
-#: collectionpage/collectionquotawidget.cpp:67
+#: collectionpage/collectionquotawidget.cpp:66
 #, kde-format
 msgid "%1 of %2 used"
 msgstr "已使用 %1，共 %2"
@@ -346,7 +347,7 @@
 msgstr "<qt>按底下的按鈕，並按下您要設定的熱鍵。</qt>"
 
 #: collectionpage/collectiontemplatespage.cpp:39
-#: identity/identitydialog.cpp:684
+#: identity/identitydialog.cpp:683
 #, kde-format
 msgid "Templates"
 msgstr "樣本"
@@ -357,108 +358,108 @@
 msgstr "此資料夾內使用自訂的信件樣本(&U)"
 
 #: collectionpage/collectiontemplatespage.cpp:76
-#: identity/identitydialog.cpp:677
+#: identity/identitydialog.cpp:676
 #, kde-format
 msgid "&Copy Global Templates"
 msgstr "複製全域樣本(&C)"
 
-#: collectionpage/collectionviewpage.cpp:52
+#: collectionpage/collectionviewpage.cpp:51
 #, kde-format
 msgctxt "@title:tab View settings for a folder."
 msgid "View"
 msgstr "檢視"
 
-#: collectionpage/collectionviewpage.cpp:69
+#: collectionpage/collectionviewpage.cpp:68
 #, kde-format
 msgid "Use custom &icons"
 msgstr "使用自訂圖示(&I)"
 
-#: collectionpage/collectionviewpage.cpp:72
+#: collectionpage/collectionviewpage.cpp:71
 #, kde-format
 msgctxt "Icon used for folders with no unread messages."
 msgid "&Normal:"
 msgstr "正常(&N)："
 
-#: collectionpage/collectionviewpage.cpp:85
+#: collectionpage/collectionviewpage.cpp:84
 #, kde-format
 msgctxt "Icon used for folders which do have unread messages."
 msgid "&Unread:"
 msgstr "未讀(&U)："
 
-#: collectionpage/collectionviewpage.cpp:117
+#: collectionpage/collectionviewpage.cpp:116
 #, kde-format
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "信件列表中顯示寄件者與收件者欄位。"
 
-#: collectionpage/collectionviewpage.cpp:119
+#: collectionpage/collectionviewpage.cpp:118
 #, kde-format
 msgid "Sho&w column:"
 msgstr "顯示欄位(&W)："
 
-#: collectionpage/collectionviewpage.cpp:123
+#: collectionpage/collectionviewpage.cpp:122
 #, kde-format
 msgctxt "@item:inlistbox Show default value."
 msgid "Default"
 msgstr "預設"
 
-#: collectionpage/collectionviewpage.cpp:124
+#: collectionpage/collectionviewpage.cpp:123
 #, kde-format
 msgctxt "@item:inlistbox Show sender."
 msgid "Sender"
 msgstr "寄件者"
 
-#: collectionpage/collectionviewpage.cpp:125
+#: collectionpage/collectionviewpage.cpp:124
 #, kde-format
 msgctxt "@item:inlistbox Show receiver."
 msgid "Receiver"
 msgstr "收件者"
 
-#: collectionpage/collectionviewpage.cpp:133
+#: collectionpage/collectionviewpage.cpp:132
 #: configuredialog/configureappearancepage.cpp:119
 #: configuredialog/configureappearancepage.cpp:140
 #, kde-format
 msgid "Message List"
 msgstr "信件清單"
 
-#: collectionpage/collectionviewpage.cpp:138
+#: collectionpage/collectionviewpage.cpp:137
 #, kde-format
 msgid "Use default aggregation"
 msgstr "使用預設集合模式"
 
-#: collectionpage/collectionviewpage.cpp:144
+#: collectionpage/collectionviewpage.cpp:143
 #, kde-format
 msgid "Aggregation"
 msgstr "集合模式"
 
-#: collectionpage/collectionviewpage.cpp:159
+#: collectionpage/collectionviewpage.cpp:158
 #, kde-format
 msgid "Use default theme"
 msgstr "使用預設主題"
 
-#: collectionpage/collectionviewpage.cpp:165
+#: collectionpage/collectionviewpage.cpp:164
 #, kde-format
 msgid "Theme"
 msgstr "主題"
 
-#: collectionpage/collectionviewpage.cpp:180
+#: collectionpage/collectionviewpage.cpp:179
 #: widgets/displaymessageformatactionmenu.cpp:30
 #, kde-format
 msgid "Message Default Format"
 msgstr "信件預設格式"
 
-#: collectionpage/collectionviewpage.cpp:182
+#: collectionpage/collectionviewpage.cpp:181
 #, fuzzy, kde-format
 #| msgid "Prefer HTML to plain text"
 msgid "Prefer HTML to text"
 msgstr "偏好使用 HTML 而非純文字"
 
-#: collectionpage/collectionviewpage.cpp:184
+#: collectionpage/collectionviewpage.cpp:183
 #, fuzzy, kde-format
 #| msgid "Prefer &Plain Text to HTML"
 msgid "Prefer text to HTML"
 msgstr "偏好使用純文字而非 HTML(&P)"
 
-#: collectionpage/collectionviewpage.cpp:186
+#: collectionpage/collectionviewpage.cpp:185
 #, fuzzy, kde-format
 #| msgid "Use Global Setting"
 msgid "Use Global Settings"
@@ -469,103 +470,108 @@
 msgid "Retrieval Options"
 msgstr "收取選項"
 
-#: configuredialog/configureaccountpage.cpp:68
+#: configuredialog/configureaccountpage.cpp:69
 #, fuzzy, kde-format
 #| msgid "&Identity"
 msgctxt "@title:tab Tab page where the user configures identities"
 msgid "Identities"
 msgstr "身份(&I)"
 
-#: configuredialog/configureaccountpage.cpp:74
+#: configuredialog/configureaccountpage.cpp:75
 #, kde-format
 msgctxt ""
 "@title:tab Tab page where the user configures accounts to receive mail"
 msgid "Receiving"
 msgstr "收信"
 
-#: configuredialog/configureaccountpage.cpp:81
+#: configuredialog/configureaccountpage.cpp:82
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures accounts to send mail"
 msgid "Sending"
 msgstr "送信"
 
-#: configuredialog/configureaccountpage.cpp:87
+#: configuredialog/configureaccountpage.cpp:88
 #, kde-format
 msgctxt "@title:tab Tab page where the user configures ldap server"
 msgid "LDAP server"
 msgstr ""
 
-#: configuredialog/configureaccountpage.cpp:104
+#: configuredialog/configureaccountpage.cpp:105
 #, kde-format
 msgid "Outgoing accounts (add at least one):"
 msgstr "發信帳號（至少新增一個帳號）："
 
-#: configuredialog/configureaccountpage.cpp:111
+#: configuredialog/configureaccountpage.cpp:112
 #, kde-format
 msgid "Common Options"
 msgstr "一般選項"
 
 #. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog/configureaccountpage.cpp:120 settings/kmail.kcfg.cmake:200
+#: configuredialog/configureaccountpage.cpp:121 settings/kmail.kcfg.cmake:208
 #, kde-format
 msgid "Confirm &before send"
 msgstr "傳送前先確認(&B)"
 
-#: configuredialog/configureaccountpage.cpp:124
+#: configuredialog/configureaccountpage.cpp:125
 #, kde-format
 msgid "Check spelling before sending"
 msgstr "傳送前檢查拼字"
 
-#: configuredialog/configureaccountpage.cpp:132
+#: configuredialog/configureaccountpage.cpp:133
 #, kde-format
 msgid "Never Automatically"
 msgstr "不自動執行"
 
-#: configuredialog/configureaccountpage.cpp:133
+#: configuredialog/configureaccountpage.cpp:134
 #, kde-format
 msgid "On Manual Mail Checks"
 msgstr "手動檢查信件時"
 
-#: configuredialog/configureaccountpage.cpp:134
+#: configuredialog/configureaccountpage.cpp:135
 #, kde-format
 msgid "On All Mail Checks"
 msgstr "檢查所有帳號信件時"
 
-#: configuredialog/configureaccountpage.cpp:142
+#: configuredialog/configureaccountpage.cpp:143
 #: editor/potentialphishingemail/potentialphishingemailwarning.cpp:38
 #, kde-format
 msgid "Send Now"
 msgstr "立即傳送"
 
-#: configuredialog/configureaccountpage.cpp:143
+#: configuredialog/configureaccountpage.cpp:144
 #, kde-format
 msgid "Send Later"
 msgstr "稍後傳送"
 
-#: configuredialog/configureaccountpage.cpp:148
+#: configuredialog/configureaccountpage.cpp:149
 #, kde-format
 msgid "Send &messages in outbox folder:"
 msgstr "檢查時傳送寄件匣內的信件(&F)"
 
-#: configuredialog/configureaccountpage.cpp:156
+#: configuredialog/configureaccountpage.cpp:157
 #, kde-format
 msgid "Defa&ult send method:"
 msgstr "預設傳送方式(&U)："
 
-#: configuredialog/configureaccountpage.cpp:220
+#: configuredialog/configureaccountpage.cpp:161
+#, kde-format
+msgid "Enable Undo Send"
+msgstr ""
+
+#: configuredialog/configureaccountpage.cpp:241
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "Add Mail Account..."
 msgstr "新增帳號"
 
-#: configuredialog/configureaccountpage.cpp:221
+#: configuredialog/configureaccountpage.cpp:242
 #, fuzzy, kde-format
 #| msgid "Customize accounts order..."
 msgid "Custom Account..."
 msgstr "自訂帳號順序..."
 
-#: configuredialog/configureaccountpage.cpp:242
-#: kmlaunchexternalcomponent.cpp:129
+#: configuredialog/configureaccountpage.cpp:263
+#: kmlaunchexternalcomponent.cpp:127
 #, fuzzy, kde-format
 #| msgid "Could not start the account wizard. Please check your installation."
 msgid ""
@@ -573,30 +579,30 @@
 "properly installed."
 msgstr "無法啟動帳號精靈。請檢查安裝是否完全！"
 
-#: configuredialog/configureaccountpage.cpp:244
-#: kmlaunchexternalcomponent.cpp:131
+#: configuredialog/configureaccountpage.cpp:265
+#: kmlaunchexternalcomponent.cpp:129
 #, kde-format
 msgid "Unable to start account wizard"
 msgstr "無法啟動帳號精靈"
 
-#: configuredialog/configureaccountpage.cpp:293
+#: configuredialog/configureaccountpage.cpp:314
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Include in Manual Mail Check"
 msgstr "手動檢查信件時檢查這個帳號"
 
-#: configuredialog/configureaccountpage.cpp:301
+#: configuredialog/configureaccountpage.cpp:322
 #, kde-format
 msgctxt "Label to a checkbox, so is either checked/unchecked"
 msgid "Switch offline on KMail Shutdown"
 msgstr "KMail 關閉時切換到離線模式"
 
-#: configuredialog/configureaccountpage.cpp:308
+#: configuredialog/configureaccountpage.cpp:329
 #, kde-format
 msgid "Check mail on startup"
 msgstr "啟動時檢查信件"
 
-#: configuredialog/configureaccountpage.cpp:355
+#: configuredialog/configureaccountpage.cpp:376
 #, kde-format
 msgid ""
 "New Mail Notifier Agent not registered. Please contact your administrator."
@@ -652,7 +658,7 @@
 msgid "Fixed Width Font"
 msgstr "固定寬度文字"
 
-#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:402
+#: configuredialog/configureappearancepage.cpp:145 editor/kmcomposerwin.cpp:396
 #, kde-format
 msgid "Composer"
 msgstr "信件編輯器"
@@ -948,73 +954,73 @@
 msgid "We cannot create tag. A tag with same name already exists."
 msgstr "無法建立標籤。因為已經有同名的標籤存在。"
 
-#: configuredialog/configurecomposerpage.cpp:74
+#: configuredialog/configurecomposerpage.cpp:76
 #, kde-format
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr "一般"
 
-#: configuredialog/configurecomposerpage.cpp:81
+#: configuredialog/configurecomposerpage.cpp:83
 #, kde-format
 msgid "Standard Templates"
 msgstr "標準樣本"
 
-#: configuredialog/configurecomposerpage.cpp:87
+#: configuredialog/configurecomposerpage.cpp:89
 #, kde-format
 msgid "Custom Templates"
 msgstr "自訂樣本"
 
-#: configuredialog/configurecomposerpage.cpp:93
+#: configuredialog/configurecomposerpage.cpp:95
 #, kde-format
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr "主題"
 
-#: configuredialog/configurecomposerpage.cpp:100
+#: configuredialog/configurecomposerpage.cpp:102
 #, kde-format
 msgid "Charset"
 msgstr "字元集"
 
-#: configuredialog/configurecomposerpage.cpp:106
+#: configuredialog/configurecomposerpage.cpp:108
 #, kde-format
 msgid "Headers"
 msgstr "標頭"
 
-#: configuredialog/configurecomposerpage.cpp:112
+#: configuredialog/configurecomposerpage.cpp:114
 #, kde-format
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr "附加檔"
 
-#: configuredialog/configurecomposerpage.cpp:118
+#: configuredialog/configurecomposerpage.cpp:120
 #, kde-format
 msgid "Autocorrection"
 msgstr "自動修正"
 
-#: configuredialog/configurecomposerpage.cpp:124
+#: configuredialog/configurecomposerpage.cpp:126
 #, kde-format
 msgid "Auto Resize Image"
 msgstr "自動調整影像大小"
 
-#: configuredialog/configurecomposerpage.cpp:139
+#: configuredialog/configurecomposerpage.cpp:141
 #, kde-format
 msgctxt "@title:group"
 msgid "Signature"
 msgstr "簽名"
 
-#: configuredialog/configurecomposerpage.cpp:147
+#: configuredialog/configurecomposerpage.cpp:149
 #, kde-format
 msgid ""
 "Automatically insert the configured signature\n"
 "when starting to compose a message"
 msgstr "開始寫信時自動插入設定好的簽名"
 
-#: configuredialog/configurecomposerpage.cpp:160
+#: configuredialog/configurecomposerpage.cpp:162
 #, kde-format
 msgid "Insert the signature above any quoted text"
 msgstr "在引言上方插入簽名"
 
-#: configuredialog/configurecomposerpage.cpp:173
+#: configuredialog/configurecomposerpage.cpp:175
 #, kde-format
 msgid ""
 "Insert the RFC-compliant signature separator\n"
@@ -1023,18 +1029,18 @@
 "在簽名前插入 RFC 定義的簽名分隔器\n"
 "（兩個 - 加上一個空白然後斷行）"
 
-#: configuredialog/configurecomposerpage.cpp:186
+#: configuredialog/configurecomposerpage.cpp:188
 #, kde-format
 msgid "When replying, do not quote any existing signature"
 msgstr "回覆時，不要引入任何現有的簽名"
 
-#: configuredialog/configurecomposerpage.cpp:198
+#: configuredialog/configurecomposerpage.cpp:200
 #, kde-format
 msgctxt "@title:group"
 msgid "Format"
 msgstr "格式"
 
-#: configuredialog/configurecomposerpage.cpp:205
+#: configuredialog/configurecomposerpage.cpp:207
 #, kde-format
 msgid ""
 "When replying, only quote the selected text\n"
@@ -1044,7 +1050,7 @@
 "回覆時，若有選取信件內容中的文字，則只引入\n"
 "選取的文字，而不是完整的信件內容。"
 
-#: configuredialog/configurecomposerpage.cpp:218
+#: configuredialog/configurecomposerpage.cpp:220
 #, kde-format
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
@@ -1054,17 +1060,17 @@
 "回覆時，在所有引言文字的前面加上引言符耗，即使文字因過長\n"
 "而折到新行時也一樣。"
 
-#: configuredialog/configurecomposerpage.cpp:232
+#: configuredialog/configurecomposerpage.cpp:234
 #, kde-format
 msgid "Enable automatic word wrapping at the specified width"
 msgstr "啟動在特定寬度後自動折行的功能"
 
-#: configuredialog/configurecomposerpage.cpp:243
+#: configuredialog/configurecomposerpage.cpp:245
 #, kde-format
 msgid "Set the text width for automatic word wrapping"
 msgstr "設定自動折行的文字寬度"
 
-#: configuredialog/configurecomposerpage.cpp:261
+#: configuredialog/configurecomposerpage.cpp:263
 #, kde-format
 msgid ""
 "When replying or forwarding, quote the message\n"
@@ -1074,7 +1080,7 @@
 "在回覆或轉寄信件時，只使用接收到的原始格式做引用。若未勾選，則預設使用純文字"
 "回覆。"
 
-#: configuredialog/configurecomposerpage.cpp:275
+#: configuredialog/configurecomposerpage.cpp:277
 #, kde-format
 msgid ""
 "Format the plain text part of a message from the HTML markup.\n"
@@ -1084,34 +1090,34 @@
 "將信件中的純文字部份加上 HTML 標籤格式。\n"
 "支援粗體、斜體、底線、列表與外部參考。"
 
-#: configuredialog/configurecomposerpage.cpp:290
+#: configuredialog/configurecomposerpage.cpp:292
 #, kde-format
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr "內含"
 
-#: configuredialog/configurecomposerpage.cpp:291
+#: configuredialog/configurecomposerpage.cpp:293
 #, kde-format
 msgid "As Attachment"
 msgstr "當成附件"
 
-#: configuredialog/configurecomposerpage.cpp:293
+#: configuredialog/configurecomposerpage.cpp:295
 #, kde-format
 msgid "Set the default forwarded message format"
 msgstr "設定預設轉寄信件格式"
 
-#: configuredialog/configurecomposerpage.cpp:297
+#: configuredialog/configurecomposerpage.cpp:299
 #, kde-format
 msgid "Default forwarding type:"
 msgstr "預設轉寄型態："
 
-#: configuredialog/configurecomposerpage.cpp:311
+#: configuredialog/configurecomposerpage.cpp:313
 #, kde-format
 msgctxt "@title:group"
 msgid "Recipients"
 msgstr "收件者"
 
-#: configuredialog/configurecomposerpage.cpp:319
+#: configuredialog/configurecomposerpage.cpp:321
 #, kde-format
 msgid ""
 "By default, request an MDN when starting to compose a message.\n"
@@ -1121,17 +1127,17 @@
 "預設在開始寫信時要求回覆。\n"
 "您可以在「選項」─「要求回覆通知」中對每封信件做設定。"
 
-#: configuredialog/configurecomposerpage.cpp:347
+#: configuredialog/configurecomposerpage.cpp:349
 #, kde-format
 msgid "Warn if too many recipients are specified"
 msgstr "若是指定太多收件者則提出警告"
 
-#: configuredialog/configurecomposerpage.cpp:358
+#: configuredialog/configurecomposerpage.cpp:360
 #, kde-format
 msgid "Set the maximum number of recipients for the warning"
 msgstr "最多幾個收件者時發出警告"
 
-#: configuredialog/configurecomposerpage.cpp:377
+#: configuredialog/configurecomposerpage.cpp:379
 #, kde-format
 msgid ""
 "Only allow this many recipients to be specified for the message.\n"
@@ -1146,68 +1152,68 @@
 "不小心一次送給太多人。注意，它不會把郵件論壇或是群組清單裡的人數\n"
 "算進去。"
 
-#: configuredialog/configurecomposerpage.cpp:403
+#: configuredialog/configurecomposerpage.cpp:405
 #, kde-format
 msgid ""
 "Remember recent addresses entered,\n"
 "and offer them for recipient completion"
 msgstr "記住最近輸入的地址，並讓它們可以用來做收件人補完。"
 
-#: configuredialog/configurecomposerpage.cpp:416
+#: configuredialog/configurecomposerpage.cpp:418
 #, kde-format
 msgctxt "No addresses are retained"
 msgid "No save"
 msgstr "不儲存"
 
-#: configuredialog/configurecomposerpage.cpp:419
+#: configuredialog/configurecomposerpage.cpp:421
 #, kde-format
 msgid "Maximum recent addresses retained:"
 msgstr "最近常用的位址記住最大數量："
 
-#: configuredialog/configurecomposerpage.cpp:423
+#: configuredialog/configurecomposerpage.cpp:425
 #, kde-format
 msgid ""
 "The maximum number of recently entered addresses that will\n"
 "be remembered for completion"
 msgstr "要記住以用來做收件人補完的地址的最大數量"
 
-#: configuredialog/configurecomposerpage.cpp:437
+#: configuredialog/configurecomposerpage.cpp:439
 #, fuzzy, kde-format
 #| msgid "Configure Completion Order..."
 msgid "Configure Completion..."
 msgstr "設定完成順序..."
 
-#: configuredialog/configurecomposerpage.cpp:445
+#: configuredialog/configurecomposerpage.cpp:447
 #, fuzzy, kde-format
 #| msgid "No autosave"
 msgctxt "@title:group"
 msgid "Autosave"
 msgstr "不自動儲存"
 
-#: configuredialog/configurecomposerpage.cpp:456
+#: configuredialog/configurecomposerpage.cpp:458
 #, kde-format
 msgid "No autosave"
 msgstr "不自動儲存"
 
-#: configuredialog/configurecomposerpage.cpp:457
+#: configuredialog/configurecomposerpage.cpp:459
 #, kde-format
 msgctxt "Interval suffix"
 msgid " minute"
 msgid_plural " minutes"
 msgstr[0] " 分"
 
-#: configuredialog/configurecomposerpage.cpp:459
+#: configuredialog/configurecomposerpage.cpp:461
 #, kde-format
 msgid "Automatically save the message at this specified interval"
 msgstr "在此指定間隔時間自動儲存信件"
 
-#: configuredialog/configurecomposerpage.cpp:667
+#: configuredialog/configurecomposerpage.cpp:669
 #, kde-format
 msgid "Repl&y Subject Prefixes"
 msgstr "回覆主題前置文字(&Y)"
 
-#: configuredialog/configurecomposerpage.cpp:671
-#: configuredialog/configurecomposerpage.cpp:701
+#: configuredialog/configurecomposerpage.cpp:673
+#: configuredialog/configurecomposerpage.cpp:703
 #, kde-format
 msgid ""
 "Recognize any sequence of the following prefixes\n"
@@ -1216,59 +1222,59 @@
 "辨認下列的前置文字\n"
 "（不區分大小寫）："
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:770
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:772
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "A&dd..."
 msgstr "新增(&D)..."
 
-#: configuredialog/configurecomposerpage.cpp:681
-#: configuredialog/configurecomposerpage.cpp:923
-#: configuredialog/configurecomposerpage.cpp:1155
+#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:925
+#: configuredialog/configurecomposerpage.cpp:1157
 #, kde-format
 msgid "Re&move"
 msgstr "移除(&M)"
 
-#: configuredialog/configurecomposerpage.cpp:682
-#: configuredialog/configurecomposerpage.cpp:1156
+#: configuredialog/configurecomposerpage.cpp:684
+#: configuredialog/configurecomposerpage.cpp:1158
 #, kde-format
 msgid "Mod&ify..."
 msgstr "修改(&I)..."
 
-#: configuredialog/configurecomposerpage.cpp:683
+#: configuredialog/configurecomposerpage.cpp:685
 #, kde-format
 msgid "Enter new reply prefix:"
 msgstr "輸入新的回覆前置文字："
 
-#: configuredialog/configurecomposerpage.cpp:697
+#: configuredialog/configurecomposerpage.cpp:699
 #, kde-format
 msgid "For&ward Subject Prefixes"
 msgstr "轉寄主題前置文字(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:709 identity/identitypage.cpp:279
+#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:279
 #, kde-format
 msgid "Add..."
 msgstr "新增..."
 
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog/configurecomposerpage.cpp:710
-#: configuredialog/configurecomposerpage.cpp:770 ui/identitypage.ui:66
+#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:772 ui/identitypage.ui:66
 #, kde-format
 msgid "Remo&ve"
 msgstr "移除(&V)"
 
-#: configuredialog/configurecomposerpage.cpp:711 identity/identitypage.cpp:281
+#: configuredialog/configurecomposerpage.cpp:713 identity/identitypage.cpp:281
 #, kde-format
 msgid "Modify..."
 msgstr "修改..."
 
-#: configuredialog/configurecomposerpage.cpp:712
+#: configuredialog/configurecomposerpage.cpp:714
 #, kde-format
 msgid "Enter new forward prefix:"
 msgstr "輸入新的轉寄前置文字："
 
-#: configuredialog/configurecomposerpage.cpp:762
+#: configuredialog/configurecomposerpage.cpp:764
 #, kde-format
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
@@ -1276,127 +1282,127 @@
 msgstr "這個列表將會由上而下的檢查每封寄出信件的字元集內含所有要求的字元"
 
 #. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#: configuredialog/configurecomposerpage.cpp:771 ui/identitypage.ui:40
+#: configuredialog/configurecomposerpage.cpp:773 ui/identitypage.ui:40
 #, kde-format
 msgid "&Modify..."
 msgstr "修改(&M)..."
 
-#: configuredialog/configurecomposerpage.cpp:771
+#: configuredialog/configurecomposerpage.cpp:773
 #, kde-format
 msgid "Enter charset:"
 msgstr "輸入要加入的字元集："
 
-#: configuredialog/configurecomposerpage.cpp:777
+#: configuredialog/configurecomposerpage.cpp:779
 #, kde-format
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "當回覆或轉寄時使用原本的字元集(&K)。"
 
-#: configuredialog/configurecomposerpage.cpp:812
+#: configuredialog/configurecomposerpage.cpp:814
 #, kde-format
 msgid "This charset is not supported."
 msgstr "不支援這個字元集。"
 
-#: configuredialog/configurecomposerpage.cpp:877
+#: configuredialog/configurecomposerpage.cpp:879
 #, kde-format
 msgid "&Use custom message-id suffix"
 msgstr "使用自訂的 Message-Id 項目(&U)"
 
-#: configuredialog/configurecomposerpage.cpp:890
+#: configuredialog/configurecomposerpage.cpp:892
 #, kde-format
 msgid "Custom message-&id suffix:"
 msgstr "自訂 Message-Id 項目(&I)："
 
-#: configuredialog/configurecomposerpage.cpp:902
+#: configuredialog/configurecomposerpage.cpp:904
 #, kde-format
 msgid "Define custom mime header fields:"
 msgstr "定義電子郵件的 mime 自訂標頭："
 
-#: configuredialog/configurecomposerpage.cpp:910
+#: configuredialog/configurecomposerpage.cpp:912
 #, kde-format
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr "名稱"
 
-#: configuredialog/configurecomposerpage.cpp:911
+#: configuredialog/configurecomposerpage.cpp:913
 #, kde-format
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr "數值"
 
-#: configuredialog/configurecomposerpage.cpp:919
+#: configuredialog/configurecomposerpage.cpp:921
 #, kde-format
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr "新的(&W)"
 
-#: configuredialog/configurecomposerpage.cpp:932
+#: configuredialog/configurecomposerpage.cpp:934
 #, kde-format
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr "名稱(&N)："
 
-#: configuredialog/configurecomposerpage.cpp:942
+#: configuredialog/configurecomposerpage.cpp:944
 #, kde-format
 msgid "&Value:"
 msgstr "數值(&V)："
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, kde-format
 msgid ""
 "'Content-Type' is not an authorized string. This header will be not saved."
 msgstr ""
 
-#: configuredialog/configurecomposerpage.cpp:1084
+#: configuredialog/configurecomposerpage.cpp:1086
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid header"
 msgstr "不合法的日期"
 
-#: configuredialog/configurecomposerpage.cpp:1126
+#: configuredialog/configurecomposerpage.cpp:1128
 #, kde-format
 msgid "Outlook-compatible attachment naming"
 msgstr "與 Outlook 相容的附檔命名方式"
 
-#: configuredialog/configurecomposerpage.cpp:1129
+#: configuredialog/configurecomposerpage.cpp:1131
 #, kde-format
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 msgstr "這個選項是確保 Outlook 在非英語字元集的信件中認得附檔。"
 
-#: configuredialog/configurecomposerpage.cpp:1138
+#: configuredialog/configurecomposerpage.cpp:1140
 #, kde-format
 msgid "E&nable detection of missing attachments"
 msgstr "判斷是否忘記附加檔案"
 
-#: configuredialog/configurecomposerpage.cpp:1144
+#: configuredialog/configurecomposerpage.cpp:1146
 #, kde-format
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "檢查信件中是否有下列關鍵字，以顯示此封信是否應該有附檔而忘了加上去："
 
-#: configuredialog/configurecomposerpage.cpp:1157
+#: configuredialog/configurecomposerpage.cpp:1159
 #, kde-format
 msgid "Enter new key word:"
 msgstr "輸入新的關鍵字："
 
-#: configuredialog/configurecomposerpage.cpp:1165
+#: configuredialog/configurecomposerpage.cpp:1167
 #, fuzzy, kde-format
 #| msgid "Has Attachment"
 msgid "Maximum Attachment Size:"
 msgstr "含附件"
 
-#: configuredialog/configurecomposerpage.cpp:1172
+#: configuredialog/configurecomposerpage.cpp:1174
 #, kde-format
 msgctxt "spinbox suffix: unit for kilobyte"
 msgid " kB"
 msgstr " kB"
 
-#: configuredialog/configurecomposerpage.cpp:1174
+#: configuredialog/configurecomposerpage.cpp:1176
 #, kde-format
 msgid "No limit"
 msgstr "不限制"
 
-#: configuredialog/configurecomposerpage.cpp:1202
+#: configuredialog/configurecomposerpage.cpp:1204
 #, kde-format
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
@@ -1486,7 +1492,7 @@
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:250
 #, fuzzy, kde-format
 #| msgid "Composer"
-msgid "Convertor Text Plugins"
+msgid "Text Conversion Plugins"
 msgstr "信件編輯器"
 
 #: configuredialog/configureplugins/configurepluginslistwidget.cpp:257
@@ -1593,19 +1599,19 @@
 #, kde-format
 msgctxt "Start of the filename for a mail archive file"
 msgid "Archive"
-msgstr "歸檔"
+msgstr "封存"
 
 #: dialog/archivefolderdialog.cpp:64
 #, kde-format
 msgctxt "@title:window for archiving a folder"
 msgid "Archive Folder"
-msgstr "歸檔資料夾"
+msgstr "封存資料夾"
 
-#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3562
+#: dialog/archivefolderdialog.cpp:72 kmmainwidget.cpp:3569
 #, kde-format
 msgctxt "@action"
 msgid "Archive"
-msgstr "歸檔"
+msgstr "封存"
 
 #: dialog/archivefolderdialog.cpp:84
 #, kde-format
@@ -1625,7 +1631,7 @@
 #: dialog/archivefolderdialog.cpp:101
 #, kde-format
 msgid "Uncompressed Archive (.tar)"
-msgstr "未壓縮的歸檔（.tar）"
+msgstr "未壓縮的封存（.tar）"
 
 #: dialog/archivefolderdialog.cpp:102
 #, kde-format
@@ -1640,7 +1646,7 @@
 #: dialog/archivefolderdialog.cpp:109
 #, kde-format
 msgid "&Archive File:"
-msgstr "歸檔檔名(&A)："
+msgstr "封存檔名(&A)："
 
 #: dialog/archivefolderdialog.cpp:121
 #, kde-format
@@ -1650,12 +1656,12 @@
 #: dialog/archivefolderdialog.cpp:125
 #, kde-format
 msgid "Archive all subfolders"
-msgstr "歸檔所有的子資料夾"
+msgstr "封存所有的子資料夾"
 
 #: dialog/archivefolderdialog.cpp:187
 #, kde-format
 msgid "Please select the folder that should be archived."
-msgstr "請選擇要歸檔的資料夾。"
+msgstr "請選擇要封存的資料夾。"
 
 #: dialog/archivefolderdialog.cpp:188
 #, kde-format
@@ -1667,18 +1673,18 @@
 msgid "Notification"
 msgstr "通知"
 
-#: editor/attachment/attachmentview.cpp:181
+#: editor/attachment/attachmentview.cpp:180
 #, kde-format
 msgid "1 attachment (%2)"
 msgid_plural "%1 attachments (%2)"
 msgstr[0] "%1 個附件（%2）"
 
-#: editor/attachment/attachmentview.cpp:214
+#: editor/attachment/attachmentview.cpp:213
 #, kde-format
 msgid "Hide attachment list"
 msgstr "隱藏附件清單"
 
-#: editor/attachment/attachmentview.cpp:216
+#: editor/attachment/attachmentview.cpp:215
 #, kde-format
 msgid "Show attachment list"
 msgstr "顯示附件清單"
@@ -1695,472 +1701,472 @@
 msgid "Encoding"
 msgstr "編碼"
 
-#: editor/kmcomposerwin.cpp:267 kmail_part.cpp:63 kmmainwin.cpp:63
-#: kmreadermainwin.cpp:388 kontactplugin/kmail/kmail_plugin.cpp:56
+#: editor/kmcomposerwin.cpp:259 kmail_part.cpp:62 kmmainwin.cpp:63
+#: kmreadermainwin.cpp:444 kontactplugin/kmail/kmail_plugin.cpp:56
 #, kde-format
 msgid "KMail2"
 msgstr "KMail2"
 
-#: editor/kmcomposerwin.cpp:297
+#: editor/kmcomposerwin.cpp:289
 #, kde-format
 msgid "Select the dictionary to use when spell-checking this message"
 msgstr "選擇要對此信件做拼字檢查使用的字典"
 
-#: editor/kmcomposerwin.cpp:304
+#: editor/kmcomposerwin.cpp:296
 #, kde-format
 msgid "Select the sent-mail folder where a copy of this message will be saved"
 msgstr "選擇此信件的寄件備份要放在哪個資料夾"
 
-#: editor/kmcomposerwin.cpp:309
+#: editor/kmcomposerwin.cpp:301
 #, kde-format
 msgid "Select the outgoing account to use for sending this message"
 msgstr "請選擇傳送此信件要使用的帳號"
 
-#: editor/kmcomposerwin.cpp:316
+#: editor/kmcomposerwin.cpp:308
 #, kde-format
 msgid "Set the \"From:\" email address for this message"
 msgstr "設定此信件的「寄件者」電子郵件地址"
 
-#: editor/kmcomposerwin.cpp:327
+#: editor/kmcomposerwin.cpp:319
 #, kde-format
 msgid "Set a subject for this message"
 msgstr "設定此信件主題"
 
-#: editor/kmcomposerwin.cpp:329
+#: editor/kmcomposerwin.cpp:321
 #, kde-format
 msgid "&Identity:"
 msgstr "身份(&I)："
 
-#: editor/kmcomposerwin.cpp:330
+#: editor/kmcomposerwin.cpp:322
 #, kde-format
 msgid "&Dictionary:"
 msgstr "字典(&D)："
 
-#: editor/kmcomposerwin.cpp:331
+#: editor/kmcomposerwin.cpp:323
 #, kde-format
 msgid "&Sent-Mail folder:"
 msgstr "寄件備份(&S)："
 
-#: editor/kmcomposerwin.cpp:332
+#: editor/kmcomposerwin.cpp:324
 #, kde-format
 msgid "&Mail transport:"
 msgstr "發送信件帳號(&M)："
 
-#: editor/kmcomposerwin.cpp:333
+#: editor/kmcomposerwin.cpp:325
 #, kde-format
 msgctxt "sender address field"
 msgid "&From:"
 msgstr "寄件者(&F)："
 
-#: editor/kmcomposerwin.cpp:334
+#: editor/kmcomposerwin.cpp:326
 #, kde-format
 msgctxt "@label:textbox Subject of email."
 msgid "S&ubject:"
 msgstr "主題(&U)："
 
-#: editor/kmcomposerwin.cpp:1025 editor/kmcomposerwin.cpp:1059
+#: editor/kmcomposerwin.cpp:1088 editor/kmcomposerwin.cpp:1122
 #, kde-format
 msgid "&Send Mail"
 msgstr "傳送(&S)"
 
-#: editor/kmcomposerwin.cpp:1032 editor/kmcomposerwin.cpp:1065
+#: editor/kmcomposerwin.cpp:1095 editor/kmcomposerwin.cpp:1128
 #, kde-format
 msgid "&Send Mail Via"
 msgstr "傳送經由(&S)"
 
-#: editor/kmcomposerwin.cpp:1034
+#: editor/kmcomposerwin.cpp:1097
 #, kde-format
 msgid "Send"
 msgstr "傳送"
 
-#: editor/kmcomposerwin.cpp:1037 editor/kmcomposerwin.cpp:1049
-#: editor/kmcomposerwin.cpp:2809
+#: editor/kmcomposerwin.cpp:1100 editor/kmcomposerwin.cpp:1112
+#: editor/kmcomposerwin.cpp:2903
 #, kde-format
 msgid "Send &Later"
 msgstr "稍後傳送(&L)"
 
-#: editor/kmcomposerwin.cpp:1043 editor/kmcomposerwin.cpp:1056
+#: editor/kmcomposerwin.cpp:1106 editor/kmcomposerwin.cpp:1119
 #, kde-format
 msgid "Send &Later Via"
 msgstr "稍後傳送經由(&L)"
 
-#: editor/kmcomposerwin.cpp:1045
+#: editor/kmcomposerwin.cpp:1108
 #, kde-format
 msgctxt "Queue the message for sending at a later date"
 msgid "Queue"
 msgstr "佇列"
 
-#: editor/kmcomposerwin.cpp:1078
+#: editor/kmcomposerwin.cpp:1141
 #, kde-format
 msgid "Save as &Draft"
 msgstr "存至草稿夾(&D)"
 
-#: editor/kmcomposerwin.cpp:1080
+#: editor/kmcomposerwin.cpp:1143
 #, kde-format
 msgid "Save email in Draft folder"
 msgstr "搜尋草稿資料夾中的信件"
 
-#: editor/kmcomposerwin.cpp:1084
+#: editor/kmcomposerwin.cpp:1147
 #, kde-format
 msgid "Save as &Template"
 msgstr "存為樣本(&T)"
 
-#: editor/kmcomposerwin.cpp:1085
+#: editor/kmcomposerwin.cpp:1148
 #, kde-format
 msgid "Save email in Template folder"
 msgstr "將電子郵件從到樣本資料夾"
 
-#: editor/kmcomposerwin.cpp:1089
+#: editor/kmcomposerwin.cpp:1152
 #, kde-format
 msgid "Save as &File"
 msgstr "存成檔案(&F)"
 
-#: editor/kmcomposerwin.cpp:1090
+#: editor/kmcomposerwin.cpp:1153
 #, kde-format
 msgid "Save email as text or html file"
 msgstr "將電子郵件存成文字或 html 檔"
 
-#: editor/kmcomposerwin.cpp:1094
+#: editor/kmcomposerwin.cpp:1157
 #, kde-format
 msgid "&Insert Text File..."
 msgstr "插入文字檔(&I)..."
 
-#: editor/kmcomposerwin.cpp:1099
+#: editor/kmcomposerwin.cpp:1162
 #, kde-format
 msgid "&Insert Recent Text File"
 msgstr "插入最近使用的文字檔(&I)"
 
-#: editor/kmcomposerwin.cpp:1110 kmmainwidget.cpp:2895
+#: editor/kmcomposerwin.cpp:1172 kmmainwidget.cpp:2902
 #, kde-format
 msgid "&Address Book"
 msgstr "通訊錄(&A)"
 
-#: editor/kmcomposerwin.cpp:1111
+#: editor/kmcomposerwin.cpp:1173
 #, kde-format
 msgid "Open Address Book"
 msgstr "開啟通訊錄..."
 
-#: editor/kmcomposerwin.cpp:1118
+#: editor/kmcomposerwin.cpp:1180
 #, kde-format
 msgid "&New Composer"
 msgstr "寫信(&N)..."
 
-#: editor/kmcomposerwin.cpp:1124
+#: editor/kmcomposerwin.cpp:1186
 #, kde-format
 msgid "Select &Recipients..."
 msgstr "選擇收件者(&R)..."
 
-#: editor/kmcomposerwin.cpp:1128
+#: editor/kmcomposerwin.cpp:1190
 #, kde-format
 msgid "Save &Distribution List..."
 msgstr "儲存聯絡人群組(&D)..."
 
-#: editor/kmcomposerwin.cpp:1151
+#: editor/kmcomposerwin.cpp:1213
 #, kde-format
 msgid "Paste as Attac&hment"
 msgstr "貼上成附件(&H)"
 
-#: editor/kmcomposerwin.cpp:1155
+#: editor/kmcomposerwin.cpp:1217
 #, kde-format
 msgid "Cl&ean Spaces"
 msgstr "清除空間(&E)"
 
-#: editor/kmcomposerwin.cpp:1159
+#: editor/kmcomposerwin.cpp:1221
 #, kde-format
 msgid "Use Fi&xed Font"
 msgstr "使用固定寬度文字(&X)"
 
-#: editor/kmcomposerwin.cpp:1166
+#: editor/kmcomposerwin.cpp:1228
 #, kde-format
 msgctxt "@action:inmenu Mark the email as urgent."
 msgid "&Urgent"
 msgstr "急件(&U)"
 
-#: editor/kmcomposerwin.cpp:1168
+#: editor/kmcomposerwin.cpp:1230
 #, kde-format
 msgid "&Request Disposition Notification"
 msgstr "加上信件處理通知(&R)"
 
-#: editor/kmcomposerwin.cpp:1172
+#: editor/kmcomposerwin.cpp:1234
 #, fuzzy, kde-format
 #| msgid "&Request Disposition Notification"
 msgid "&Request Delivery Confirmation"
 msgstr "加上信件處理通知(&R)"
 
-#: editor/kmcomposerwin.cpp:1179
+#: editor/kmcomposerwin.cpp:1241
 #, kde-format
 msgid "&Wordwrap"
 msgstr "自動換行(&W)"
 
-#: editor/kmcomposerwin.cpp:1184
+#: editor/kmcomposerwin.cpp:1246
 #, kde-format
 msgid "&Snippets"
 msgstr "片段(&S)"
 
-#: editor/kmcomposerwin.cpp:1190
+#: editor/kmcomposerwin.cpp:1252
 #, kde-format
 msgid "&Automatic Spellchecking"
 msgstr "自動檢查拼字(&A)"
 
-#: editor/kmcomposerwin.cpp:1207
+#: editor/kmcomposerwin.cpp:1269
 #, kde-format
 msgid "Rich Text Editing"
 msgstr "Richtext 編輯"
 
-#: editor/kmcomposerwin.cpp:1209
+#: editor/kmcomposerwin.cpp:1271
 #, kde-format
 msgid "Rich Text"
 msgstr "Rich Text"
 
-#: editor/kmcomposerwin.cpp:1210
+#: editor/kmcomposerwin.cpp:1272
 #, kde-format
 msgid "Toggle rich text editing mode"
 msgstr "切換 rich text 編輯模式"
 
-#: editor/kmcomposerwin.cpp:1214
+#: editor/kmcomposerwin.cpp:1276
 #, kde-format
 msgid "&All Fields"
 msgstr "全部欄位(&A)"
 
-#: editor/kmcomposerwin.cpp:1217
+#: editor/kmcomposerwin.cpp:1279
 #, kde-format
 msgid "&Identity"
 msgstr "身份(&I)"
 
-#: editor/kmcomposerwin.cpp:1220
+#: editor/kmcomposerwin.cpp:1282
 #, kde-format
 msgid "&Dictionary"
 msgstr "字典(&D)"
 
-#: editor/kmcomposerwin.cpp:1223
+#: editor/kmcomposerwin.cpp:1285
 #, kde-format
 msgid "&Sent-Mail Folder"
 msgstr "寄件備份(&S)"
 
-#: editor/kmcomposerwin.cpp:1226
+#: editor/kmcomposerwin.cpp:1288
 #, kde-format
 msgid "&Mail Transport"
 msgstr "發送信件帳號(&M)"
 
-#: editor/kmcomposerwin.cpp:1229
+#: editor/kmcomposerwin.cpp:1291
 #, kde-format
 msgid "&From"
 msgstr "寄件者(&F)"
 
-#: editor/kmcomposerwin.cpp:1233
+#: editor/kmcomposerwin.cpp:1295
 #, kde-format
 msgctxt "@action:inmenu Show the subject in the composer window."
 msgid "S&ubject"
 msgstr "主題(&U)"
 
-#: editor/kmcomposerwin.cpp:1238
+#: editor/kmcomposerwin.cpp:1300
 #, kde-format
 msgid "Append S&ignature"
 msgstr "附上簽名(&I)"
 
-#: editor/kmcomposerwin.cpp:1242
+#: editor/kmcomposerwin.cpp:1304
 #, kde-format
 msgid "Pr&epend Signature"
 msgstr "在前面附上簽名(&E)"
 
-#: editor/kmcomposerwin.cpp:1246
+#: editor/kmcomposerwin.cpp:1308
 #, kde-format
 msgid "Insert Signature At C&ursor Position"
 msgstr "在游標位置插入簽名(&U)"
 
-#: editor/kmcomposerwin.cpp:1258
+#: editor/kmcomposerwin.cpp:1320
 #, kde-format
 msgid "&Spellchecker..."
 msgstr "拼字檢查程式(&S)..."
 
-#: editor/kmcomposerwin.cpp:1259
+#: editor/kmcomposerwin.cpp:1321
 #, kde-format
 msgid "Spellchecker"
 msgstr "拼字檢查程式"
 
-#: editor/kmcomposerwin.cpp:1263
+#: editor/kmcomposerwin.cpp:1325
 #, kde-format
 msgid "&Encrypt Message"
 msgstr "加密信件(&E)"
 
-#: editor/kmcomposerwin.cpp:1264
+#: editor/kmcomposerwin.cpp:1326
 #, kde-format
 msgid "Encrypt"
 msgstr "加密"
 
-#: editor/kmcomposerwin.cpp:1266
+#: editor/kmcomposerwin.cpp:1328
 #, kde-format
 msgid "&Sign Message"
 msgstr "簽署信件(&S)"
 
-#: editor/kmcomposerwin.cpp:1267
+#: editor/kmcomposerwin.cpp:1329
 #, kde-format
 msgid "Sign"
 msgstr "簽章"
 
-#: editor/kmcomposerwin.cpp:1290
+#: editor/kmcomposerwin.cpp:1352
 #, kde-format
 msgid "&Cryptographic Message Format"
 msgstr "信件加密格式(&C)"
 
-#: editor/kmcomposerwin.cpp:1293
+#: editor/kmcomposerwin.cpp:1355
 #, kde-format
 msgid "Select a cryptographic format for this message"
 msgstr "請選擇此信件使用的加密格式"
 
-#: editor/kmcomposerwin.cpp:1298
+#: editor/kmcomposerwin.cpp:1360
 #, fuzzy, kde-format
 #| msgid "Add Followup Reminder..."
 msgid "Create Follow Up Reminder..."
 msgstr "新增回覆提醒..."
 
-#: editor/kmcomposerwin.cpp:1322
+#: editor/kmcomposerwin.cpp:1384
 #, kde-format
 msgid "Configure KMail..."
 msgstr "設定 KMail..."
 
-#: editor/kmcomposerwin.cpp:1335 kmmainwin.cpp:134
+#: editor/kmcomposerwin.cpp:1397 kmmainwin.cpp:134 kmreadermainwin.cpp:503
 #, kde-format
 msgid ""
 "<qt>This will hide the menu bar completely. You can show it again by typing "
 "%1.</qt>"
 msgstr "<qt>這會完全隱藏選單列。您可以按下 %1 重新顯示選單列。</qt>"
 
-#: editor/kmcomposerwin.cpp:1337 kmmainwin.cpp:136
+#: editor/kmcomposerwin.cpp:1399 kmmainwin.cpp:136 kmreadermainwin.cpp:505
 #, kde-format
 msgid "Hide menu bar"
 msgstr "隱藏選單列"
 
-#: editor/kmcomposerwin.cpp:1437 editor/kmcomposerwin.cpp:3258
+#: editor/kmcomposerwin.cpp:1499 editor/kmcomposerwin.cpp:3352
 #, kde-format
 msgctxt "Shows the linenumber of the cursor position."
 msgid " Line: %1 "
 msgstr " 行：%1"
 
-#: editor/kmcomposerwin.cpp:1441 editor/kmcomposerwin.cpp:3260
+#: editor/kmcomposerwin.cpp:1503 editor/kmcomposerwin.cpp:3354
 #, kde-format
 msgid " Column: %1 "
 msgstr " 欄位：%1"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "OVR"
 msgstr "覆寫"
 
-#: editor/kmcomposerwin.cpp:1446
+#: editor/kmcomposerwin.cpp:1508
 #, kde-format
 msgid "INS"
 msgstr "插入"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: on"
 msgstr "拼字檢查：開啟"
 
-#: editor/kmcomposerwin.cpp:1451
+#: editor/kmcomposerwin.cpp:1513
 #, kde-format
 msgid "Spellcheck: off"
 msgstr "拼字檢查：關閉"
 
-#: editor/kmcomposerwin.cpp:1787
+#: editor/kmcomposerwin.cpp:1853
 #, kde-format
 msgid "Re&save as Template"
 msgstr "重新儲存為樣本(&S)"
 
-#: editor/kmcomposerwin.cpp:1788
+#: editor/kmcomposerwin.cpp:1854
 #, kde-format
 msgid "&Save as Draft"
 msgstr "存至草稿夾(&S)"
 
-#: editor/kmcomposerwin.cpp:1790
+#: editor/kmcomposerwin.cpp:1856
 #, kde-format
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "將此信件重新儲存至樣本資料夾。稍後您可以使用。"
 
-#: editor/kmcomposerwin.cpp:1792
+#: editor/kmcomposerwin.cpp:1858
 #, kde-format
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr "將信件存到草稿夾，稍後可以再編輯與傳送。"
 
-#: editor/kmcomposerwin.cpp:1796
+#: editor/kmcomposerwin.cpp:1862
 #, kde-format
 msgid "Do you want to save the message for later or discard it?"
 msgstr "您要放棄此信件，還是存下稍後使用？"
 
-#: editor/kmcomposerwin.cpp:1797
+#: editor/kmcomposerwin.cpp:1863
 #, kde-format
 msgid "Close Composer"
 msgstr "關閉信件編輯器"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Autosave Message Failed"
 msgstr "自動儲存信件失敗"
 
-#: editor/kmcomposerwin.cpp:1868
+#: editor/kmcomposerwin.cpp:1934
 #, kde-format
 msgid "Sending Message Failed"
 msgstr "傳送信件失敗。"
 
-#: editor/kmcomposerwin.cpp:2022
+#: editor/kmcomposerwin.cpp:2091
 #, kde-format
 msgctxt "@title:window"
 msgid "Insert File"
 msgstr "插入檔案"
 
-#: editor/kmcomposerwin.cpp:2085
+#: editor/kmcomposerwin.cpp:2154
 #, kde-format
 msgid "Add as &Inline Image"
 msgstr "新增為內含影像(&I)"
 
-#: editor/kmcomposerwin.cpp:2086
+#: editor/kmcomposerwin.cpp:2155
 #, kde-format
 msgid "Add as &Attachment"
 msgstr "以附件加入(&A)"
 
-#: editor/kmcomposerwin.cpp:2102 editor/kmcomposerwin.cpp:2197
+#: editor/kmcomposerwin.cpp:2171 editor/kmcomposerwin.cpp:2269
 #, kde-format
 msgid "Name of the attachment:"
 msgstr "附件名稱："
 
-#: editor/kmcomposerwin.cpp:2109
+#: editor/kmcomposerwin.cpp:2178
 #, kde-format
 msgid "Attachment name can't be empty"
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:2110
+#: editor/kmcomposerwin.cpp:2179
 #, fuzzy, kde-format
 #| msgid "Invalid date"
 msgid "Invalid Attachment Name"
 msgstr "不合法的日期"
 
-#: editor/kmcomposerwin.cpp:2156
+#: editor/kmcomposerwin.cpp:2225
 #, kde-format
 msgid "Add URL into Message"
 msgid_plural "Add URLs into Message"
 msgstr[0] "新增網址到信件內"
 
-#: editor/kmcomposerwin.cpp:2157
+#: editor/kmcomposerwin.cpp:2226
 #, kde-format
 msgid "Add File as &Attachment"
 msgid_plural "Add Files as &Attachment"
 msgstr[0] "附加檔案(&A)"
 
-#: editor/kmcomposerwin.cpp:2196
+#: editor/kmcomposerwin.cpp:2268
 #, kde-format
 msgid "Insert clipboard text as attachment"
 msgstr "插入剪貼簿的文字成附件(&H)"
 
-#: editor/kmcomposerwin.cpp:2294
+#: editor/kmcomposerwin.cpp:2367
 #, kde-format
 msgid "unnamed"
 msgstr "未命名"
 
-#: editor/kmcomposerwin.cpp:2320
+#: editor/kmcomposerwin.cpp:2393
 #, kde-format
 msgid ""
 "<qt><p>You have requested that messages be encrypted to yourself, but the "
@@ -2171,12 +2177,12 @@
 "<qt> <p>您要求對自己加密，但目前的身份並未定義 OpenPGP 或 S/MIME 的加密金鑰或"
 "憑證。</p> <p>請在身份設定處選擇您要使用的金鑰。</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2327
+#: editor/kmcomposerwin.cpp:2400
 #, kde-format
 msgid "Undefined Encryption Key"
 msgstr "未定義的加密金鑰"
 
-#: editor/kmcomposerwin.cpp:2391
+#: editor/kmcomposerwin.cpp:2464
 #, kde-format
 msgid ""
 "<qt><p>In order to be able to sign this message you first have to define the "
@@ -2186,12 +2192,12 @@
 "<qt><p>為了要簽署信件，您必須指定加密用的 OpenPGP 金鑰或 S/MIME 憑證。</p> "
 "<p>請在身份設定處選擇要使用的金鑰或憑證。</p></qt>"
 
-#: editor/kmcomposerwin.cpp:2398
+#: editor/kmcomposerwin.cpp:2471
 #, kde-format
 msgid "Undefined Signing Key"
 msgstr "未定義的簽署金鑰"
 
-#: editor/kmcomposerwin.cpp:2540
+#: editor/kmcomposerwin.cpp:2629
 #, kde-format
 msgid ""
 "You must enter your email address in the From: field. You should also set "
@@ -2201,131 +2207,131 @@
 "您必須在「寄件者」欄位中填入自己的電子郵件地址。您應該在身份設定中設定電子信"
 "件地址，這樣就不必每次送信都重新填寫。"
 
-#: editor/kmcomposerwin.cpp:2549
+#: editor/kmcomposerwin.cpp:2638
 #, kde-format
 msgid ""
 "You must specify at least one receiver, either in the To: field or as CC or "
 "as BCC."
 msgstr "您必須在收件者、副本或密件副本欄位中指定最少一位收件者。"
 
-#: editor/kmcomposerwin.cpp:2555
+#: editor/kmcomposerwin.cpp:2644
 #, kde-format
 msgid "To: field is empty. Send message anyway?"
 msgstr "您沒有指定收件者。確定要送出訊息？"
 
-#: editor/kmcomposerwin.cpp:2557
+#: editor/kmcomposerwin.cpp:2646
 #, kde-format
 msgid "No To: specified"
 msgstr "沒有指定收件者"
 
-#: editor/kmcomposerwin.cpp:2570
+#: editor/kmcomposerwin.cpp:2659
 #, kde-format
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "您沒有寫主題。確定要送出訊息？"
 
-#: editor/kmcomposerwin.cpp:2572
+#: editor/kmcomposerwin.cpp:2661
 #, kde-format
 msgid "No Subject Specified"
 msgstr "沒有主題"
 
-#: editor/kmcomposerwin.cpp:2573
+#: editor/kmcomposerwin.cpp:2662
 #, kde-format
 msgid "S&end as Is"
 msgstr "就這樣送吧(&E)"
 
-#: editor/kmcomposerwin.cpp:2574
+#: editor/kmcomposerwin.cpp:2663
 #, kde-format
 msgid "&Specify the Subject"
 msgstr "感謝提醒(&S)"
 
-#: editor/kmcomposerwin.cpp:2619
+#: editor/kmcomposerwin.cpp:2708
 #, kde-format
 msgid ""
 "You must specify at least one receiver in order to be able to encrypt a "
 "draft."
 msgstr "您必須指定最少一位收件者，才能加密草稿。"
 
-#: editor/kmcomposerwin.cpp:2806
+#: editor/kmcomposerwin.cpp:2900
 #, kde-format
 msgid "About to send email..."
 msgstr "即將傳送信件..."
 
-#: editor/kmcomposerwin.cpp:2807
+#: editor/kmcomposerwin.cpp:2901
 #, kde-format
 msgid "Send Confirmation"
 msgstr "傳送確認"
 
-#: editor/kmcomposerwin.cpp:2808
+#: editor/kmcomposerwin.cpp:2902
 #, kde-format
 msgid "&Send Now"
 msgstr "立即傳送(&S)"
 
-#: editor/kmcomposerwin.cpp:2882
+#: editor/kmcomposerwin.cpp:2976
 #, kde-format
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr "您正試圖傳送電子郵件給多於 %1 個收件者。確定要傳送嗎？"
 
-#: editor/kmcomposerwin.cpp:2883
+#: editor/kmcomposerwin.cpp:2977
 #, kde-format
 msgid "Too many recipients"
 msgstr "太多收件者"
 
-#: editor/kmcomposerwin.cpp:2884
+#: editor/kmcomposerwin.cpp:2978
 #, kde-format
 msgid "&Send as Is"
 msgstr "就這樣送吧(&S)"
 
-#: editor/kmcomposerwin.cpp:2885
+#: editor/kmcomposerwin.cpp:2979
 #, kde-format
 msgid "&Edit Recipients"
 msgstr "編輯收件者(&E)"
 
-#: editor/kmcomposerwin.cpp:2919
+#: editor/kmcomposerwin.cpp:3013
 #, kde-format
 msgid ""
 "Turning HTML mode off will cause the text to lose the formatting. Are you "
 "sure?"
 msgstr "關閉 HTML 模式會造成失去文字排版格式。您確定要這樣做嗎？"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose the formatting?"
 msgstr "要拿掉排版格式嗎？"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Lose Formatting"
 msgstr "遺失格式"
 
-#: editor/kmcomposerwin.cpp:2921
+#: editor/kmcomposerwin.cpp:3015
 #, kde-format
 msgid "Add Markup Plain Text"
 msgstr "新增標記純文字"
 
-#: editor/kmcomposerwin.cpp:3586
+#: editor/kmcomposerwin.cpp:3685
 #, kde-format
 msgid ""
 "High security encryption will be used for this recipient (the encryption key "
 "is fully trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3591
+#: editor/kmcomposerwin.cpp:3690
 #, kde-format
 msgid ""
 "Medium security encryption will be used for this recipient (the encryption "
 "key is marginally trusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3596
+#: editor/kmcomposerwin.cpp:3695
 #, kde-format
 msgid ""
 "Low security encryption will be used for this recipient (the encryption key "
 "is untrusted). Click the icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3602
+#: editor/kmcomposerwin.cpp:3701
 #, kde-format
 msgid ""
 "The email to this recipient will be encrypted, but the security of the "
@@ -2333,7 +2339,7 @@
 "icon for details."
 msgstr ""
 
-#: editor/kmcomposerwin.cpp:3636
+#: editor/kmcomposerwin.cpp:3735
 #, fuzzy, kde-format
 #| msgid "Login Information"
 msgid "Plugin Editor Information"
@@ -2412,33 +2418,33 @@
 msgid "External editor was started."
 msgstr "外部編輯器已開啟。"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:72
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
 #, kde-format
 msgid ""
 "Transport was not found. Please verify that you will use a correct mail "
 "transport."
 msgstr ""
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:76
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid "Sent Folder is not defined. Please set it before sending the mail."
-msgstr "歸檔資料夾未定義。請檢查帳號 %1 的設定"
+msgstr "封存資料夾未定義。請檢查帳號 %1 的設定"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:80
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:88
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
 "Identity was not found. Please verify that you will use a correct identity."
-msgstr "歸檔資料夾未定義。請檢查帳號 %1 的設定"
+msgstr "封存資料夾未定義。請檢查帳號 %1 的設定"
 
-#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:84
+#: editor/warningwidgets/incorrectidentityfolderwarning.cpp:92
 #, fuzzy, kde-format
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
 "Dictionary was not found. Please verify that you will use a correct "
 "dictionary."
-msgstr "歸檔資料夾未定義。請檢查帳號 %1 的設定"
+msgstr "封存資料夾未定義。請檢查帳號 %1 的設定"
 
 #: editor/widgets/cryptostateindicatorwidget.cpp:93
 #, kde-format
@@ -2460,11 +2466,6 @@
 msgid "Message will not be encrypted"
 msgstr "信件將不會被加密"
 
-#: editor/widgets/snippetwidget.cpp:76
-#, kde-format
-msgid "Text Snippets"
-msgstr "文字片段"
-
 #: folderarchive/folderarchiveagentcheckcollection.cpp:51
 #: folderarchive/folderarchiveagentjob.cpp:74
 #: folderarchive/folderarchiveagentjob.cpp:80
@@ -2485,7 +2486,7 @@
 #: folderarchive/folderarchiveagentjob.cpp:47
 #, kde-format
 msgid "Archive folder not defined. Please verify settings for account %1"
-msgstr "歸檔資料夾未定義。請檢查帳號 %1 的設定"
+msgstr "封存資料夾未定義。請檢查帳號 %1 的設定"
 
 #: folderarchive/folderarchiveagentjob.cpp:51
 #, kde-format
@@ -2502,37 +2503,37 @@
 #| msgid "Archive folder not defined. Please verify settings for account %1"
 msgid ""
 "This folder %1 is read only. Please verify the configuration of account %2"
-msgstr "歸檔資料夾未定義。請檢查帳號 %1 的設定"
+msgstr "封存資料夾未定義。請檢查帳號 %1 的設定"
 
 #: folderarchive/folderarchiveagentjob.cpp:117
 #, kde-format
 msgid "Cannot move messages."
 msgstr "無法移動訊息。"
 
-#: folderarchive/folderarchivemanager.cpp:91
+#: folderarchive/folderarchivemanager.cpp:89
 #, kde-format
 msgid "Unable to fetch folder. Error reported: %1"
 msgstr "無法抓取資料夾。錯誤回報：%1"
 
-#: folderarchive/folderarchivemanager.cpp:98
+#: folderarchive/folderarchivemanager.cpp:96
 #, kde-format
 msgid "No folder returned."
 msgstr "沒有返回資料夾。"
 
-#: folderarchive/folderarchivemanager.cpp:110
+#: folderarchive/folderarchivemanager.cpp:108
 #, kde-format
 msgid "Unable to fetch parent folder. Error reported: %1"
 msgstr "無法抓取父資料夾。錯誤回報：%1"
 
-#: folderarchive/folderarchivemanager.cpp:116
+#: folderarchive/folderarchivemanager.cpp:114
 #, kde-format
 msgid "Unable to return list of folders."
 msgstr "無法返回資料夾清單。"
 
-#: folderarchive/folderarchivemanager.cpp:183
+#: folderarchive/folderarchivemanager.cpp:181
 #, kde-format
 msgid "Messages archived"
-msgstr "訊息已歸檔"
+msgstr "訊息已封存"
 
 #: foldershortcutactionmanager.cpp:134 foldershortcutactionmanager.cpp:135
 #, kde-format
@@ -2570,50 +2571,50 @@
 msgid "&Existing identities:"
 msgstr "現有身份(&E)："
 
-#: identity/identitydialog.cpp:201
+#: identity/identitydialog.cpp:200
 #, fuzzy, kde-format
 #| msgid "Error while trying to rename folder %1"
 msgid "Error while generating new key pair: %1"
 msgstr "更改資料夾 %1 的名稱時發生錯誤"
 
-#: identity/identitydialog.cpp:202
+#: identity/identitydialog.cpp:201
 #, kde-format
 msgid "Key Generation Error"
 msgstr ""
 
-#: identity/identitydialog.cpp:245
+#: identity/identitydialog.cpp:244
 #, kde-format
 msgid "No key"
 msgstr ""
 
-#: identity/identitydialog.cpp:248
+#: identity/identitydialog.cpp:247
 #, fuzzy, kde-format
 #| msgid "Enter new key word:"
 msgid "Generate a new key pair"
 msgstr "輸入新的關鍵字："
 
-#: identity/identitydialog.cpp:261
+#: identity/identitydialog.cpp:260
 #, kde-format
 msgid "Generating new key pair..."
 msgstr ""
 
-#: identity/identitydialog.cpp:275
+#: identity/identitydialog.cpp:274
 #, kde-format
 msgid "Edit Identity"
 msgstr "編輯身份"
 
-#: identity/identitydialog.cpp:300
+#: identity/identitydialog.cpp:299
 #, kde-format
 msgctxt "@title:tab General identity settings."
 msgid "General"
 msgstr "一般"
 
-#: identity/identitydialog.cpp:309
+#: identity/identitydialog.cpp:308
 #, kde-format
 msgid "&Your name:"
 msgstr "您的姓名(&Y)："
 
-#: identity/identitydialog.cpp:312
+#: identity/identitydialog.cpp:311
 #, kde-format
 msgid ""
 "<qt><h3>Your name</h3><p>This field should contain your name as you would "
@@ -2623,12 +2624,12 @@
 "<qt><h3>您的姓名</h3><p>這個欄位是您想要顯示在信件標頭中的名稱。</p> <p>如果"
 "空白，則標頭中只會顯示您的電子郵件地址。</p></qt>"
 
-#: identity/identitydialog.cpp:324
+#: identity/identitydialog.cpp:323
 #, kde-format
 msgid "Organi&zation:"
 msgstr "組織(&Z)："
 
-#: identity/identitydialog.cpp:327
+#: identity/identitydialog.cpp:326
 #, kde-format
 msgid ""
 "<qt><h3>Organization</h3><p>This field should have the name of your "
@@ -2638,12 +2639,12 @@
 "<qt><h3>組織</h3><p>如果您要在信件標頭中顯示您所工作的單位名稱，請填寫在這個"
 "欄位。</p><p>這個欄位留空白並沒有影響。</p></qt>"
 
-#: identity/identitydialog.cpp:340
+#: identity/identitydialog.cpp:339
 #, kde-format
 msgid "&Email address:"
 msgstr "電子郵件地址(&E)："
 
-#: identity/identitydialog.cpp:343
+#: identity/identitydialog.cpp:342
 #, kde-format
 msgid ""
 "<qt><h3>Email address</h3><p>This field should have your full email address."
@@ -2657,12 +2658,12 @@
 "可以建立一個新的身份，或是在下方的欄位中加入別名。</p><p>如果填寫錯誤或留空"
 "白，收信人就無法回信給您了。</p></qt>"
 
-#: identity/identitydialog.cpp:364
+#: identity/identitydialog.cpp:363
 #, kde-format
 msgid "Email a&liases:"
 msgstr "電子郵件地址別名(&L)："
 
-#: identity/identitydialog.cpp:367
+#: identity/identitydialog.cpp:366
 #, kde-format
 msgid ""
 "<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
@@ -2677,12 +2678,12 @@
 "td></tr> <tr><th>別名：</th><td>first@example.org<br/>last@example.org</td></"
 "tr></table> <p>每一行輸入一個別名。</p></qt>"
 
-#: identity/identitydialog.cpp:385
+#: identity/identitydialog.cpp:384
 #, kde-format
 msgid "Cryptography"
 msgstr "加密"
 
-#: identity/identitydialog.cpp:392
+#: identity/identitydialog.cpp:391
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to digitally sign "
@@ -2701,12 +2702,12 @@
 "位您可以留白，但 KMail 就無法簽署數位簽章。</p> <p>更多詳細資料請參閱"
 "<a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:398
+#: identity/identitydialog.cpp:397
 #, kde-format
 msgid "OpenPGP signing key:"
 msgstr "簽署用的 OpenPGP 金鑰："
 
-#: identity/identitydialog.cpp:409
+#: identity/identitydialog.cpp:408
 #, fuzzy, kde-format
 #| msgid ""
 #| "<qt><p>The OpenPGP key you choose here will be used to encrypt messages "
@@ -2727,12 +2728,12 @@
 "用 GnuPG 金鑰。</p> <p>您可以將這個欄位留白，不過 KMail 就無法用 OpenPGP 加"
 "密。</p> <p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:416
+#: identity/identitydialog.cpp:415
 #, kde-format
 msgid "OpenPGP encryption key:"
 msgstr "加密用的 OpenPGP 金鑰："
 
-#: identity/identitydialog.cpp:427
+#: identity/identitydialog.cpp:426
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
@@ -2743,12 +2744,12 @@
 "<qt><p>您選擇的 S/MIME (X.509) 憑證是用來簽署數位簽章的。</p> <p>您可以將這個"
 "欄位留白，但 KMail 就無法使用 S/MIME 來簽署您的信件。</p></qt>"
 
-#: identity/identitydialog.cpp:432
+#: identity/identitydialog.cpp:431
 #, kde-format
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME 簽署憑證："
 
-#: identity/identitydialog.cpp:447
+#: identity/identitydialog.cpp:446
 #, kde-format
 msgid ""
 "<qt><p>The S/MIME certificate you choose here will be used to encrypt "
@@ -2761,40 +2762,40 @@
 "用 GnuPG 金鑰。</p> <p>您可以將這個欄位留白，不過 KMail 就無法用 S/MIME 加"
 "密。</p> <p>更多詳細資料請參閱<a>http://www.gnupg.org</a></p></qt>"
 
-#: identity/identitydialog.cpp:453
+#: identity/identitydialog.cpp:452
 #, kde-format
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME 加密憑證："
 
-#: identity/identitydialog.cpp:474
+#: identity/identitydialog.cpp:473
 #, kde-format
 msgctxt "preferred format of encrypted messages"
 msgid "Preferred format:"
 msgstr "預設格式："
 
-#: identity/identitydialog.cpp:481
+#: identity/identitydialog.cpp:480
 #, kde-format
 msgid "Automatically sign messages"
 msgstr "自動簽署信件"
 
-#: identity/identitydialog.cpp:485
+#: identity/identitydialog.cpp:484
 #, fuzzy, kde-format
 #| msgid "Automatically encrypt &messages whenever possible"
 msgid "Automatically encrypt messages when possible"
 msgstr "可能的話，自動加密信件(&M)"
 
-#: identity/identitydialog.cpp:499
+#: identity/identitydialog.cpp:498
 #, kde-format
 msgctxt "@title:tab Advanced identity settings."
 msgid "Advanced"
 msgstr "進階"
 
-#: identity/identitydialog.cpp:511
+#: identity/identitydialog.cpp:510
 #, kde-format
 msgid "&Reply-To address:"
 msgstr "回信地址(&R)："
 
-#: identity/identitydialog.cpp:514
+#: identity/identitydialog.cpp:513
 #, kde-format
 msgid ""
 "<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
@@ -2808,12 +2809,12 @@
 "如果您要讓回信送到跟發信不同的位置，您可以設定這個欄位。</p> <p>如果不懂得怎"
 "麼使用，請留白即可。</p></qt>"
 
-#: identity/identitydialog.cpp:533
+#: identity/identitydialog.cpp:532
 #, kde-format
 msgid "&CC addresses:"
 msgstr "副本地址(&C)："
 
-#: identity/identitydialog.cpp:536
+#: identity/identitydialog.cpp:535
 #, kde-format
 msgid ""
 "<qt><h3>CC (Carbon Copy) addresses</h3><p>The addresses that you enter here "
@@ -2827,12 +2828,12 @@
 "副本。</p> <p>通常是用來發送信件備份給自己其他的帳號。</p> <p>若要發送給一個"
 "以上的地址，請用逗號隔開。</p> <p>如果不懂得怎麼使用，請留白即可。</p></qt>"
 
-#: identity/identitydialog.cpp:553
+#: identity/identitydialog.cpp:552
 #, kde-format
 msgid "&BCC addresses:"
 msgstr "密件副本(&B)："
 
-#: identity/identitydialog.cpp:556
+#: identity/identitydialog.cpp:555
 #, kde-format
 msgid ""
 "<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
@@ -2847,90 +2848,90 @@
 "<p>若要發送給一個以上的地址，請用逗號隔開。</p> <p>如果不懂得怎麼使用，請留白"
 "即可。</p></qt>"
 
-#: identity/identitydialog.cpp:572
+#: identity/identitydialog.cpp:571
 #, kde-format
 msgid "D&ictionary:"
 msgstr "字典(&I)："
 
-#: identity/identitydialog.cpp:581
+#: identity/identitydialog.cpp:580
 #, kde-format
 msgid "Sent-mail &folder:"
 msgstr "寄件備份(&F)："
 
-#: identity/identitydialog.cpp:590
+#: identity/identitydialog.cpp:589
 #, kde-format
 msgid "&Drafts folder:"
 msgstr "草稿夾(&D)："
 
-#: identity/identitydialog.cpp:599
+#: identity/identitydialog.cpp:598
 #, kde-format
 msgid "&Templates folder:"
 msgstr "樣本資料夾(&T)："
 
-#: identity/identitydialog.cpp:605
+#: identity/identitydialog.cpp:604
 #, kde-format
 msgid "Outgoing Account:"
 msgstr "外送帳號："
 
-#: identity/identitydialog.cpp:613
+#: identity/identitydialog.cpp:612
 #, kde-format
 msgid "Attach my vCard to message"
 msgstr "將我的 vCard 加入信件"
 
-#: identity/identitydialog.cpp:615 identity/identitydialog.cpp:1147
+#: identity/identitydialog.cpp:614 identity/identitydialog.cpp:1146
 #, kde-format
 msgid "Create..."
 msgstr "建立..."
 
-#: identity/identitydialog.cpp:622
+#: identity/identitydialog.cpp:621
 #, kde-format
 msgid "Autocorrection language:"
 msgstr "自動修正語言："
 
-#: identity/identitydialog.cpp:634
+#: identity/identitydialog.cpp:633
 #, kde-format
 msgid "Restore default domain name"
 msgstr "回復預設網域名稱"
 
-#: identity/identitydialog.cpp:638
+#: identity/identitydialog.cpp:637
 #, kde-format
 msgid "Defaul&t domain:"
 msgstr "預設域名(&T)："
 
-#: identity/identitydialog.cpp:643
+#: identity/identitydialog.cpp:642
 #, kde-format
 msgid ""
 "<qt><p>The default domain is used to complete email addresses that only "
 "consist of the user's name.</p></qt>"
 msgstr "<qt><p>預設域名是用來補齊所輸入的電子郵件地址。</p></qt>"
 
-#: identity/identitydialog.cpp:663
+#: identity/identitydialog.cpp:662
 #, kde-format
 msgid "&Use custom message templates for this identity"
 msgstr "此身份使用自訂的信件樣本(&U)"
 
-#: identity/identitydialog.cpp:690
+#: identity/identitydialog.cpp:689
 #, kde-format
 msgid "Signature"
 msgstr "簽名"
 
-#: identity/identitydialog.cpp:697
+#: identity/identitydialog.cpp:696
 #, kde-format
 msgid "Picture"
 msgstr "圖片"
 
-#: identity/identitydialog.cpp:754
+#: identity/identitydialog.cpp:753
 #, kde-format
 msgid "Invalid Email Alias \"%1\""
 msgstr "不合法的電子郵件地址別名 \"%1\""
 
-#: identity/identitydialog.cpp:763 job/addressvalidationjob.cpp:93
+#: identity/identitydialog.cpp:762 job/addressvalidationjob.cpp:93
 #: job/addressvalidationjob.cpp:102
 #, kde-format
 msgid "Invalid Email Address"
 msgstr "不合法的電子郵件地址"
 
-#: identity/identitydialog.cpp:819
+#: identity/identitydialog.cpp:818
 #, kde-format
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
@@ -2942,7 +2943,7 @@
 "(%1)。\n"
 "這樣可能導致收件人確認數位簽章時會接獲警告。"
 
-#: identity/identitydialog.cpp:826
+#: identity/identitydialog.cpp:825
 #, kde-format
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID "
@@ -2951,7 +2952,7 @@
 "其中一個 OpenPGP 加密金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址"
 "(%1)。"
 
-#: identity/identitydialog.cpp:831
+#: identity/identitydialog.cpp:830
 #, kde-format
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
@@ -2963,7 +2964,7 @@
 "(%1)。\n"
 "這樣可能導致收件人確認數位簽章時會接獲警告。"
 
-#: identity/identitydialog.cpp:838
+#: identity/identitydialog.cpp:837
 #, kde-format
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
@@ -2972,22 +2973,22 @@
 "其中一個 S/MIME 加密金鑰未含有任何屬於這個身份的使用者代號與電子郵件地址"
 "(%1)。"
 
-#: identity/identitydialog.cpp:846
+#: identity/identitydialog.cpp:845
 #, kde-format
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "在金鑰或憑證中找不到電子郵件地址"
 
-#: identity/identitydialog.cpp:859
+#: identity/identitydialog.cpp:858
 #, kde-format
 msgid "The signature file is not valid"
 msgstr "簽章已經過期。"
 
-#: identity/identitydialog.cpp:875
+#: identity/identitydialog.cpp:874
 #, kde-format
 msgid "Edit Identity \"%1\""
 msgstr "編輯身份 %1"
 
-#: identity/identitydialog.cpp:933
+#: identity/identitydialog.cpp:932
 #, fuzzy, kde-format
 #| msgid ""
 #| "The custom drafts folder for identity \"%1\" does not exist (anymore); "
@@ -2997,7 +2998,7 @@
 "folders will be used."
 msgstr "您所設定的草稿資料夾 %1 已不存在。因此改為使用預設的資料夾。"
 
-#: identity/identitydialog.cpp:1149
+#: identity/identitydialog.cpp:1148
 #, kde-format
 msgid "Edit..."
 msgstr "編輯..."
@@ -3029,6 +3030,19 @@
 msgid "We cannot delete vCard file."
 msgstr "無法刪除 vCard 檔。"
 
+#: identity/identityeditvcarddialog.cpp:135
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr ""
+
+#: identity/identityeditvcarddialog.cpp:136
+#, fuzzy, kde-format
+#| msgid "Send Confirmation"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "傳送確認"
+
 #: identity/identitylistview.cpp:100
 #, kde-format
 msgctxt ""
@@ -3188,7 +3202,7 @@
 "範例在 <a href=\"http://ace.home.xs4all.nl/X-Faces/\">http://ace.home.xs4all."
 "nl/X-Faces/</a>."
 
-#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1825
+#: identity/xfaceconfigurator.cpp:224 kmcommands.cpp:1846
 #, kde-format
 msgid "Image"
 msgstr "影像"
@@ -3220,7 +3234,7 @@
 msgid_plural "Distribution lists %2 are empty, they cannot be used."
 msgstr[0] "分派清單 \"%2\" 是空的，無法使用。"
 
-#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:145
+#: job/createnewcontactjob.cpp:81 kmreaderwin.cpp:147
 #, kde-format
 msgid "Add to Address Book"
 msgstr "加入通訊錄"
@@ -3230,22 +3244,22 @@
 msgid "Contact created successfully"
 msgstr "聯絡人已成功建立"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Contact cannot be stored: %1"
 msgstr "聯絡人無法儲存：%1"
 
-#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:843
+#: job/createnewcontactjob.cpp:140 kmreaderwin.cpp:855
 #, kde-format
 msgid "Failed to store contact"
 msgstr "儲存聯絡人失敗"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Do you want to attach this folder \"%1\"?"
 msgstr "您確定要附加此資料夾 \"%1\" 嗎？"
 
-#: job/opencomposerjob.cpp:126
+#: job/opencomposerjob.cpp:127
 #, kde-format
 msgid "Attach Folder"
 msgstr "附加資料夾"
@@ -3455,7 +3469,7 @@
 msgstr "資料夾(&O)"
 
 #. i18n: ectx: Menu (apply_filters_folder_actions)
-#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3400 kmmainwin.rc:128
+#: kmail_part.rc:128 kmail_part.rc:273 kmmainwidget.cpp:3407 kmmainwin.rc:128
 #: kmmainwin.rc:273
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters On Folder"
@@ -3463,7 +3477,7 @@
 msgstr "套用所有的過濾器在資料夾上(&Y)"
 
 #. i18n: ectx: Menu (apply_filters_folder_recursive_actions)
-#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3405 kmmainwin.rc:133
+#: kmail_part.rc:133 kmail_part.rc:278 kmmainwidget.cpp:3412 kmmainwin.rc:133
 #: kmmainwin.rc:278
 #, fuzzy, kde-format
 #| msgid "Current Folder & All Subfolders"
@@ -3490,7 +3504,7 @@
 msgstr "轉寄(&F)"
 
 #. i18n: ectx: Menu (apply_filter_actions)
-#: kmail_part.rc:182 kmmainwidget.cpp:3198 kmmainwin.rc:182
+#: kmail_part.rc:182 kmmainwidget.cpp:3205 kmmainwin.rc:182
 #, kde-format
 msgid "A&pply Filter"
 msgstr "套用過濾器(&P)"
@@ -3515,7 +3529,7 @@
 msgstr "說明(&H)"
 
 #. i18n: ectx: ToolBar (mainToolBar)
-#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:327 kmreadermainwin.rc:81
+#: kmail_part.rc:327 kmcomposerui.rc:105 kmmainwin.rc:328 kmreadermainwin.rc:82
 #, kde-format
 msgid "Main Toolbar"
 msgstr "主工具列"
@@ -3569,12 +3583,12 @@
 msgid "The file does not contain a message."
 msgstr "檔案中未含有任何信件。"
 
-#: kmcommands.cpp:821
+#: kmcommands.cpp:839
 #, kde-format
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "檔案中有一封以上的信件。將只顯示第一封。"
 
-#: kmcommands.cpp:920
+#: kmcommands.cpp:938
 #, kde-format
 msgid ""
 "Do you want to forward the selected messages as attachments in one message "
@@ -3582,32 +3596,32 @@
 msgstr ""
 "您要在一封信件中以附加檔方式（MIME 摘要）轉寄選取的信件，還是要個別轉寄？"
 
-#: kmcommands.cpp:923
+#: kmcommands.cpp:941
 #, kde-format
 msgid "Send As Digest"
 msgstr "傳送摘要"
 
-#: kmcommands.cpp:924
+#: kmcommands.cpp:942
 #, kde-format
 msgid "Send Individually"
 msgstr "個別傳送"
 
-#: kmcommands.cpp:1317
+#: kmcommands.cpp:1335
 #, kde-format
 msgid "Filtering messages"
 msgstr "過濾信件中"
 
-#: kmcommands.cpp:1324
+#: kmcommands.cpp:1342
 #, kde-format
 msgid "Filtering message %1 of %2"
 msgstr "過濾 %1 封信件（共 %2 封）"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1673
+#: kmcommands.cpp:1558 kmcommands.cpp:1691
 #, kde-format
 msgid "Moving messages"
 msgstr "移動信件中"
 
-#: kmcommands.cpp:1540 kmcommands.cpp:1681
+#: kmcommands.cpp:1558 kmcommands.cpp:1699
 #, kde-format
 msgid "Deleting messages"
 msgstr "刪除信件中"
@@ -3636,66 +3650,66 @@
 msgid "Text Direction Toolbar"
 msgstr "文字方向工具列"
 
-#: kmkernel.cpp:739
+#: kmkernel.cpp:742
 #, kde-format
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail 目前設定為離線工作，所有網路相關的工作都將暫停。"
 
-#: kmkernel.cpp:761 kmmainwidget.cpp:2392 kmmainwidget.cpp:2408
+#: kmkernel.cpp:764 kmmainwidget.cpp:2399 kmmainwidget.cpp:2415
 #, fuzzy, kde-format
 #| msgid "Sendmail"
 msgid "Send Email"
 msgstr "Sendmail"
 
-#: kmkernel.cpp:762 kmmainwidget.cpp:2393 kmmainwidget.cpp:2409
+#: kmkernel.cpp:765 kmmainwidget.cpp:2400 kmmainwidget.cpp:2416
 #, fuzzy, kde-format
 #| msgid "About to send email..."
 msgid "Impossible to send email"
 msgstr "即將傳送信件..."
 
-#: kmkernel.cpp:794
+#: kmkernel.cpp:797
 #, kde-format
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail 目前設定為上線中，所有網路相關的工作都將繼續。"
 
-#: kmkernel.cpp:796
+#: kmkernel.cpp:799
 #, kde-format
 msgid ""
 "KMail is set to be online; all network jobs will resume when a network "
 "connection is detected"
 msgstr "KMail 目前設定為上線中，所有網路相關的工作都將在偵測到網路連線後繼續"
 
-#: kmkernel.cpp:871
+#: kmkernel.cpp:874
 #, kde-format
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail 目前在離線模式。您要怎麼處理？"
 
-#: kmkernel.cpp:873
+#: kmkernel.cpp:876
 #, kde-format
 msgid "Online/Offline"
 msgstr "上線／離線"
 
-#: kmkernel.cpp:874 kmmainwidget.cpp:2381
+#: kmkernel.cpp:877 kmmainwidget.cpp:2388
 #, kde-format
 msgid "Work Online"
 msgstr "回到線上"
 
-#: kmkernel.cpp:875 kmmainwidget.cpp:2378
+#: kmkernel.cpp:878 kmmainwidget.cpp:2385
 #, kde-format
 msgid "Work Offline"
 msgstr "離線工作"
 
-#: kmkernel.cpp:900
+#: kmkernel.cpp:903
 #, kde-format
 msgid "Network connection detected, all network jobs resumed"
 msgstr "偵測到網路連線，所有網路工作都將回復"
 
-#: kmkernel.cpp:904
+#: kmkernel.cpp:907
 #, kde-format
 msgid "No network connection detected, all network jobs are suspended"
 msgstr "沒有偵測到網路連線，所有網路工作都將暫停"
 
-#: kmkernel.cpp:1000
+#: kmkernel.cpp:1003
 #, kde-format
 msgid ""
 "Failed to open autosave file at %1.\n"
@@ -3704,62 +3718,65 @@
 "開啟於 %1 的自動儲存檔失敗。\n"
 "理由：%2"
 
-#: kmkernel.cpp:1002
+#: kmkernel.cpp:1005
 #, kde-format
 msgid "Opening Autosave File Failed"
 msgstr "開啟自動儲存檔失敗"
 
-#: kmkernel.cpp:1518
+#: kmkernel.cpp:1522
 #, kde-format
 msgid "This identity has been changed to use the default transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the default transport:"
 msgstr[0] "以下 %1 個身份已經被設定為使用預設的送信帳號："
 
-#: kmkernel.cpp:1543
+#: kmkernel.cpp:1547
 #, kde-format
 msgid "This identity has been changed to use the modified transport:"
 msgid_plural ""
 "These %1 identities have been changed to use the modified transport:"
 msgstr[0] "以下 %1 個身份使用的送信帳號已被變更："
 
-#: kmkernel.cpp:1558
+#: kmkernel.cpp:1562
 #, kde-format
 msgid "Sending messages"
 msgstr "送出信件中"
 
-#: kmkernel.cpp:1559
+#: kmkernel.cpp:1563
 #, kde-format
 msgid "Initiating sending process..."
 msgstr "正在起始寄件程序..."
 
-#: kmkernel.cpp:1629
-#, kde-format
-msgid "Resource %1 is broken."
+#: kmkernel.cpp:1633
+#, fuzzy, kde-format
+#| msgid "Resource %1 is broken."
+msgid ""
+"Resource %1 is broken.\n"
+"%2"
 msgstr "資源 %1 已損毀。"
 
-#: kmkernel.cpp:1800 kmkernel.cpp:1811
+#: kmkernel.cpp:1814 kmkernel.cpp:1825
 #, kde-format
 msgctxt "<source>: <error message>"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kmlaunchexternalcomponent.cpp:54
+#: kmlaunchexternalcomponent.cpp:52
 #, kde-format
 msgid "Archive Mail Agent was not registered."
-msgstr "郵件歸檔代理程式未註冊。"
+msgstr "郵件封存代理程式未註冊。"
 
-#: kmlaunchexternalcomponent.cpp:64
+#: kmlaunchexternalcomponent.cpp:62
 #, kde-format
 msgid "Send Later Agent was not registered."
 msgstr "稍後傳送代理程式未註冊。"
 
-#: kmlaunchexternalcomponent.cpp:74
+#: kmlaunchexternalcomponent.cpp:72
 #, kde-format
 msgid "Followup Reminder Agent was not registered."
 msgstr "回覆提醒代理程式未註冊。"
 
-#: kmlaunchexternalcomponent.cpp:81
+#: kmlaunchexternalcomponent.cpp:79
 #, fuzzy, kde-format
 #| msgid "Could not start certificate manager; please check your installation."
 msgid ""
@@ -3767,12 +3784,12 @@
 "properly installed."
 msgstr "無法啟動憑證管理員。請檢查安裝是否完全！"
 
-#: kmlaunchexternalcomponent.cpp:83
+#: kmlaunchexternalcomponent.cpp:81
 #, kde-format
 msgid "KMail Error"
 msgstr "KMail 錯誤"
 
-#: kmlaunchexternalcomponent.cpp:91
+#: kmlaunchexternalcomponent.cpp:89
 #, fuzzy, kde-format
 #| msgid "Could not start the import wizard. Please check your installation."
 msgid ""
@@ -3780,24 +3797,28 @@
 "properly installed."
 msgstr "無法啟動匯入精靈。請檢查安裝是否完全！"
 
-#: kmlaunchexternalcomponent.cpp:93 kmmainwidget.cpp:317
+#: kmlaunchexternalcomponent.cpp:91 kmmainwidget.cpp:321
 #, kde-format
 msgid "Unable to start import wizard"
 msgstr "無法啟動匯入精靈"
 
-#: kmlaunchexternalcomponent.cpp:101
-#, kde-format
+#: kmlaunchexternalcomponent.cpp:99
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not start \"PIM Setting Exporter\" program. Please check your "
+#| "installation."
 msgid ""
-"Could not start \"PIM Setting Exporter\" program. Please check your "
+"Could not start \"PIM Data Exporter\" program. Please check your "
 "installation."
 msgstr "無法啟動 PIM 設定匯出器。請檢查安裝是否完整。"
 
-#: kmlaunchexternalcomponent.cpp:103
-#, kde-format
-msgid "Unable to start \"PIM Setting Exporter\" program"
+#: kmlaunchexternalcomponent.cpp:101
+#, fuzzy, kde-format
+#| msgid "Unable to start \"PIM Setting Exporter\" program"
+msgid "Unable to start \"PIM Data Exporter\" program"
 msgstr "無法啟動 PIM 設定匯出器"
 
-#: kmlaunchexternalcomponent.cpp:117
+#: kmlaunchexternalcomponent.cpp:115
 #, fuzzy, kde-format
 #| msgid "Could not start the ImportWizard. Please check your installation."
 msgid ""
@@ -3805,94 +3826,94 @@
 "properly installed."
 msgstr "無法啟動匯入精靈。請檢查安裝是否完整。"
 
-#: kmlaunchexternalcomponent.cpp:119
+#: kmlaunchexternalcomponent.cpp:117
 #, kde-format
 msgid "Unable to start ImportWizard"
 msgstr "無法啟動匯入精靈"
 
-#: kmmainwidget.cpp:312
+#: kmmainwidget.cpp:316
 #, kde-format
 msgid "Another mailer was found on system. Do you want to import data from it?"
 msgstr "在系統中找到另一個郵件程式。您要匯入它的資料嗎？"
 
-#: kmmainwidget.cpp:315
+#: kmmainwidget.cpp:319
 #, kde-format
 msgid "Could not start the import wizard. Please check your installation."
 msgstr "無法啟動匯入精靈。請檢查安裝是否完全！"
 
-#: kmmainwidget.cpp:1370
+#: kmmainwidget.cpp:1384
 #, kde-format
 msgid "No Subject"
 msgstr "沒有主題"
 
-#: kmmainwidget.cpp:1384
+#: kmmainwidget.cpp:1398
 #, kde-format
 msgid "(no templates)"
 msgstr "（沒有樣本）"
 
-#: kmmainwidget.cpp:1436
+#: kmmainwidget.cpp:1450
 #, kde-format
 msgid "This folder does not have any expiry options set"
 msgstr "這個資料夾沒有設定任何的過期選項"
 
-#: kmmainwidget.cpp:1445
+#: kmmainwidget.cpp:1456
 #, kde-format
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>您確定要將資料夾 <b>%1</b> 設為過期嗎？</qt>"
 
-#: kmmainwidget.cpp:1447
+#: kmmainwidget.cpp:1458
 #, kde-format
 msgid "Expire Folder"
 msgstr "將資料夾設為過期"
 
-#: kmmainwidget.cpp:1448
+#: kmmainwidget.cpp:1459
 #, kde-format
 msgid "&Expire"
 msgstr "設為過期(&E)"
 
-#: kmmainwidget.cpp:1470
+#: kmmainwidget.cpp:1476
 #, kde-format
 msgid "Empty Trash"
 msgstr "清空垃圾桶"
 
-#: kmmainwidget.cpp:1470 util.cpp:187
+#: kmmainwidget.cpp:1476 util.cpp:187
 #, kde-format
 msgid "Move to Trash"
 msgstr "搬到垃圾桶"
 
-#: kmmainwidget.cpp:1472
+#: kmmainwidget.cpp:1478
 #, kde-format
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "你確定要清空垃圾桶嗎？"
 
-#: kmmainwidget.cpp:1473
+#: kmmainwidget.cpp:1479
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
 "trash?</qt>"
 msgstr "<qt>您確定要將 <b>%1</b> 中的信件都搬到垃圾桶嗎？</qt>"
 
-#: kmmainwidget.cpp:1497
+#: kmmainwidget.cpp:1504
 #, kde-format
 msgid "Moved all messages to the trash"
 msgstr "將所有信件移入垃圾桶"
 
-#: kmmainwidget.cpp:1552
+#: kmmainwidget.cpp:1559
 #, kde-format
 msgid "Are you sure you want to expire all old messages?"
 msgstr "你確定要將所有舊信件設為過期信件？"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire Old Messages?"
 msgstr "將舊信件設為過期信件？"
 
-#: kmmainwidget.cpp:1553
+#: kmmainwidget.cpp:1560
 #, kde-format
 msgid "Expire"
 msgstr "設定過期"
 
-#: kmmainwidget.cpp:1578
+#: kmmainwidget.cpp:1585
 #, kde-format
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -3902,17 +3923,17 @@
 "在 HTML 信件中下載遠端的連結會使您更容易受到垃圾信的攻擊，並且有可能會增加您"
 "的系統被其他已存在和將來的安全漏洞危害的機會。"
 
-#: kmmainwidget.cpp:1581 kmmainwidget.cpp:4674
+#: kmmainwidget.cpp:1588 kmmainwidget.cpp:4706
 #, kde-format
 msgid "Security Warning"
 msgstr "安全性警告"
 
-#: kmmainwidget.cpp:1582
+#: kmmainwidget.cpp:1589
 #, kde-format
 msgid "Load External References"
 msgstr "從遠端下載連結"
 
-#: kmmainwidget.cpp:1654
+#: kmmainwidget.cpp:1661
 #, kde-format
 msgid ""
 "<qt>Do you really want to delete the selected message?<br />Once deleted, it "
@@ -3922,758 +3943,764 @@
 "deleted, they cannot be restored.</qt>"
 msgstr[0] "<qt>您確定要刪除這 %1 封信件嗎？<br /> 刪除後就無法回復了。</qt>"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Messages"
 msgstr "刪除信件"
 
-#: kmmainwidget.cpp:1660
+#: kmmainwidget.cpp:1667
 #, kde-format
 msgid "Delete Message"
 msgstr "刪除信件"
 
-#: kmmainwidget.cpp:1679
+#: kmmainwidget.cpp:1686
 #, kde-format
 msgid "Moving messages..."
 msgstr "移動信件中..."
 
-#: kmmainwidget.cpp:1681 kmmainwidget.cpp:1872
+#: kmmainwidget.cpp:1688 kmmainwidget.cpp:1879
 #, kde-format
 msgid "Deleting messages..."
 msgstr "刪除信件中..."
 
-#: kmmainwidget.cpp:1696 kmmainwidget.cpp:1892
+#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1899
 #, kde-format
 msgid "Messages deleted successfully."
 msgstr "信件已刪除。"
 
-#: kmmainwidget.cpp:1698
+#: kmmainwidget.cpp:1705
 #, kde-format
 msgid "Messages moved successfully."
 msgstr "信件已搬運完成。"
 
-#: kmmainwidget.cpp:1703 kmmainwidget.cpp:1905
+#: kmmainwidget.cpp:1710 kmmainwidget.cpp:1912
 #, kde-format
 msgid "Deleting messages failed."
 msgstr "刪除信件失敗。"
 
-#: kmmainwidget.cpp:1705 kmmainwidget.cpp:1918
+#: kmmainwidget.cpp:1712 kmmainwidget.cpp:1925
 #, kde-format
 msgid "Deleting messages canceled."
 msgstr "取消刪除信件。"
 
-#: kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:1716
 #, kde-format
 msgid "Moving messages failed."
 msgstr "搬移信件失敗。"
 
-#: kmmainwidget.cpp:1711
+#: kmmainwidget.cpp:1718
 #, kde-format
 msgid "Moving messages canceled."
 msgstr "取消搬移信件。"
 
-#: kmmainwidget.cpp:1777
+#: kmmainwidget.cpp:1784
 #, kde-format
 msgid "Move Messages to Folder"
 msgstr "搬吧"
 
-#: kmmainwidget.cpp:1807
+#: kmmainwidget.cpp:1814
 #, kde-format
 msgid "Copying messages..."
 msgstr "複製信件中..."
 
-#: kmmainwidget.cpp:1815
+#: kmmainwidget.cpp:1822
 #, kde-format
 msgid "Messages copied successfully."
 msgstr "信件已複製完成。"
 
-#: kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:1825
 #, kde-format
 msgid "Copying messages failed."
 msgstr "複製信件失敗。"
 
-#: kmmainwidget.cpp:1820
+#: kmmainwidget.cpp:1827
 #, kde-format
 msgid "Copying messages canceled."
 msgstr "取消複製信件。"
 
-#: kmmainwidget.cpp:1830
+#: kmmainwidget.cpp:1837
 #, kde-format
 msgid "Copy Messages to Folder"
 msgstr "複製信件到資料夾"
 
-#: kmmainwidget.cpp:1869
+#: kmmainwidget.cpp:1876
 #, kde-format
 msgid "Moving messages to trash..."
 msgstr "將信件移入垃圾桶..."
 
-#: kmmainwidget.cpp:1876
+#: kmmainwidget.cpp:1883
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash..."
 msgid "Deleting and moving messages to trash..."
 msgstr "將信件移入垃圾桶..."
 
-#: kmmainwidget.cpp:1889
+#: kmmainwidget.cpp:1896
 #, kde-format
 msgid "Messages moved to trash successfully."
 msgstr "信件已移至垃圾桶。"
 
-#: kmmainwidget.cpp:1896
+#: kmmainwidget.cpp:1903
 #, fuzzy, kde-format
 #| msgid "Messages moved to trash successfully."
 msgid "Messages moved to trash or deleted successfully"
 msgstr "信件已移至垃圾桶。"
 
-#: kmmainwidget.cpp:1902
+#: kmmainwidget.cpp:1909
 #, kde-format
 msgid "Moving messages to trash failed."
 msgstr "將信件移至垃圾桶失敗。"
 
-#: kmmainwidget.cpp:1909
+#: kmmainwidget.cpp:1916
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash failed."
 msgid "Deleting or moving messages to trash failed."
 msgstr "將信件移至垃圾桶失敗。"
 
-#: kmmainwidget.cpp:1915
+#: kmmainwidget.cpp:1922
 #, kde-format
 msgid "Moving messages to trash canceled."
 msgstr "將信件移至垃圾桶動作取消。"
 
-#: kmmainwidget.cpp:1922
+#: kmmainwidget.cpp:1929
 #, fuzzy, kde-format
 #| msgid "Moving messages to trash canceled."
 msgid "Deleting or moving messages to trash canceled."
 msgstr "將信件移至垃圾桶動作取消。"
 
-#: kmmainwidget.cpp:2194
+#: kmmainwidget.cpp:2201
 #, kde-format
 msgid "Jump to Folder"
 msgstr "跳至資料夾"
 
-#: kmmainwidget.cpp:2841
+#: kmmainwidget.cpp:2848
 #, kde-format
 msgid "Save &As..."
 msgstr "另存新檔(&A)..."
 
-#: kmmainwidget.cpp:2855
+#: kmmainwidget.cpp:2862
 #, kde-format
 msgid "&Expire All Folders"
 msgstr "將所有的資料夾內的信件設為過期信件(&E)"
 
-#: kmmainwidget.cpp:2860
+#: kmmainwidget.cpp:2867
 #, kde-format
 msgid "Check &Mail"
 msgstr "檢查信件(&M)"
 
-#: kmmainwidget.cpp:2868
+#: kmmainwidget.cpp:2875
 #, kde-format
 msgid "Check Mail In"
 msgstr "檢查信件於"
 
-#: kmmainwidget.cpp:2870 kmmainwidget.cpp:2871
+#: kmmainwidget.cpp:2877 kmmainwidget.cpp:2878
 #, kde-format
 msgid "Check Mail"
 msgstr "檢查信件"
 
-#: kmmainwidget.cpp:2875
+#: kmmainwidget.cpp:2882
 #, kde-format
 msgid "&Send Queued Messages"
 msgstr "傳送佇列中的信件(&S)"
 
-#: kmmainwidget.cpp:2883
+#: kmmainwidget.cpp:2890
 #, kde-format
 msgid "Online status (unknown)"
 msgstr "線上狀態（未知）"
 
-#: kmmainwidget.cpp:2888
+#: kmmainwidget.cpp:2895
 #, kde-format
 msgid "Send Queued Messages Via"
 msgstr "傳送佇列中的信件，使用"
 
-#: kmmainwidget.cpp:2904
+#: kmmainwidget.cpp:2911
 #, kde-format
 msgid "Certificate Manager"
 msgstr "憑證管理員"
 
-#: kmmainwidget.cpp:2914
+#: kmmainwidget.cpp:2921
 #, kde-format
 msgid "&Import Messages..."
 msgstr "匯入信件(&I)"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2931
 #, kde-format
 msgid "&Debug Sieve..."
 msgstr "除錯過濾器(&D)..."
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2938
 #, kde-format
 msgid "Filter &Log Viewer..."
 msgstr "過濾紀錄檢視器(&L)..."
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2943
 #, kde-format
 msgid "&Import from another Email Client..."
 msgstr ""
 
-#: kmmainwidget.cpp:2941
+#: kmmainwidget.cpp:2948
 #, kde-format
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "編輯自動回覆..."
 
-#: kmmainwidget.cpp:2947
+#: kmmainwidget.cpp:2954
 #, kde-format
 msgid "&Configure Automatic Archiving..."
-msgstr "設定自動歸檔(&C)..."
+msgstr "設定自動封存(&C)..."
 
-#: kmmainwidget.cpp:2953
+#: kmmainwidget.cpp:2960
 #, kde-format
 msgid "Delayed Messages..."
 msgstr "已延遲信件..."
 
-#: kmmainwidget.cpp:2959
+#: kmmainwidget.cpp:2966
 #, kde-format
 msgid "Followup Reminder Messages..."
 msgstr "回覆提醒信件..."
 
-#: kmmainwidget.cpp:2970 util.cpp:184
+#: kmmainwidget.cpp:2977 util.cpp:184
 #, kde-format
 msgctxt "@action Hard delete, bypassing trash"
 msgid "&Delete"
 msgstr "刪除(&D)"
 
-#: kmmainwidget.cpp:2975 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4051
 #, kde-format
 msgid "M&ove Thread to Trash"
 msgstr "將整個串列移至垃圾桶(&O)"
 
-#: kmmainwidget.cpp:2979
+#: kmmainwidget.cpp:2986
 #, kde-format
 msgid "Move thread to trashcan"
 msgstr "將整個串列移入垃圾桶"
 
-#: kmmainwidget.cpp:2982 kmmainwidget.cpp:4042
+#: kmmainwidget.cpp:2989 kmmainwidget.cpp:4051
 #, kde-format
 msgid "Delete T&hread"
 msgstr "刪除整個串列(&H)"
 
-#: kmmainwidget.cpp:2988 kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:2995 kmmainwidget.cpp:4053
 #, kde-format
 msgid "&Find Messages..."
 msgstr "尋找信件(&F)..."
 
-#: kmmainwidget.cpp:2993
+#: kmmainwidget.cpp:3000
 #, kde-format
 msgid "Select &All Messages"
 msgstr "選取所有信件(&A)"
 
-#: kmmainwidget.cpp:3000
+#: kmmainwidget.cpp:3007
 #, kde-format
 msgid "&Mailing List Management..."
 msgstr "郵件論壇管理員(&M)"
 
-#: kmmainwidget.cpp:3005
+#: kmmainwidget.cpp:3012
 #, kde-format
 msgid "&Assign Shortcut..."
 msgstr "設定捷徑(&A)..."
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3028
 #, kde-format
 msgid "&Expiration Settings"
 msgstr "過期設定(&E)"
 
-#: kmmainwidget.cpp:3037
+#: kmmainwidget.cpp:3044
 #, kde-format
 msgid "&Archive Folder..."
-msgstr "歸檔資料夾(&A)..."
+msgstr "封存資料夾(&A)..."
 
-#: kmmainwidget.cpp:3045
+#: kmmainwidget.cpp:3052
 #, kde-format
 msgid "Load E&xternal References"
 msgstr "載入遠端連結(&X)"
 
-#: kmmainwidget.cpp:3068 kmreadermainwin.cpp:439
+#: kmmainwidget.cpp:3075 kmreadermainwin.cpp:519
 #, kde-format
 msgid "Copy Message To..."
 msgstr "複製信件到..."
 
-#: kmmainwidget.cpp:3070 kmreadermainwin.cpp:452
+#: kmmainwidget.cpp:3077 kmreadermainwin.cpp:532
 #, kde-format
 msgid "Move Message To..."
 msgstr "移動信件到..."
 
-#: kmmainwidget.cpp:3075
+#: kmmainwidget.cpp:3082
 #, kde-format
 msgid "&New Message..."
 msgstr "新信件(&N)..."
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3084
 #, kde-format
 msgctxt "@action:intoolbar New Empty Message"
 msgid "New"
 msgstr "新增"
 
-#: kmmainwidget.cpp:3085
+#: kmmainwidget.cpp:3092
 #, kde-format
 msgid "Message From &Template"
 msgstr "從樣板產生信件(&T)"
 
-#: kmmainwidget.cpp:3095
+#: kmmainwidget.cpp:3102
 #, kde-format
 msgid "New Message t&o Mailing-List..."
 msgstr "張貼到信件論壇(&O)..."
 
-#: kmmainwidget.cpp:3103
+#: kmmainwidget.cpp:3110
 #, kde-format
 msgid "&Create Filter"
 msgstr "建立過濾器(&C)"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3115
 #, kde-format
 msgid "Filter on &Subject..."
 msgstr "過濾信件主題(&S)..."
 
-#: kmmainwidget.cpp:3115
+#: kmmainwidget.cpp:3122
 #, kde-format
 msgid "Filter on &From..."
 msgstr "過濾信件來源(&F)..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3128
 #, kde-format
 msgid "Filter on &To..."
 msgstr "過濾信件收件者(&T)..."
 
-#: kmmainwidget.cpp:3127
+#: kmmainwidget.cpp:3134
 #, kde-format
 msgid "Filter on &Cc..."
 msgstr "過濾信件副本(&C)..."
 
-#: kmmainwidget.cpp:3135
+#: kmmainwidget.cpp:3142
 #, kde-format
 msgid "Mark &Thread"
 msgstr "標記討論串(&T)"
 
-#: kmmainwidget.cpp:3138
+#: kmmainwidget.cpp:3145
 #, kde-format
 msgid "Mark Thread as &Read"
 msgstr "標記目前討論串為已讀(&R)"
 
-#: kmmainwidget.cpp:3141
+#: kmmainwidget.cpp:3148
 #, kde-format
 msgid "Mark all messages in the selected thread as read"
 msgstr "標記選擇的串列內所有信件為已讀"
 
-#: kmmainwidget.cpp:3144
+#: kmmainwidget.cpp:3151
 #, kde-format
 msgid "Mark Thread as &Unread"
 msgstr "標記目前討論串為未讀取(&U)"
 
-#: kmmainwidget.cpp:3147
+#: kmmainwidget.cpp:3154
 #, kde-format
 msgid "Mark all messages in the selected thread as unread"
 msgstr "標記選擇的討論串內所有信件為未讀"
 
-#: kmmainwidget.cpp:3153
+#: kmmainwidget.cpp:3160
 #, kde-format
 msgid "Mark Thread as &Important"
 msgstr "標記討論串為重要(&I)"
 
-#: kmmainwidget.cpp:3156
+#: kmmainwidget.cpp:3163
 #, kde-format
 msgid "Remove &Important Thread Mark"
 msgstr "移除重要討論串標記(&I)"
 
-#: kmmainwidget.cpp:3159
+#: kmmainwidget.cpp:3166
 #, kde-format
 msgid "Mark Thread as &Action Item"
 msgstr "標記目前討論串為動作項目(&A)"
 
-#: kmmainwidget.cpp:3162
+#: kmmainwidget.cpp:3169
 #, kde-format
 msgid "Remove &Action Item Thread Mark"
 msgstr "移除動作項目信件串列標記(&A)"
 
-#: kmmainwidget.cpp:3166
+#: kmmainwidget.cpp:3173
 #, kde-format
 msgid "&Watch Thread"
 msgstr "標記討論串為監測中(&W)"
 
-#: kmmainwidget.cpp:3170
+#: kmmainwidget.cpp:3177
 #, kde-format
 msgid "&Ignore Thread"
 msgstr "標記討論串為忽略(&I)"
 
-#: kmmainwidget.cpp:3178 kmreadermainwin.cpp:396
+#: kmmainwidget.cpp:3185 kmreadermainwin.cpp:452
 #, kde-format
 msgid "Save A&ttachments..."
 msgstr "儲存附件(&T)..."
 
-#: kmmainwidget.cpp:3186
+#: kmmainwidget.cpp:3193
 #, fuzzy, kde-format
 #| msgid "Copy Item To..."
 msgid "Copy Decrypted To..."
 msgstr "複製項目到..."
 
-#: kmmainwidget.cpp:3192
+#: kmmainwidget.cpp:3199
 #, kde-format
 msgid "Appl&y All Filters"
 msgstr "套用所有的過濾器(&Y)"
 
-#: kmmainwidget.cpp:3202
+#: kmmainwidget.cpp:3209
 #, kde-format
 msgctxt "View->"
 msgid "&Expand Thread / Group"
 msgstr "展開討論串/群組(&E)"
 
-#: kmmainwidget.cpp:3205
+#: kmmainwidget.cpp:3212
 #, kde-format
 msgid "Expand the current thread or group"
 msgstr "展開目前的討論串或群組"
 
-#: kmmainwidget.cpp:3209
+#: kmmainwidget.cpp:3216
 #, kde-format
 msgctxt "View->"
 msgid "&Collapse Thread / Group"
 msgstr "收起討論串/群組(&C)"
 
-#: kmmainwidget.cpp:3212
+#: kmmainwidget.cpp:3219
 #, kde-format
 msgid "Collapse the current thread or group"
 msgstr "收起目前討論串或群組"
 
-#: kmmainwidget.cpp:3216
+#: kmmainwidget.cpp:3223
 #, kde-format
 msgctxt "View->"
 msgid "Ex&pand All Threads"
 msgstr "展開所有討論串(&P)"
 
-#: kmmainwidget.cpp:3219
+#: kmmainwidget.cpp:3226
 #, kde-format
 msgid "Expand all threads in the current folder"
 msgstr "展開目前資料夾內的所有討論串"
 
-#: kmmainwidget.cpp:3223
+#: kmmainwidget.cpp:3230
 #, kde-format
 msgctxt "View->"
 msgid "C&ollapse All Threads"
 msgstr "收起所有討論串(&O)"
 
-#: kmmainwidget.cpp:3226
+#: kmmainwidget.cpp:3233
 #, kde-format
 msgid "Collapse all threads in the current folder"
 msgstr "收起目前資料夾內的所有討論串"
 
-#: kmmainwidget.cpp:3230
+#: kmmainwidget.cpp:3237
 #, kde-format
 msgid "&Display Message"
 msgstr "顯示信件(&D)"
 
-#: kmmainwidget.cpp:3240
+#: kmmainwidget.cpp:3247
 #, kde-format
 msgid "&Next Message"
 msgstr "下一封信件(&N)"
 
-#: kmmainwidget.cpp:3246
+#: kmmainwidget.cpp:3253
 #, kde-format
 msgid "Go to the next message"
 msgstr "到下一封信件"
 
-#: kmmainwidget.cpp:3250
+#: kmmainwidget.cpp:3257
 #, kde-format
 msgid "Next &Unread Message"
 msgstr "下一封未讀信件(&U)"
 
-#: kmmainwidget.cpp:3261
+#: kmmainwidget.cpp:3268
 #, kde-format
 msgctxt "@action:inmenu Goto next unread message"
 msgid "Next"
 msgstr "下一個"
 
-#: kmmainwidget.cpp:3262
+#: kmmainwidget.cpp:3269
 #, kde-format
 msgid "Go to the next unread message"
 msgstr "到下一封未讀信件"
 
-#: kmmainwidget.cpp:3266
+#: kmmainwidget.cpp:3273
 #, kde-format
 msgid "&Previous Message"
 msgstr "上一封信件(&P)"
 
-#: kmmainwidget.cpp:3268
+#: kmmainwidget.cpp:3275
 #, kde-format
 msgid "Go to the previous message"
 msgstr "到上一封信件"
 
-#: kmmainwidget.cpp:3276
+#: kmmainwidget.cpp:3283
 #, kde-format
 msgid "Previous Unread &Message"
 msgstr "上一封未讀信件(&M)"
 
-#: kmmainwidget.cpp:3287
+#: kmmainwidget.cpp:3294
 #, kde-format
 msgctxt "@action:inmenu Goto previous unread message."
 msgid "Previous"
 msgstr "上一個"
 
-#: kmmainwidget.cpp:3288
+#: kmmainwidget.cpp:3295
 #, kde-format
 msgid "Go to the previous unread message"
 msgstr "到上一封未讀信件"
 
-#: kmmainwidget.cpp:3292
+#: kmmainwidget.cpp:3299
 #, kde-format
 msgid "Next Unread &Folder"
 msgstr "下一個有未讀信件的資料夾(&F)"
 
-#: kmmainwidget.cpp:3299
+#: kmmainwidget.cpp:3306
 #, kde-format
 msgid "Go to the next folder with unread messages"
 msgstr "到下一個有未讀信件的資料夾"
 
-#: kmmainwidget.cpp:3302
+#: kmmainwidget.cpp:3309
 #, kde-format
 msgid "Previous Unread F&older"
 msgstr "上一個有未讀信件的資料夾(&O)"
 
-#: kmmainwidget.cpp:3308
+#: kmmainwidget.cpp:3315
 #, kde-format
 msgid "Go to the previous folder with unread messages"
 msgstr "到上一個有未讀信件的資料夾"
 
-#: kmmainwidget.cpp:3312
+#: kmmainwidget.cpp:3319
 #, kde-format
 msgctxt "Go->"
 msgid "Next Unread &Text"
 msgstr "下一個未讀文字(&T)"
 
-#: kmmainwidget.cpp:3315
+#: kmmainwidget.cpp:3322
 #, kde-format
 msgid "Go to the next unread text"
 msgstr "到下一個未讀的文字"
 
-#: kmmainwidget.cpp:3316
+#: kmmainwidget.cpp:3323
 #, kde-format
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr "將目前信件往下捲，若到了底部，則跳到下一封未讀信件。"
 
-#: kmmainwidget.cpp:3324
+#: kmmainwidget.cpp:3331
 #, kde-format
 msgid "Configure &Filters..."
 msgstr "設定過濾器(&F)..."
 
-#: kmmainwidget.cpp:3330
+#: kmmainwidget.cpp:3337
 #, kde-format
 msgid "Manage &Sieve Scripts..."
 msgstr "管理可用的過濾器..."
 
-#: kmmainwidget.cpp:3335
+#: kmmainwidget.cpp:3342
 #, fuzzy, kde-format
 #| msgid "Add Account"
 msgid "&Add Account..."
 msgstr "新增帳號"
 
-#: kmmainwidget.cpp:3340
+#: kmmainwidget.cpp:3347
 #, kde-format
 msgid "KMail &Introduction"
 msgstr "KMail 介紹(&I)"
 
-#: kmmainwidget.cpp:3342
+#: kmmainwidget.cpp:3349
 #, kde-format
 msgid "Display KMail's Welcome Page"
 msgstr "顯示 KMail 歡迎頁"
 
-#: kmmainwidget.cpp:3350
+#: kmmainwidget.cpp:3357
 #, kde-format
 msgid "Configure &Notifications..."
 msgstr "設定通知(&N)..."
 
-#: kmmainwidget.cpp:3357
+#: kmmainwidget.cpp:3364
 #, kde-format
 msgid "&Configure KMail..."
 msgstr "設定 KMail (&C)..."
 
-#: kmmainwidget.cpp:3364
+#: kmmainwidget.cpp:3371
 #, kde-format
 msgid "Expire..."
 msgstr "設定過期"
 
-#: kmmainwidget.cpp:3370
+#: kmmainwidget.cpp:3377
 #, kde-format
 msgid "Add Favorite Folder..."
 msgstr "新增我的最愛資料夾..."
 
-#: kmmainwidget.cpp:3376
+#: kmmainwidget.cpp:3383
 #, kde-format
 msgid "Serverside Subscription..."
 msgstr "伺服器端訂閱..."
 
-#: kmmainwidget.cpp:3382 kmmainwidget.cpp:3391
+#: kmmainwidget.cpp:3389 kmmainwidget.cpp:3398
 #, fuzzy, kde-format
 #| msgid "Appl&y All Filters"
 msgid "Apply All Filters"
 msgstr "套用所有的過濾器(&Y)"
 
-#: kmmainwidget.cpp:3410
+#: kmmainwidget.cpp:3417
 #, fuzzy, kde-format
 #| msgid "&Export KMail Data..."
 msgid "Import/Export KMail Data..."
 msgstr "匯出 KMail 資料(&E)..."
 
-#: kmmainwidget.cpp:3416
+#: kmmainwidget.cpp:3423
 #, kde-format
 msgid "New AddressBook Contact..."
 msgstr "新增通訊錄聯絡人..."
 
-#: kmmainwidget.cpp:3438
+#: kmmainwidget.cpp:3445
 #, kde-format
 msgid "Copy Message to Folder"
 msgstr "複製信件到資料夾"
 
-#: kmmainwidget.cpp:3445
+#: kmmainwidget.cpp:3452
 #, kde-format
 msgid "Jump to Folder..."
 msgstr "跳至資料夾..."
 
-#: kmmainwidget.cpp:3452
+#: kmmainwidget.cpp:3459
 #, kde-format
 msgid "Abort Current Operation"
 msgstr "取消目前的動作"
 
-#: kmmainwidget.cpp:3459
+#: kmmainwidget.cpp:3466
 #, kde-format
 msgid "Focus on Next Folder"
 msgstr "將輸入焦點設在下一個資料夾"
 
-#: kmmainwidget.cpp:3466
+#: kmmainwidget.cpp:3473
 #, kde-format
 msgid "Focus on Previous Folder"
 msgstr "將輸入焦點設在上一個資料夾"
 
-#: kmmainwidget.cpp:3473
+#: kmmainwidget.cpp:3480
 #, kde-format
 msgid "Select Folder with Focus"
 msgstr "選取資料夾時取得焦點"
 
-#: kmmainwidget.cpp:3481
+#: kmmainwidget.cpp:3488
 #, kde-format
 msgid "Focus on First Folder"
 msgstr "將輸入焦點設在第一個資料夾"
 
-#: kmmainwidget.cpp:3488
+#: kmmainwidget.cpp:3495
 #, kde-format
 msgid "Focus on Last Folder"
 msgstr "將輸入焦點設在最後一個資料夾"
 
-#: kmmainwidget.cpp:3495
+#: kmmainwidget.cpp:3502
 #, kde-format
 msgid "Focus on Next Message"
 msgstr "將輸入焦點設在下一封信件"
 
-#: kmmainwidget.cpp:3502
+#: kmmainwidget.cpp:3509
 #, kde-format
 msgid "Focus on Previous Message"
 msgstr "將輸入焦點設在上一封信件"
 
-#: kmmainwidget.cpp:3509
+#: kmmainwidget.cpp:3516
 #, kde-format
 msgid "Select First Message"
 msgstr "選取第一封信件"
 
-#: kmmainwidget.cpp:3516
+#: kmmainwidget.cpp:3523
 #, kde-format
 msgid "Select Last Message"
 msgstr "選取最後一封信件"
 
-#: kmmainwidget.cpp:3523
+#: kmmainwidget.cpp:3530
 #, kde-format
 msgid "Select Message with Focus"
 msgstr "選取信件時取得焦點"
 
-#: kmmainwidget.cpp:3531
+#: kmmainwidget.cpp:3538
 #, kde-format
 msgid "Set Focus to Quick Search"
 msgstr "設定焦點到快速搜尋"
 
-#: kmmainwidget.cpp:3540
+#: kmmainwidget.cpp:3547
 #, kde-format
 msgid "Extend Selection to Previous Message"
 msgstr "將選取延伸到上一封信件"
 
-#: kmmainwidget.cpp:3547
+#: kmmainwidget.cpp:3554
 #, kde-format
 msgid "Extend Selection to Next Message"
 msgstr "將選取延伸到下一封信件"
 
-#: kmmainwidget.cpp:3555
+#: kmmainwidget.cpp:3562
 #, kde-format
 msgid "Move Message to Folder"
 msgstr "移動信件到資料夾"
 
-#: kmmainwidget.cpp:3566
+#: kmmainwidget.cpp:3573
 #, fuzzy, kde-format
 #| msgid "Low Bandwidth"
 msgid "Use Less Bandwidth"
 msgstr "低頻寬"
 
-#: kmmainwidget.cpp:3570
+#: kmmainwidget.cpp:3577
 #, kde-format
 msgid "Mark All Messages As Read in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3575
+#: kmmainwidget.cpp:3582
 #, kde-format
 msgid "Remove Duplicates in This Folder and All its Subfolder"
 msgstr ""
 
-#: kmmainwidget.cpp:3579
+#: kmmainwidget.cpp:3586
 #, fuzzy, kde-format
 #| msgid "&Settings"
 msgid "Account &Settings"
 msgstr "設定(&S)"
 
 #: kmmainwidget.cpp:3590
+#, fuzzy, kde-format
+#| msgid "Customize accounts order..."
+msgid "Restart Account"
+msgstr "自訂帳號順序..."
+
+#: kmmainwidget.cpp:3601
 #, kde-format
 msgid "Add Favorite Folder"
 msgstr "新增我的最愛資料夾"
 
-#: kmmainwidget.cpp:3934
+#: kmmainwidget.cpp:3943
 #, kde-format
 msgid "E&mpty Trash"
 msgstr "清空垃圾桶(&M)"
 
-#: kmmainwidget.cpp:3935
+#: kmmainwidget.cpp:3944
 #, kde-format
 msgid "&Move All Messages to Trash"
 msgstr "將所有信件移入垃圾桶(&M)"
 
-#: kmmainwidget.cpp:4032
+#: kmmainwidget.cpp:4041
 #, kde-format
 msgid "&Delete Search"
 msgstr "刪除搜尋結果(&D)"
 
-#: kmmainwidget.cpp:4044
+#: kmmainwidget.cpp:4053
 #, kde-format
 msgid "Edit Search..."
 msgstr "編輯搜尋字串..."
 
-#: kmmainwidget.cpp:4154
+#: kmmainwidget.cpp:4165
 #, kde-format
 msgid "&Undo"
 msgstr "復原(&U)"
 
-#: kmmainwidget.cpp:4156
+#: kmmainwidget.cpp:4167
 #, kde-format
 msgid "&Undo: \"%1\""
 msgstr "復原(&U)：\"%1\""
 
-#: kmmainwidget.cpp:4208
+#: kmmainwidget.cpp:4224
 #, kde-format
 msgid "Filter %1"
 msgstr "過濾 %1"
 
-#: kmmainwidget.cpp:4663
+#: kmmainwidget.cpp:4695
 #, fuzzy, kde-format
 #| msgctxt "Show shortcut for focus quick search. Don't change it"
 #| msgid "Search...<%1>"
@@ -4681,7 +4708,7 @@
 msgid "Search... <%1>"
 msgstr "搜尋...<%1>"
 
-#: kmmainwidget.cpp:4671
+#: kmmainwidget.cpp:4703
 #, kde-format
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may "
@@ -4691,12 +4718,12 @@
 "在信件中使用 HTML 將會使您更容易受到垃圾信的攻擊，並且有可能會增加您的系統被"
 "其他已存在和將來的安全漏洞危害的機會。"
 
-#: kmmainwidget.cpp:4675
+#: kmmainwidget.cpp:4707
 #, kde-format
 msgid "Use HTML"
 msgstr "使用 HTML"
 
-#: kmmainwidget.cpp:4860
+#: kmmainwidget.cpp:4892
 #, kde-format
 msgid ""
 "You have more than one email account set up.\n"
@@ -4706,186 +4733,186 @@
 "disable the feature completely in KMail's Plugin settings."
 msgstr ""
 
-#: kmmainwidget.cpp:4863
+#: kmmainwidget.cpp:4895
 #, kde-format
 msgid "Enable Unified Mailboxes?"
 msgstr ""
 
-#: kmmainwidget.cpp:4864
+#: kmmainwidget.cpp:4896
 #, kde-format
 msgid "Enable Unified Mailboxes"
 msgstr ""
 
-#: kmmainwidget.cpp:4865
+#: kmmainwidget.cpp:4897
 #, kde-format
 msgid "Cancel"
 msgstr ""
 
-#: kmmainwin.cpp:174
+#: kmmainwin.cpp:175
 #, kde-format
 msgid "Starting..."
 msgstr "啟始中..."
 
-#: kmreadermainwin.cpp:399 util.cpp:184
+#: kmreadermainwin.cpp:455 util.cpp:184
 #, kde-format
 msgid "&Move to Trash"
 msgstr "移至垃圾桶(&M)"
 
-#: kmreadermainwin.cpp:400
+#: kmreadermainwin.cpp:456
 #, kde-format
 msgctxt "@action:intoolbar Move to Trash"
 msgid "Trash"
 msgstr "垃圾桶"
 
-#: kmreadermainwin.cpp:401
+#: kmreadermainwin.cpp:457
 #, kde-format
 msgid "Move message to trashcan"
 msgstr "將信件移入垃圾桶"
 
-#: kmreadermainwin.cpp:498
+#: kmreadermainwin.cpp:578
 #, kde-format
 msgid "Cannot copy item. %1"
 msgstr "無法複製項目。%1"
 
-#: kmreaderwin.cpp:124
+#: kmreaderwin.cpp:126
 #, kde-format
 msgid "New Message To..."
 msgstr "新信件(&N)..."
 
-#: kmreaderwin.cpp:131
+#: kmreaderwin.cpp:133
 #, kde-format
 msgid "Reply To..."
 msgstr "傳送回信給..."
 
-#: kmreaderwin.cpp:138
+#: kmreaderwin.cpp:140
 #, kde-format
 msgid "Forward To..."
 msgstr "轉寄至..."
 
-#: kmreaderwin.cpp:151
+#: kmreaderwin.cpp:153
 #, kde-format
 msgid "Add to Existing Contact"
 msgstr "新增到現有的聯絡人"
 
-#: kmreaderwin.cpp:158
+#: kmreaderwin.cpp:160
 #, kde-format
 msgid "Open in Address Book"
 msgstr "在通訊錄內開啟..."
 
-#: kmreaderwin.cpp:163
+#: kmreaderwin.cpp:165
 #, kde-format
 msgid "Bookmark This Link"
 msgstr "將此連結加入書籤"
 
-#: kmreaderwin.cpp:169
+#: kmreaderwin.cpp:171
 #, kde-format
 msgid "Edit contact..."
 msgstr "編輯聯絡人..."
 
-#: kmreaderwin.cpp:175
+#: kmreaderwin.cpp:177
 #, kde-format
 msgid "Save Link As..."
 msgstr "另存連結成..."
 
-#: kmreaderwin.cpp:181
+#: kmreaderwin.cpp:183
 #, kde-format
 msgid "&Find in Message..."
 msgstr "在信件中尋找(&F)..."
 
-#: kmreaderwin.cpp:187
+#: kmreaderwin.cpp:189
 #, kde-format
 msgid "Save Image On Disk..."
 msgstr "儲存影像到磁碟..."
 
-#: kmreaderwin.cpp:193
+#: kmreaderwin.cpp:195
 #, kde-format
 msgid "Show HTML Format"
 msgstr "顯示 HTML 格式"
 
-#: kmreaderwin.cpp:194
+#: kmreaderwin.cpp:196
 #, kde-format
 msgid "Show HTML format when mail comes from this contact"
 msgstr "從此聯絡人來的郵件以 HTML 格式顯示"
 
-#: kmreaderwin.cpp:200
+#: kmreaderwin.cpp:202
 #, kde-format
 msgid "Load external reference when mail comes for this contact"
 msgstr "從此聯絡人來的郵件載入外部參考"
 
-#: kmreaderwin.cpp:206
+#: kmreaderwin.cpp:208
 #, kde-format
 msgid "Share image..."
 msgstr "分享影像..."
 
-#: kmreaderwin.cpp:253
+#: kmreaderwin.cpp:265
 #, kde-format
 msgid ""
 "KMail is now based on the Akonadi Personal Information Management framework, "
 "which brings many changes all around."
 msgstr "KMail 現在是奠基於 Akonadi 個人資訊管理架構上，因此會有許多改變。"
 
-#: kmreaderwin.cpp:264
+#: kmreaderwin.cpp:276
 #, kde-format
 msgid "Push email (IMAP IDLE)"
 msgstr "Push email (IMAP IDLE)"
 
-#: kmreaderwin.cpp:265
+#: kmreaderwin.cpp:277
 #, kde-format
 msgid "Improved searches"
 msgstr "改進的搜尋功能"
 
-#: kmreaderwin.cpp:266
+#: kmreaderwin.cpp:278
 #, kde-format
 msgid "Support for adding notes (annotations) to mails"
 msgstr "支援在信件中新增便條（註記）"
 
-#: kmreaderwin.cpp:267
+#: kmreaderwin.cpp:279
 #, kde-format
 msgid "Less GUI freezes, mail checks happen in the background"
 msgstr "改善郵件在背景檢查時前端介面被凍結的狀況"
 
-#: kmreaderwin.cpp:268
+#: kmreaderwin.cpp:280
 #, fuzzy, kde-format
 #| msgid "GnuPG support"
 msgid "Plugins support"
 msgstr "GnuPG 支援"
 
-#: kmreaderwin.cpp:269
+#: kmreaderwin.cpp:281
 #, kde-format
 msgid "New HTML renderer (QtWebEngine)"
 msgstr ""
 
-#: kmreaderwin.cpp:270
+#: kmreaderwin.cpp:282
 #, fuzzy, kde-format
 #| msgid "Check spelling before send"
 msgid "Added Check for Phishing URL"
 msgstr "傳送前檢查拼字"
 
-#: kmreaderwin.cpp:300
+#: kmreaderwin.cpp:312
 #, fuzzy, kde-format
 #| msgid "KDE Email Client"
 msgid "The KDE Mail Client"
 msgstr "KDE 信件用戶端"
 
-#: kmreaderwin.cpp:309
+#: kmreaderwin.cpp:321
 #, fuzzy, kde-format
 #| msgid "Retrieving folder properties"
 msgid "Retrieving Folder Contents"
 msgstr "取得資料夾屬性中"
 
-#: kmreaderwin.cpp:310
+#: kmreaderwin.cpp:322
 #, fuzzy, kde-format
 #| msgid "Please wait"
 msgid "Please wait . . ."
 msgstr "請稍後"
 
-#: kmreaderwin.cpp:317 kmreaderwin.cpp:328
+#: kmreaderwin.cpp:329 kmreaderwin.cpp:340
 #, fuzzy, kde-format
 #| msgid "offline"
 msgid "Offline"
 msgstr "離線"
 
-#: kmreaderwin.cpp:319
+#: kmreaderwin.cpp:331
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
@@ -4898,7 +4925,7 @@
 "<h2 style='margin-top: 0px;'>離線模式</h2><p>KMail 目前在離線模式中。點選<a "
 "href=\"kmail:goOnline\">這裡</a>恢復上線模式。</p>&nbsp;"
 
-#: kmreaderwin.cpp:330
+#: kmreaderwin.cpp:342
 #, fuzzy, kde-format
 #| msgid ""
 #| "<h2 style='margin-top: 0px;'>Offline</h2><p>Account is currently in "
@@ -4911,22 +4938,22 @@
 "<h2 style='margin-top: 0px;'>離線模式</h2><p>此帳號目前在離線模式中。點選<a "
 "href=\"kmail:goResourceOnline\">這裡</a>恢復上線模式。</p>&nbsp;"
 
-#: kmreaderwin.cpp:849
+#: kmreaderwin.cpp:861
 #, kde-format
 msgid "Contact modified successfully"
 msgstr "聯絡人已成功變更"
 
-#: kmsystemtray.cpp:210
+#: kmsystemtray.cpp:209
 #, kde-format
 msgid "New Messages In"
 msgstr "新信件在"
 
-#: kmsystemtray.cpp:265
+#: kmsystemtray.cpp:264
 #, kde-format
 msgid "There are no unread messages"
 msgstr "沒有未讀信件"
 
-#: kmsystemtray.cpp:266
+#: kmsystemtray.cpp:265
 #, kde-format
 msgid "1 unread message"
 msgid_plural "%1 unread messages"
@@ -4948,8 +4975,8 @@
 msgstr "Copyright © 2004–2010 Tobias Koenig"
 
 #: kontactplugin/kmail/kcmkmailsummary.cpp:69
-#: kontactplugin/summary/kcmkontactsummary.cpp:121
-#: kontactplugin/summary/summaryview_plugin.cpp:126
+#: kontactplugin/summary/kcmkontactsummary.cpp:125
+#: kontactplugin/summary/summaryview_plugin.cpp:128
 #, kde-format
 msgid "Tobias Koenig"
 msgstr "Tobias Koenig"
@@ -5039,19 +5066,19 @@
 msgid "Select the plugin summaries to show on the summary page."
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:116
+#: kontactplugin/summary/kcmkontactsummary.cpp:120
 #, fuzzy, kde-format
 #| msgctxt "type of folder content"
 #| msgid "Contacts"
 msgid "kontactsummary"
 msgstr "聯絡人"
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:118
+#: kontactplugin/summary/kcmkontactsummary.cpp:122
 #, kde-format
 msgid "KDE Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/kcmkontactsummary.cpp:120
+#: kontactplugin/summary/kcmkontactsummary.cpp:124
 #, fuzzy, kde-format
 #| msgid "Tobias Koenig"
 msgid "(c), 2004 Tobias Koenig"
@@ -5100,28 +5127,28 @@
 msgid "All"
 msgstr "所有的"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:116
+#: kontactplugin/summary/summaryview_plugin.cpp:118
 #, kde-format
 msgid "Kontact Summary"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:118
+#: kontactplugin/summary/summaryview_plugin.cpp:120
 #, kde-format
 msgid "Kontact Summary View"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:120
+#: kontactplugin/summary/summaryview_plugin.cpp:122
 #, fuzzy, kde-format
 #| msgid "(c) 1997-2009, The KMail developers"
 msgid "(c) 2003-2019 The Kontact developers"
 msgstr "(c) 1997-2009, KMail 開發團隊"
 
-#: kontactplugin/summary/summaryview_plugin.cpp:122
+#: kontactplugin/summary/summaryview_plugin.cpp:124
 #, kde-format
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kontactplugin/summary/summaryview_plugin.cpp:124
+#: kontactplugin/summary/summaryview_plugin.cpp:126
 #, kde-format
 msgid "Cornelius Schumacher"
 msgstr ""
@@ -5148,7 +5175,7 @@
 msgid "&Reply"
 msgstr "回覆(&R)"
 
-#: messageactions.cpp:75 searchdialog/searchwindow.cpp:171
+#: messageactions.cpp:75 searchdialog/searchwindow.cpp:164
 #, kde-format
 msgid "&Reply..."
 msgstr "回覆(&R)..."
@@ -5158,12 +5185,12 @@
 msgid "Reply to A&uthor..."
 msgstr "回覆給原作者(&U)..."
 
-#: messageactions.cpp:87 searchdialog/searchwindow.cpp:175
+#: messageactions.cpp:87 searchdialog/searchwindow.cpp:168
 #, kde-format
 msgid "Reply to &All..."
 msgstr "全部回覆(&A)..."
 
-#: messageactions.cpp:93 searchdialog/searchwindow.cpp:179
+#: messageactions.cpp:93 searchdialog/searchwindow.cpp:172
 #, kde-format
 msgid "Reply to Mailing-&List..."
 msgstr "回信到信件論壇 (&L)..."
@@ -5193,7 +5220,7 @@
 msgid "&Edit As New"
 msgstr ""
 
-#: messageactions.cpp:140 searchdialog/searchwindow.cpp:183
+#: messageactions.cpp:140 searchdialog/searchwindow.cpp:176
 #, kde-format
 msgctxt "Message->"
 msgid "&Forward"
@@ -5263,7 +5290,7 @@
 #: messageactions.cpp:449
 #, kde-format
 msgid "Open Message in List Archive"
-msgstr "開啟在清單歸檔中的信件"
+msgstr "開啟在清單封存中的信件"
 
 #: messageactions.cpp:452
 #, kde-format
@@ -5273,7 +5300,7 @@
 #: messageactions.cpp:455
 #, kde-format
 msgid "Go to Archive"
-msgstr "前往歸檔"
+msgstr "前往封存"
 
 #: messageactions.cpp:458
 #, kde-format
@@ -5388,112 +5415,112 @@
 msgid "Search failed some errors were found: <ul><li>%1</li></ul>"
 msgstr "搜尋失敗。發現錯誤：<ul><li>%1</li></ul>"
 
-#: searchdialog/searchwindow.cpp:80
+#: searchdialog/searchwindow.cpp:78
 #, kde-format
 msgid "Find Messages"
 msgstr "尋找信件"
 
-#: searchdialog/searchwindow.cpp:102
+#: searchdialog/searchwindow.cpp:95
 #, kde-format
 msgctxt "@action:button Search for messages"
 msgid "&Search"
 msgstr "搜尋(&S)"
 
-#: searchdialog/searchwindow.cpp:188
+#: searchdialog/searchwindow.cpp:181
 #, kde-format
 msgctxt "@action:inmenu Forward message inline."
 msgid "&Inline..."
 msgstr "內含(&I)..."
 
-#: searchdialog/searchwindow.cpp:193
+#: searchdialog/searchwindow.cpp:186
 #, kde-format
 msgctxt "Message->Forward->"
 msgid "As &Attachment..."
 msgstr "當成附件轉寄(&A)"
 
-#: searchdialog/searchwindow.cpp:208
+#: searchdialog/searchwindow.cpp:201
 #, kde-format
 msgid "Save Attachments..."
 msgstr "儲存附件..."
 
-#: searchdialog/searchwindow.cpp:215
+#: searchdialog/searchwindow.cpp:208
 #, kde-format
 msgid "Clear Selection"
 msgstr "清除選擇"
 
-#: searchdialog/searchwindow.cpp:219
+#: searchdialog/searchwindow.cpp:212
 #, kde-format
 msgid "Jump to original folder"
 msgstr "跳至原始資料夾"
 
-#: searchdialog/searchwindow.cpp:306
+#: searchdialog/searchwindow.cpp:300
 #, kde-format
 msgid "%1 match"
 msgid_plural "%1 matches"
 msgstr[0] "%1 個符合"
 
-#: searchdialog/searchwindow.cpp:376 searchdialog/searchwindow.cpp:418
+#: searchdialog/searchwindow.cpp:370 searchdialog/searchwindow.cpp:412
 #, kde-format
 msgid "Last Search"
 msgstr "最後搜尋"
 
-#: searchdialog/searchwindow.cpp:444
+#: searchdialog/searchwindow.cpp:438
 #, kde-format
 msgid "You did not selected a valid folder."
 msgstr "您並未選取合法的資料夾。"
 
-#: searchdialog/searchwindow.cpp:458
+#: searchdialog/searchwindow.cpp:452
 #, kde-format
 msgid "You forgot to select collections."
 msgstr "您忘了選取收藏。"
 
-#: searchdialog/searchwindow.cpp:476
+#: searchdialog/searchwindow.cpp:470
 #, kde-format
 msgid "You forgot to define condition."
 msgstr "您忘了定義條件。"
 
-#: searchdialog/searchwindow.cpp:481
+#: searchdialog/searchwindow.cpp:475
 #, kde-format
 msgid "All folders selected are empty or were not indexed."
 msgstr "所有選取的資料夾為空的，或是未建索引。"
 
-#: searchdialog/searchwindow.cpp:487
+#: searchdialog/searchwindow.cpp:481
 #, kde-format
 msgid "You forgot to add conditions."
 msgstr "您忘了定義條件。"
 
-#: searchdialog/searchwindow.cpp:491
+#: searchdialog/searchwindow.cpp:485
 #, kde-format
 msgid ""
 "Contains condition cannot be used with a number of characters inferior to 4."
 msgstr "包含條件不能小於 4 個字元"
 
-#: searchdialog/searchwindow.cpp:528
+#: searchdialog/searchwindow.cpp:522
 #, kde-format
 msgid "Searching..."
 msgstr "搜尋中..."
 
-#: searchdialog/searchwindow.cpp:540
+#: searchdialog/searchwindow.cpp:534
 #, kde-format
 msgid "Cannot get search result. %1"
 msgstr "無法取得搜尋結果。%1"
 
-#: searchdialog/searchwindow.cpp:543
+#: searchdialog/searchwindow.cpp:537
 #, kde-format
 msgid "Search failed."
 msgstr "搜尋失敗。"
 
-#: searchdialog/searchwindow.cpp:584
+#: searchdialog/searchwindow.cpp:578
 #, kde-format
 msgid "Search complete."
 msgstr "搜尋完成。"
 
-#: searchdialog/searchwindow.cpp:622
+#: searchdialog/searchwindow.cpp:616
 #, kde-format
 msgid "Search stopped."
 msgstr "搜尋停止。"
 
-#: searchdialog/searchwindow.cpp:679
+#: searchdialog/searchwindow.cpp:673
 #, kde-format
 msgid ""
 "There was a problem renaming your search folder. A common reason for this is "
@@ -5503,19 +5530,19 @@
 "重新命名您的搜尋資料夾時發生問題。一個常見的可能是已經有另一個相同名稱的搜尋"
 "資料夾存在。返回錯誤 \"%1\"。"
 
-#: searchdialog/searchwindow.cpp:782
+#: searchdialog/searchwindow.cpp:776
 #, kde-format
 msgid "Copy Message"
 msgid_plural "Copy %1 Messages"
 msgstr[0] "複製 %1 封信件"
 
-#: searchdialog/searchwindow.cpp:785
+#: searchdialog/searchwindow.cpp:779
 #, kde-format
 msgid "Cut Message"
 msgid_plural "Cut %1 Messages"
 msgstr[0] "剪下 %1 封信件"
 
-#: searchdialog/searchwindow.cpp:913
+#: searchdialog/searchwindow.cpp:907
 #, fuzzy, kde-format
 #| msgid "Check mail on startup"
 msgid "Checking index status..."
@@ -5535,7 +5562,7 @@
 "(or moving to an archive folder) the messages that are marked 'Important' or "
 "'Action Item'"
 msgstr ""
-"這可以在自動刪除或歸檔過期信件時，避免將標記為「重要」或「動作項目」的信件清"
+"這可以在自動刪除或封存過期信件時，避免將標記為「重要」或「動作項目」的信件清"
 "除掉。"
 
 #. i18n: ectx: label, entry (AllowLocalFlags), group (Behaviour)
@@ -5643,7 +5670,7 @@
 msgstr "指定是否這是第一次執行此應用程式（只內部使用）"
 
 #. i18n: ectx: label, entry, group (General)
-#: settings/kmail.kcfg.cmake:151
+#: settings/kmail.kcfg.cmake:159
 #, kde-format
 msgid ""
 "Whether to ask if users wants to enable Unified Mailboxes if more than one "
@@ -5651,7 +5678,7 @@
 msgstr ""
 
 #. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: settings/kmail.kcfg.cmake:159
+#: settings/kmail.kcfg.cmake:167
 #, kde-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
@@ -5659,26 +5686,26 @@
 msgstr "這個值用來決定要不要顯示 KMail 介紹。"
 
 #. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: settings/kmail.kcfg.cmake:166
+#: settings/kmail.kcfg.cmake:174
 #, kde-format
 msgid "Show folder quick search line edit"
 msgstr "顯示快速搜尋資料夾編輯行"
 
 #. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: settings/kmail.kcfg.cmake:174
+#: settings/kmail.kcfg.cmake:182
 #, kde-format
 msgid "Forward Inline As Default."
 msgstr "預設內含轉寄。"
 
 #. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: settings/kmail.kcfg.cmake:177
+#: settings/kmail.kcfg.cmake:185
 #, kde-format
 msgid "Warn if the number of recipients is more than:"
 msgstr "若是收件者多於此數則提出警告："
 
 #. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
 #. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: settings/kmail.kcfg.cmake:179 settings/kmail.kcfg.cmake:186
+#: settings/kmail.kcfg.cmake:187 settings/kmail.kcfg.cmake:194
 #, kde-format
 msgid ""
 "If the number of recipients is larger than this value, KMail will warn and "
@@ -5688,19 +5715,19 @@
 "若是收件者的數量大於此值，則 KMail 會在送信前提出警告。您可以關閉此警告。"
 
 #. i18n: ectx: label, entry (CheckSpellingBeforeSend), group (Composer)
-#: settings/kmail.kcfg.cmake:207
+#: settings/kmail.kcfg.cmake:215
 #, kde-format
 msgid "Check spelling before send"
 msgstr "傳送前檢查拼字"
 
 #. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:211
+#: settings/kmail.kcfg.cmake:219
 #, kde-format
 msgid "Automatically request &message disposition notifications"
 msgstr "自動要求信件處理通知(&M)"
 
 #. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: settings/kmail.kcfg.cmake:212
+#: settings/kmail.kcfg.cmake:220
 #, kde-format
 msgid ""
 "<qt><p>Enable this option if you want KMail to request Message Disposition "
@@ -5713,13 +5740,13 @@
 "p><p>您可以針對個別信件關掉此選項。</p></qt>"
 
 #. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:234
+#: settings/kmail.kcfg.cmake:242
 #, kde-format
 msgid "Autosave interval:"
 msgstr "自動儲存間隔："
 
 #. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: settings/kmail.kcfg.cmake:235
+#: settings/kmail.kcfg.cmake:243
 #, kde-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. "
@@ -5730,151 +5757,151 @@
 "請設定為 0。"
 
 #. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: settings/kmail.kcfg.cmake:242
+#: settings/kmail.kcfg.cmake:250
 #, kde-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "在信件編輯器中顯示文字片段管理與插入面板"
 
 #. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: settings/kmail.kcfg.cmake:248
+#: settings/kmail.kcfg.cmake:256
 #, kde-format
 msgid "When check, sent messages will be stored in the encrypted form"
 msgstr "勾選此選項的話，已送出的郵件會以加密形式保存"
 
 #. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: settings/kmail.kcfg.cmake:252
+#: settings/kmail.kcfg.cmake:260
 #, kde-format
 msgid "A list of all the recently used URLs"
 msgstr "所有最近使用的網址清單"
 
 #. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: settings/kmail.kcfg.cmake:258
+#: settings/kmail.kcfg.cmake:266
 #, kde-format
 msgid "A list of all the recently used encodings"
 msgstr "所有最近使用的編碼清單"
 
 #. i18n: ectx: label, entry (ShowCryptoLabelIndicator), group (Composer)
-#: settings/kmail.kcfg.cmake:264
+#: settings/kmail.kcfg.cmake:272
 #, kde-format
 msgid "Show crypto label indicator"
 msgstr "顯示加密指示器"
 
 #. i18n: ectx: label, entry (CheckSendDefaultActionShortcut), group (Composer)
-#: settings/kmail.kcfg.cmake:268
+#: settings/kmail.kcfg.cmake:276
 #, kde-format
 msgid "Validate Send Default Shortcut"
 msgstr "確認傳送預設捷徑"
 
 #. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: settings/kmail.kcfg.cmake:285
+#: settings/kmail.kcfg.cmake:293
 #, kde-format
 msgid "The size of the identity dialog (for internal use only)"
 msgstr "身份對話框大小（只內部使用）"
 
 #. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:289
+#: settings/kmail.kcfg.cmake:297
 #, kde-format
 msgid "The width of the search window (for internal use only)"
 msgstr "搜尋視窗寬度（只內部使用）"
 
 #. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:293
+#: settings/kmail.kcfg.cmake:301
 #, kde-format
 msgid "The height of the search window (for internal use only)"
 msgstr "搜尋視窗高度（只內部使用）"
 
 #. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: settings/kmail.kcfg.cmake:297
+#: settings/kmail.kcfg.cmake:305
 #, kde-format
 msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr "設定 KMail 對話框寬度（只內部使用）"
 
 #. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: settings/kmail.kcfg.cmake:301
+#: settings/kmail.kcfg.cmake:309
 #, kde-format
 msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr "設定 KMail 對話框高度（只內部使用）"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:327
+#: settings/kmail.kcfg.cmake:335
 #, kde-format
 msgid "Message Preview Pane"
 msgstr "信件預覽"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:330
+#: settings/kmail.kcfg.cmake:338
 #, kde-format
 msgid "Do not show a message preview pane"
 msgstr "不顯示信件預覽"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:333
+#: settings/kmail.kcfg.cmake:341
 #, kde-format
 msgid "Show the message preview pane below the message list"
 msgstr "顯示在信件列表下方"
 
 #. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: settings/kmail.kcfg.cmake:336
+#: settings/kmail.kcfg.cmake:344
 #, kde-format
 msgid "Show the message preview pane next to the message list"
 msgstr "顯示在信件列表右方"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:343
+#: settings/kmail.kcfg.cmake:351
 #, kde-format
 msgid "Folder List"
 msgstr "資料夾清單"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:346
+#: settings/kmail.kcfg.cmake:354
 #, kde-format
 msgid "Long folder list"
 msgstr "資料夾長列表"
 
 #. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: settings/kmail.kcfg.cmake:349
+#: settings/kmail.kcfg.cmake:357
 #, kde-format
 msgid "Short folder list"
 msgstr "資料夾短列表"
 
 #. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:358
+#: settings/kmail.kcfg.cmake:366
 #, kde-format
 msgid "Message template for new message"
 msgstr "新信件的樣本"
 
 #. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:363
+#: settings/kmail.kcfg.cmake:371
 #, kde-format
 msgid "Message template for reply"
 msgstr "回覆信件的樣本"
 
 #. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:368
+#: settings/kmail.kcfg.cmake:376
 #, kde-format
 msgid "Message template for reply to all"
 msgstr "全部回覆信件的樣本"
 
 #. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:373
+#: settings/kmail.kcfg.cmake:381
 #, kde-format
 msgid "Message template for forward"
 msgstr "轉寄信件的樣本"
 
 #. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: settings/kmail.kcfg.cmake:378
+#: settings/kmail.kcfg.cmake:386
 #, kde-format
 msgid "Quote characters"
 msgstr "加入引言符號"
 
 #. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: settings/kmail.kcfg.cmake:393
+#: settings/kmail.kcfg.cmake:401
 #, kde-format
 msgid "Specifies the policy used when displaying policy"
 msgstr "指定顯示政策時使用的政策"
 
 #. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:401
+#: settings/kmail.kcfg.cmake:409
 #, kde-format
 msgid ""
 "Specifies the width of the collection field in the Search Window dialog (for "
@@ -5882,7 +5909,7 @@
 msgstr "指定在搜尋視窗對話框中的收藏欄位寬度（只內部使用）"
 
 #. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:405
+#: settings/kmail.kcfg.cmake:413
 #, kde-format
 msgid ""
 "Specifies the width of the subject field in the Search Window dialog (for "
@@ -5890,7 +5917,7 @@
 msgstr "指定在搜尋視窗對話框中的主旨欄位寬度（只內部使用）"
 
 #. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:409
+#: settings/kmail.kcfg.cmake:417
 #, kde-format
 msgid ""
 "Specifies the width of the sender field in the Search Window dialog (for "
@@ -5898,7 +5925,7 @@
 msgstr "指定在搜尋視窗對話框中的寄件者欄位寬度（只內部使用）"
 
 #. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:413
+#: settings/kmail.kcfg.cmake:421
 #, kde-format
 msgid ""
 "Specifies the width of the receiver field in the Search Window dialog (for "
@@ -5906,7 +5933,7 @@
 msgstr "指定在搜尋視窗對話框中的收件者欄位寬度（只內部使用）"
 
 #. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:417
+#: settings/kmail.kcfg.cmake:425
 #, kde-format
 msgid ""
 "Specifies the width of the date field in the Search Window dialog (for "
@@ -5914,7 +5941,7 @@
 msgstr "指定在搜尋視窗對話框中的日期欄位寬度（只內部使用）"
 
 #. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: settings/kmail.kcfg.cmake:421
+#: settings/kmail.kcfg.cmake:429
 #, kde-format
 msgid ""
 "Specifies the width of the folder field in the Search Window dialog (for "
@@ -6173,10 +6200,47 @@
 
 #. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
 #: ui/miscpagemaintab.ui:60
-#, kde-format
+#, fuzzy, kde-format
+#| msgctxt "what's this help"
+#| msgid ""
+#| "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+#| "REC-html40/strict.dtd\">\n"
+#| "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/"
+#| "css\">\n"
+#| "p, li { white-space: pre-wrap; }\n"
+#| "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; "
+#| "font-weight:400; font-style:normal;\">\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the "
+#| "next unread message, it may occur that no more unread messages are below "
+#| "the current message.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Do not loop:</span> The search will stop at the last "
+#| "message in the current folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in current folder:</span> The search will continue at "
+#| "the top of the message list, but not go to another folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all folders:</span> The search will continue at the "
+#| "top of the message list. If no unread messages are found it will then "
+#| "continue to the next folder.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when "
+#| "searching for the previous unread message, the search will start from the "
+#| "bottom of the message list and continue to the previous folder depending "
+#| "on which option is selected.</p>\n"
+#| "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+#| "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+#| "weight:600;\">Loop in all marked folders: </span>This is the same as "
+#| "\"Loop in all folders\" except that only folders are taken into account "
+#| "which have been marked with the folder property \"Act on new/unread mail "
+#| "in this folder\".</p></body></html>"
 msgctxt "what's this help"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"https://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 "\">\n"
@@ -6525,10 +6589,9 @@
 
 #. i18n: ectx: property (text), widget (QCheckBox, mCheckMailUrlTracking)
 #: ui/securitypagegeneraltab.ui:167
-#, fuzzy, kde-format
-#| msgid "Check Mail In"
-msgid "Check Mail Url Tracking"
-msgstr "檢查信件於"
+#, kde-format
+msgid "Scan emails for tracking URLs"
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QLabel, labelSend)
 #: ui/securitypagemdntab.ui:20
@@ -7110,6 +7173,16 @@
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr "把所有「不要再問我」的警告通通再打開"
 
+#: undosend/undosendcombobox.cpp:37
+#, kde-format
+msgid "%1 seconds"
+msgstr ""
+
+#: undosend/undosendcreatejob.cpp:58
+#, kde-format
+msgid "Undo send"
+msgstr ""
+
 #: undostack.cpp:63
 #, kde-format
 msgid "Move To Trash"
@@ -7163,3 +7236,6 @@
 #| msgid "Zoom"
 msgid "Zoom: %1%"
 msgstr "縮放"
+
+#~ msgid "Text Snippets"
+#~ msgstr "文字片段"
diff -Nru kmail-19.04.3/po/zh_TW/kmail-refresh-settings.po kmail-19.12.3/po/zh_TW/kmail-refresh-settings.po
--- kmail-19.04.3/po/zh_TW/kmail-refresh-settings.po	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/po/zh_TW/kmail-refresh-settings.po	2020-03-03 00:34:18.000000000 +0000
@@ -0,0 +1,104 @@
+# Chinese translations for kmail package
+# kmail 套件的正體中文翻譯.
+# Copyright (C) 2019 This file is copyright:
+# This file is distributed under the same license as the kmail package.
+# Automatically generated, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n"
+"POT-Creation-Date: 2019-08-09 03:21+0200\n"
+"PO-Revision-Date: 2019-08-09 03:21+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ""
+
+#: main.cpp:44 main.cpp:46
+#, kde-format
+msgid "KMail Assistant for refreshing settings"
+msgstr ""
+
+#: main.cpp:48
+#, kde-format
+msgid "(c) 2019 Laurent Montel <montel@kde.org>"
+msgstr ""
+
+#: main.cpp:49
+#, kde-format
+msgid "Laurent Montel"
+msgstr ""
+
+#: main.cpp:49
+#, kde-format
+msgid "Author"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:35
+#, kde-format
+msgid "KMail Refresh Settings"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:54
+#, kde-format
+msgid "Warning"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:58
+#, kde-format
+msgid "Clean up Settings"
+msgstr ""
+
+#: refreshsettingsassistant.cpp:62
+#, kde-format
+msgid "Finish"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:34
+#, kde-format
+msgid "Clean"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:66
+#, kde-format
+msgid "Remove obsolete \"TipOfDay\" settings: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:78
+#, kde-format
+msgid "Delete Dialog settings in file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:90
+#, kde-format
+msgid "Delete Filters settings in file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:103
+#, kde-format
+msgid "Clean Folder Settings in setting file `%1`: Done"
+msgstr ""
+
+#: refreshsettingscleanuppage.cpp:155
+#, kde-format
+msgid "Clean Dialog Size in setting file `%1`: Done"
+msgstr ""
+
+#: refreshsettingsfirstpage.cpp:31
+#, kde-format
+msgid "Please close KMail/Kontact before using it."
+msgstr ""
diff -Nru kmail-19.04.3/po/zh_TW/ktnef.po kmail-19.12.3/po/zh_TW/ktnef.po
--- kmail-19.04.3/po/zh_TW/ktnef.po	2019-07-09 00:20:30.000000000 +0000
+++ kmail-19.12.3/po/zh_TW/ktnef.po	2020-03-03 00:34:18.000000000 +0000
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:43+0200\n"
+"POT-Creation-Date: 2019-05-20 03:16+0200\n"
 "PO-Revision-Date: 2018-05-01 23:19+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
-"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
+"Language-Team: Chinese <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru kmail-19.04.3/src/attributes/taskattribute.h kmail-19.12.3/src/attributes/taskattribute.h
--- kmail-19.04.3/src/attributes/taskattribute.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/attributes/taskattribute.h	2020-03-02 07:34:49.000000000 +0000
@@ -28,7 +28,7 @@
     TaskAttribute(Akonadi::Item::Id id);
     ~TaskAttribute() override;
 
-    QByteArray type() const override;
+    Q_REQUIRED_RESULT QByteArray type() const override;
 
     TaskAttribute *clone() const override;
 
diff -Nru kmail-19.04.3/src/autotests/CMakeLists.txt kmail-19.12.3/src/autotests/CMakeLists.txt
--- kmail-19.04.3/src/autotests/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/autotests/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -17,12 +17,6 @@
 ecm_mark_as_test(kmail-identityaddvcarddialogtest)
 target_link_libraries( identityaddvcarddialogtest Qt5::Test Qt5::Widgets KF5::Completion KF5::KIOWidgets KF5::I18n)
 
-set( kmail_statusbarlabeltoggledstate_source statusbarlabeltoggledstatetest.cpp ../widgets/statusbarlabeltoggledstate.cpp ../kmail_debug.cpp)
-add_executable(statusbarlabeltoggledstatetest ${kmail_statusbarlabeltoggledstate_source})
-ecm_mark_as_test(kmail-statusbarlabeltoggledstatetest)
-target_link_libraries( statusbarlabeltoggledstatetest Qt5::Test KF5::KIOWidgets KF5::I18n)
-
-
 set( kmail_createfollowupreminderonexistingmessagejobtest_source createfollowupreminderonexistingmessagejobtest.cpp ../job/createfollowupreminderonexistingmessagejob.cpp  ../kmail_debug.cpp)
 add_executable( createfollowupreminderonexistingmessagejobtest ${kmail_createfollowupreminderonexistingmessagejobtest_source})
 ecm_mark_as_test(kmail_createfollowupreminderonexistingmessagejobtest)
@@ -41,10 +35,12 @@
 ecm_mark_as_test(kactionmenutransporttest)
 target_link_libraries( kactionmenutransporttest Qt5::Test  KF5::MailTransportAkonadi KF5::WidgetsAddons KF5::I18n KF5::ConfigGui)
 
-set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
-set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
-
-add_akonadi_isolated_test_advanced( tagselectdialogtest.cpp  "../tag/tagselectdialog.cpp;../kmail_debug.cpp" "${KDEPIMLIBS_AKONADI_LIBS};kmailprivate;KF5::MailCommon;KF5::Libkdepim;KF5::ItemViews;KF5::TemplateParser;KF5::XmlGui;KF5::Completion;KF5::I18n")
-
-add_akonadi_isolated_test_advanced(kmcommandstest.cpp "../kmcommands.cpp;../util.cpp;../secondarywindow.cpp;../undostack.cpp;../kmail_debug.cpp;../job/handleclickedurljob.cpp;../job/createreplymessagejob.cpp;../job/createforwardmessagejob.cpp"
-	"Qt5::Test;Qt5::Widgets;KF5::AkonadiCore;KF5::Bookmarks;KF5::ConfigWidgets;KF5::Contacts;KF5::I18n;KF5::IconThemes;KF5::IdentityManagement;KF5::KIOCore;KF5::KIOFileWidgets;KF5::MessageCore;KF5::MessageComposer;KF5::MessageList;KF5::MessageViewer;KF5::MailCommon;KF5::MailTransportAkonadi;KF5::Libkdepim;KF5::TemplateParser;kmailprivate")
+if (KDEPIM_RUN_AKONADI_TEST)
+    set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
+    set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
+
+    add_akonadi_isolated_test_advanced( tagselectdialogtest.cpp  "../tag/tagselectdialog.cpp;../kmail_debug.cpp" "kmailprivate;KF5::MailCommon;KF5::Libkdepim;KF5::ItemViews;KF5::TemplateParser;KF5::XmlGui;KF5::Completion;KF5::I18n")
+
+    add_akonadi_isolated_test_advanced(kmcommandstest.cpp "../kmcommands.cpp;../util.cpp;../secondarywindow.cpp;../undostack.cpp;../kmail_debug.cpp;../job/handleclickedurljob.cpp;../job/createreplymessagejob.cpp;../job/createforwardmessagejob.cpp"
+	"Qt5::Test;Qt5::Widgets;KF5::AkonadiCore;KF5::Bookmarks;KF5::ConfigWidgets;KF5::Contacts;KF5::I18n;KF5::IdentityManagement;KF5::KIOCore;KF5::KIOFileWidgets;KF5::MessageCore;KF5::MessageComposer;KF5::MessageList;KF5::MessageViewer;KF5::MailCommon;KF5::MailTransportAkonadi;KF5::Libkdepim;KF5::TemplateParser;kmailprivate")
+endif()
diff -Nru kmail-19.04.3/src/autotests/displaymessageformatactionmenutest.cpp kmail-19.12.3/src/autotests/displaymessageformatactionmenutest.cpp
--- kmail-19.04.3/src/autotests/displaymessageformatactionmenutest.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/autotests/displaymessageformatactionmenutest.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -47,7 +47,7 @@
 {
     DisplayMessageFormatActionMenu menu;
     KToggleAction *prefereHtml = menu.findChild<KToggleAction *>(QStringLiteral("prefer-html-action"));
-    QSignalSpy spy(&menu, SIGNAL(changeDisplayMessageFormat(MessageViewer::Viewer::DisplayFormatMessage)));
+    QSignalSpy spy(&menu, &DisplayMessageFormatActionMenu::changeDisplayMessageFormat);
     prefereHtml->trigger();
     QCOMPARE(spy.count(), 1);
     QCOMPARE(spy.at(0).at(0).value<MessageViewer::Viewer::DisplayFormatMessage>(), MessageViewer::Viewer::Html);
@@ -69,7 +69,7 @@
 void DisplayMessageFormatActionMenuTest::shouldDontEmitSignalWhenChangeFormat()
 {
     DisplayMessageFormatActionMenu menu;
-    QSignalSpy spy(&menu, SIGNAL(changeDisplayMessageFormat(MessageViewer::Viewer::DisplayFormatMessage)));
+    QSignalSpy spy(&menu, &DisplayMessageFormatActionMenu::changeDisplayMessageFormat);
     menu.setDisplayMessageFormat(MessageViewer::Viewer::Text);
     QCOMPARE(spy.count(), 0);
 }
diff -Nru kmail-19.04.3/src/autotests/statusbarlabeltoggledstatetest.cpp kmail-19.12.3/src/autotests/statusbarlabeltoggledstatetest.cpp
--- kmail-19.04.3/src/autotests/statusbarlabeltoggledstatetest.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/autotests/statusbarlabeltoggledstatetest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-/*
-  Copyright (c) 2014-2019 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, version 2, as
-  published by the Free Software Foundation.
-
-  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 "statusbarlabeltoggledstatetest.h"
-#include "../widgets/statusbarlabeltoggledstate.h"
-#include <QTest>
-#include <qtestmouse.h>
-#include <QSignalSpy>
-
-StatusBarLabelToggledStateTest::StatusBarLabelToggledStateTest(QObject *parent)
-    : QObject(parent)
-{
-}
-
-StatusBarLabelToggledStateTest::~StatusBarLabelToggledStateTest()
-{
-}
-
-void StatusBarLabelToggledStateTest::shouldHasDefaultValue()
-{
-    StatusBarLabelToggledState widget;
-    widget.setStateString(QStringLiteral("toggle"), QStringLiteral("untoggle"));
-    QVERIFY(!widget.toggleMode());
-}
-
-void StatusBarLabelToggledStateTest::shouldChangeState()
-{
-    StatusBarLabelToggledState widget;
-    widget.setStateString(QStringLiteral("toggle"), QStringLiteral("untoggle"));
-    widget.setToggleMode(true);
-    QVERIFY(widget.toggleMode());
-    QVERIFY(!widget.text().isEmpty());
-
-    widget.setToggleMode(true);
-    QVERIFY(widget.toggleMode());
-
-    widget.setToggleMode(false);
-    QVERIFY(!widget.toggleMode());
-}
-
-void StatusBarLabelToggledStateTest::shouldEmitSignalWhenChangeState()
-{
-    StatusBarLabelToggledState widget;
-    widget.setStateString(QStringLiteral("toggle"), QStringLiteral("untoggle"));
-    QSignalSpy spy(&widget, SIGNAL(toggleModeChanged(bool)));
-    widget.setToggleMode(true);
-    QCOMPARE(spy.count(), 1);
-
-    widget.setToggleMode(false);
-    QCOMPARE(spy.count(), 2);
-}
-
-void StatusBarLabelToggledStateTest::shouldNotEmitSignalWhenWeDontChangeState()
-{
-    StatusBarLabelToggledState widget;
-    widget.setStateString(QStringLiteral("toggle"), QStringLiteral("untoggle"));
-    QSignalSpy spy(&widget, SIGNAL(toggleModeChanged(bool)));
-    widget.setToggleMode(false);
-    QCOMPARE(spy.count(), 0);
-
-    widget.setToggleMode(true);
-    QCOMPARE(spy.count(), 1);
-
-    widget.setToggleMode(true);
-    QCOMPARE(spy.count(), 1);
-}
-
-void StatusBarLabelToggledStateTest::shouldEmitSignalWhenClickOnLabel()
-{
-    StatusBarLabelToggledState widget;
-    widget.setStateString(QStringLiteral("toggle"), QStringLiteral("untoggle"));
-    QSignalSpy spy(&widget, SIGNAL(toggleModeChanged(bool)));
-    widget.show();
-    QVERIFY(QTest::qWaitForWindowExposed(&widget));
-    QTest::mouseClick(&widget, Qt::LeftButton);
-    QCOMPARE(spy.count(), 1);
-
-    QTest::mouseClick(&widget, Qt::LeftButton);
-    QCOMPARE(spy.count(), 2);
-}
-
-void StatusBarLabelToggledStateTest::shouldChangeTestWhenStateChanged()
-{
-    StatusBarLabelToggledState widget;
-    widget.setStateString(QStringLiteral("toggle"), QStringLiteral("untoggle"));
-    const QString initialText = widget.text();
-    widget.setToggleMode(true);
-    const QString newText = widget.text();
-    QVERIFY(initialText != newText);
-
-    widget.setToggleMode(false);
-    QCOMPARE(widget.text(), initialText);
-
-    widget.setToggleMode(true);
-    QCOMPARE(widget.text(), newText);
-}
-
-QTEST_MAIN(StatusBarLabelToggledStateTest)
diff -Nru kmail-19.04.3/src/autotests/statusbarlabeltoggledstatetest.h kmail-19.12.3/src/autotests/statusbarlabeltoggledstatetest.h
--- kmail-19.04.3/src/autotests/statusbarlabeltoggledstatetest.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/autotests/statusbarlabeltoggledstatetest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
-  Copyright (c) 2014-2019 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, version 2, as
-  published by the Free Software Foundation.
-
-  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
-*/
-
-#ifndef StatusBarLabelToggledStateTEST_H
-#define StatusBarLabelToggledStateTEST_H
-
-#include <QObject>
-
-class StatusBarLabelToggledStateTest : public QObject
-{
-    Q_OBJECT
-public:
-    explicit StatusBarLabelToggledStateTest(QObject *parent = nullptr);
-    ~StatusBarLabelToggledStateTest();
-
-private Q_SLOTS:
-    void shouldHasDefaultValue();
-    void shouldChangeState();
-    void shouldEmitSignalWhenChangeState();
-    void shouldNotEmitSignalWhenWeDontChangeState();
-    void shouldEmitSignalWhenClickOnLabel();
-    void shouldChangeTestWhenStateChanged();
-};
-
-#endif // StatusBarLabelToggledStateTEST_H
diff -Nru kmail-19.04.3/src/CMakeLists.txt kmail-19.12.3/src/CMakeLists.txt
--- kmail-19.04.3/src/CMakeLists.txt	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -84,7 +84,6 @@
     identity/identityfolderrequester.cpp
     )
 set(kmailprivate_editor_LIB_SRCS
-    editor/widgets/snippetwidget.cpp
     editor/kmcomposereditorng.cpp
     editor/composer.cpp
     editor/codec/codecaction.cpp
@@ -115,6 +114,7 @@
     dialog/archivefolderdialog.cpp
     dialog/addemailtoexistingcontactdialog.cpp
     dialog/kmknotify.cpp
+    dialog/spellcheckerconfigdialog.cpp
     )
 set(kmailprivate_job_LIB_SRCS
     job/addressvalidationjob.cpp
@@ -143,7 +143,6 @@
     widgets/collectionpane.cpp
     widgets/vacationscriptindicatorwidget.cpp
     widgets/displaymessageformatactionmenu.cpp
-    widgets/statusbarlabeltoggledstate.cpp
     widgets/kactionmenutransport.cpp
     widgets/kactionmenuaccount.cpp
     widgets/zoomlabelwidget.cpp
@@ -176,6 +175,12 @@
     sieveimapinterface/kmsieveimappasswordprovider.cpp
     )
 
+set(kmailprivate_undosend_LIB_SRCS
+    undosend/undosendcombobox.cpp
+    undosend/undosendmanager.cpp
+    undosend/undosendcreatejob.cpp
+    )
+
 set(kmail_common_SRCS)
 ecm_qt_declare_logging_category(kmail_common_SRCS HEADER kmail_debug.h IDENTIFIER KMAIL_LOG CATEGORY_NAME org.kde.pim.kmail)
 set(kmailprivate_LIB_SRCS
@@ -189,7 +194,6 @@
     kmkernel.cpp
     kmcommands.cpp
     kmreadermainwin.cpp
-    kmstartup.cpp
     kmmainwidget.cpp
     aboutdata.cpp
     mailserviceimpl.cpp
@@ -218,6 +222,7 @@
     ${kmailprivate_editor_plugininterface_LIB_SRCS}
     ${kmailprivate_checkindexing_LIB_SRCS}
     ${kmailprivate_sieveimapinstanceinterface_LIB_SRCS}
+    ${kmailprivate_undosend_LIB_SRCS}
     )
 
 qt5_add_dbus_adaptor(kmailprivate_LIB_SRCS
@@ -385,6 +390,7 @@
     add_subdirectory(editor/potentialphishingemail/autotests)
     add_subdirectory(editor/warningwidgets/autotests)
     add_subdirectory(sieveimapinterface/tests/)
+    add_subdirectory(undosend/autotests/)
 endif()
 ########### install files ###############
 
@@ -409,7 +415,6 @@
     )
 
 install( FILES data/kmail2.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
-install(FILES data/dbusmail.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
 install(TARGETS
     kmailpart
     kcm_kmail
@@ -420,3 +425,7 @@
     ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml
     DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
     )
+
+configure_file(data/org.kde.kmail.service.in org.kde.kmail.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kmail.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+
diff -Nru kmail-19.04.3/src/collectionpage/collectionmailinglistpage.cpp kmail-19.12.3/src/collectionpage/collectionmailinglistpage.cpp
--- kmail-19.04.3/src/collectionpage/collectionmailinglistpage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/collectionpage/collectionmailinglistpage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -102,7 +102,7 @@
     mMLHandlerCombo->addItem(i18n("KMail"), MailingList::KMail);
     mMLHandlerCombo->addItem(i18n("Browser"), MailingList::Browser);
     groupLayout->addWidget(mMLHandlerCombo, 5, 1, 1, 2);
-    connect(mMLHandlerCombo, QOverload<int>::of(&QComboBox::activated), this, &CollectionMailingListPage::slotMLHandling);
+    connect(mMLHandlerCombo, qOverload<int>(&QComboBox::activated), this, &CollectionMailingListPage::slotMLHandling);
     label->setBuddy(mMLHandlerCombo);
 
     label = new QLabel(i18n("Address type:"), mGroupWidget);
@@ -134,7 +134,7 @@
         i18n("Post to List"), i18n("Subscribe to List"), i18n("Unsubscribe From List"), i18n("List Archives"), i18n("List Help")
     };
     mAddressCombo->addItems(el);
-    connect(mAddressCombo, QOverload<int>::of(&QComboBox::activated), this, &CollectionMailingListPage::slotAddressChanged);
+    connect(mAddressCombo, qOverload<int>(&QComboBox::activated), this, &CollectionMailingListPage::slotAddressChanged);
 
     topLayout->addWidget(mGroupWidget);
     mGroupWidget->setEnabled(false);
@@ -330,19 +330,29 @@
     save(mCurrentCollection);
     switch (mAddressCombo->currentIndex()) {
     case 0:
-        KMail::Util::mailingListPost(mFolder, mCurrentCollection);
+        if (!KMail::Util::mailingListPost(mFolder, mCurrentCollection)) {
+            qCWarning(KMAIL_LOG) << "invalid folder";
+        }
         break;
     case 1:
-        KMail::Util::mailingListSubscribe(mFolder, mCurrentCollection);
+        if (!KMail::Util::mailingListSubscribe(mFolder, mCurrentCollection)) {
+            qCWarning(KMAIL_LOG) << "invalid folder";
+        }
         break;
     case 2:
-        KMail::Util::mailingListUnsubscribe(mFolder, mCurrentCollection);
+        if (!KMail::Util::mailingListUnsubscribe(mFolder, mCurrentCollection)) {
+            qCWarning(KMAIL_LOG) << "invalid folder";
+        }
         break;
     case 3:
-        KMail::Util::mailingListArchives(mFolder, mCurrentCollection);
+        if (!KMail::Util::mailingListArchives(mFolder, mCurrentCollection)) {
+            qCWarning(KMAIL_LOG) << "invalid folder";
+        }
         break;
     case 4:
-        KMail::Util::mailingListHelp(mFolder, mCurrentCollection);
+        if (!KMail::Util::mailingListHelp(mFolder, mCurrentCollection)) {
+            qCWarning(KMAIL_LOG) << "invalid folder";
+        }
         break;
     default:
         qCWarning(KMAIL_LOG) << "Wrong entry in the mailing list entry combo!";
diff -Nru kmail-19.04.3/src/collectionpage/collectionmailinglistpage.h kmail-19.12.3/src/collectionpage/collectionmailinglistpage.h
--- kmail-19.04.3/src/collectionpage/collectionmailinglistpage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/collectionpage/collectionmailinglistpage.h	2020-03-02 07:34:49.000000000 +0000
@@ -47,7 +47,7 @@
     void load(const Akonadi::Collection &col) override;
     void save(Akonadi::Collection &col) override;
 
-    bool canHandle(const Akonadi::Collection &col) const override;
+    Q_REQUIRED_RESULT bool canHandle(const Akonadi::Collection &col) const override;
 
 private:
     void slotFetchDone(KJob *job);
diff -Nru kmail-19.04.3/src/collectionpage/collectionquotapage.cpp kmail-19.12.3/src/collectionpage/collectionquotapage.cpp
--- kmail-19.04.3/src/collectionpage/collectionquotapage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/collectionpage/collectionquotapage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -35,9 +35,8 @@
 #include <AkonadiCore/collectionquotaattribute.h>
 #include <AkonadiCore/collection.h>
 
-#include <QLayout>
 #include <KLocalizedString>
-
+#include <QVBoxLayout>
 CollectionQuotaPage::CollectionQuotaPage(QWidget *parent)
     : CollectionPropertiesPage(parent)
 {
diff -Nru kmail-19.04.3/src/collectionpage/collectionquotapage.h kmail-19.12.3/src/collectionpage/collectionquotapage.h
--- kmail-19.04.3/src/collectionpage/collectionquotapage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/collectionpage/collectionquotapage.h	2020-03-02 07:34:49.000000000 +0000
@@ -45,7 +45,7 @@
     explicit CollectionQuotaPage(QWidget *parent = nullptr);
     void load(const Akonadi::Collection &col) override;
     void save(Akonadi::Collection &col) override;
-    bool canHandle(const Akonadi::Collection &collection) const override;
+    Q_REQUIRED_RESULT bool canHandle(const Akonadi::Collection &collection) const override;
 
 private:
     void init();
diff -Nru kmail-19.04.3/src/collectionpage/collectionquotawidget.cpp kmail-19.12.3/src/collectionpage/collectionquotawidget.cpp
--- kmail-19.04.3/src/collectionpage/collectionquotawidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/collectionpage/collectionquotawidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -33,9 +33,8 @@
 #include "collectionquotawidget.h"
 
 #include <KLocalizedString>
-
+#include <QGridLayout>
 #include <QLabel>
-#include <QLayout>
 #include <QProgressBar>
 #include <KFormat>
 
diff -Nru kmail-19.04.3/src/collectionpage/collectiontemplatespage.h kmail-19.12.3/src/collectionpage/collectiontemplatespage.h
--- kmail-19.04.3/src/collectionpage/collectiontemplatespage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/collectionpage/collectiontemplatespage.h	2020-03-02 07:34:49.000000000 +0000
@@ -37,7 +37,7 @@
 
     void load(const Akonadi::Collection &col) override;
     void save(Akonadi::Collection &col) override;
-    bool canHandle(const Akonadi::Collection &collection) const override;
+    Q_REQUIRED_RESULT bool canHandle(const Akonadi::Collection &collection) const override;
 
 private:
     void slotCopyGlobal();
diff -Nru kmail-19.04.3/src/collectionpage/collectionviewpage.cpp kmail-19.12.3/src/collectionpage/collectionviewpage.cpp
--- kmail-19.04.3/src/collectionpage/collectionviewpage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/collectionpage/collectionviewpage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -26,7 +26,6 @@
 
 #include <QGroupBox>
 #include <QHBoxLayout>
-#include <kicondialog.h>
 #include <QLabel>
 #include <QCheckBox>
 #include <QVBoxLayout>
diff -Nru kmail-19.04.3/src/configuredialog/colorlistbox.h kmail-19.12.3/src/configuredialog/colorlistbox.h
--- kmail-19.04.3/src/configuredialog/colorlistbox.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/colorlistbox.h	2020-03-02 07:34:49.000000000 +0000
@@ -40,7 +40,7 @@
     void setColor(int index, const QColor &color);
     // like setColor, but does not Q_EMIT changed()
     void setColorSilently(int index, const QColor &color);
-    QColor color(int index) const;
+    Q_REQUIRED_RESULT QColor color(int index) const;
 
 Q_SIGNALS:
     void changed();
diff -Nru kmail-19.04.3/src/configuredialog/configureaccountpage.cpp kmail-19.12.3/src/configuredialog/configureaccountpage.cpp
--- kmail-19.04.3/src/configuredialog/configureaccountpage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configureaccountpage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -21,6 +21,7 @@
 #include "kmkernel.h"
 #include "settings/kmailsettings.h"
 #include "configagentdelegate.h"
+#include "undosend/undosendcombobox.h"
 #include "MessageComposer/MessageComposerSettings"
 #include "MailCommon/AccountConfigOrderDialog"
 #include "PimCommon/ConfigureImmutableWidgetUtils"
@@ -133,7 +134,7 @@
                                 << i18n("On Manual Mail Checks")
                                 << i18n("On All Mail Checks"));
     glay->addWidget(mSendOnCheckCombo, 2, 1);
-    connect(mSendOnCheckCombo, QOverload<int>::of(&QComboBox::activated), this, &AccountsPageSendingTab::slotEmitChanged);
+    connect(mSendOnCheckCombo, qOverload<int>(&QComboBox::activated), this, &AccountsPageSendingTab::slotEmitChanged);
 
     // "default send method" combo:
     mSendMethodCombo = new QComboBox(group);
@@ -142,7 +143,7 @@
                                << i18n("Send Now")
                                << i18n("Send Later"));
     glay->addWidget(mSendMethodCombo, 3, 1);
-    connect(mSendMethodCombo, QOverload<int>::of(&QComboBox::activated), this, &AccountsPageSendingTab::slotEmitChanged);
+    connect(mSendMethodCombo, qOverload<int>(&QComboBox::activated), this, &AccountsPageSendingTab::slotEmitChanged);
 
     // labels:
     QLabel *l = new QLabel(i18n("Send &messages in outbox folder:"), group);
@@ -156,11 +157,27 @@
     l = new QLabel(i18n("Defa&ult send method:"), group);
     l->setBuddy(mSendMethodCombo);
     glay->addWidget(l, 3, 0);
+
+    mUndoSend = new QCheckBox(i18n("Enable Undo Send"), this);
+    glay->addWidget(mUndoSend, 4, 0);
+    connect(mUndoSend, &QCheckBox::toggled, this, [this](bool state) {
+        mUndoSendComboBox->setEnabled(state);
+        Q_EMIT slotEmitChanged();
+    });
+
+    mUndoSendComboBox = new UndoSendCombobox(this);
+    mUndoSendComboBox->setEnabled(false);
+    glay->addWidget(mUndoSendComboBox, 4, 1);
+    connect(mUndoSendComboBox, qOverload<int>(&QComboBox::activated), this, &AccountsPageSendingTab::slotEmitChanged);
 }
 
 void AccountsPage::SendingTab::doLoadFromGlobalSettings()
 {
     mSendOnCheckCombo->setCurrentIndex(KMailSettings::self()->sendOnCheck());
+    loadWidget(mConfirmSendCheck, KMailSettings::self()->confirmBeforeSendItem());
+    loadWidget(mCheckSpellingBeforeSending, KMailSettings::self()->checkSpellingBeforeSendItem());
+    loadWidget(mUndoSend, KMailSettings::self()->enabledUndoSendItem());
+    mUndoSendComboBox->setDelay(KMailSettings::self()->undoSendDelay());
 }
 
 void AccountsPage::SendingTab::doLoadOther()
@@ -168,6 +185,8 @@
     mSendMethodCombo->setCurrentIndex(MessageComposer::MessageComposerSettings::self()->sendImmediate() ? 0 : 1);
     loadWidget(mConfirmSendCheck, KMailSettings::self()->confirmBeforeSendItem());
     loadWidget(mCheckSpellingBeforeSending, KMailSettings::self()->checkSpellingBeforeSendItem());
+    loadWidget(mUndoSend, KMailSettings::self()->enabledUndoSendItem());
+    mUndoSendComboBox->setDelay(KMailSettings::self()->undoSendDelay());
 }
 
 void AccountsPage::SendingTab::save()
@@ -175,7 +194,9 @@
     KMailSettings::self()->setSendOnCheck(mSendOnCheckCombo->currentIndex());
     saveCheckBox(mConfirmSendCheck, KMailSettings::self()->confirmBeforeSendItem());
     saveCheckBox(mCheckSpellingBeforeSending, KMailSettings::self()->checkSpellingBeforeSendItem());
+    saveCheckBox(mUndoSend, KMailSettings::self()->enabledUndoSendItem());
     MessageComposer::MessageComposerSettings::self()->setSendImmediate(mSendMethodCombo->currentIndex() == 0);
+    KMailSettings::self()->setUndoSendDelay(mUndoSendComboBox->delay());
 }
 
 QString AccountsPage::ReceivingTab::helpAnchor() const
@@ -399,7 +420,7 @@
     mLdapConfigureWidget = new KLDAP::LdapConfigureWidget(this);
     layout->addWidget(mLdapConfigureWidget);
 
-    connect(mLdapConfigureWidget, &KLDAP::LdapConfigureWidget::changed, this, QOverload<bool>::of(&LdapCompetionTab::changed));
+    connect(mLdapConfigureWidget, &KLDAP::LdapConfigureWidget::changed, this, qOverload<bool>(&LdapCompetionTab::changed));
 }
 
 LdapCompetionTab::~LdapCompetionTab()
diff -Nru kmail-19.04.3/src/configuredialog/configureaccountpage.h kmail-19.12.3/src/configuredialog/configureaccountpage.h
--- kmail-19.04.3/src/configuredialog/configureaccountpage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configureaccountpage.h	2020-03-02 07:34:49.000000000 +0000
@@ -24,6 +24,7 @@
 
 class QCheckBox;
 class QComboBox;
+class UndoSendCombobox;
 class OrgFreedesktopAkonadiNewMailNotifierInterface;
 namespace KLDAP {
 class LdapConfigureWidget;
@@ -35,7 +36,7 @@
 public:
     explicit AccountsPageSendingTab(QWidget *parent = nullptr);
     ~AccountsPageSendingTab() override;
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
     void save() override;
 
 private:
@@ -47,6 +48,8 @@
     QCheckBox *mCheckSpellingBeforeSending = nullptr;
     QComboBox *mSendOnCheckCombo = nullptr;
     QComboBox *mSendMethodCombo = nullptr;
+    UndoSendCombobox *mUndoSendComboBox = nullptr;
+    QCheckBox *mUndoSend = nullptr;
 };
 
 // subclasses: one class per tab:
diff -Nru kmail-19.04.3/src/configuredialog/configureappearancepage.cpp kmail-19.12.3/src/configuredialog/configureappearancepage.cpp
--- kmail-19.04.3/src/configuredialog/configureappearancepage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configureappearancepage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -196,7 +196,7 @@
     connect(mCustomFontCheck, &QAbstractButton::toggled,
             mFontChooser, &QWidget::setEnabled);
     // load the right font settings into mFontChooser:
-    connect(mFontLocationCombo, QOverload<int>::of(&QComboBox::activated),
+    connect(mFontLocationCombo, qOverload<int>(&QComboBox::activated),
             this, &AppearancePage::FontsTab::slotFontSelectorChanged);
 }
 
@@ -210,7 +210,7 @@
     // Save current fontselector setting before we install the new:
     if (mActiveFontIndex == 0) {
         mFont[0] = mFontChooser->font();
-        // hardcode the family and size of "message body" dependant fonts:
+        // hardcode the family and size of "message body" dependent fonts:
         for (int i = 0; i < numFontNames; ++i) {
             if (!fontNames[i].enableFamilyAndSize) {
                 // ### shall we copy the font and set the save and re-set
@@ -372,7 +372,7 @@
     mCloseToQuotaThreshold = new QSpinBox(this);
     mCloseToQuotaThreshold->setRange(0, 100);
     mCloseToQuotaThreshold->setSingleStep(1);
-    connect(mCloseToQuotaThreshold, QOverload<int>::of(&QSpinBox::valueChanged),
+    connect(mCloseToQuotaThreshold, qOverload<int>(&QSpinBox::valueChanged),
             this, &ConfigModuleTab::slotEmitChanged);
     mCloseToQuotaThreshold->setSuffix(i18n("%"));
 
@@ -491,7 +491,7 @@
                         mFolderListGroup = new QButtonGroup(this),
                         Qt::Vertical, KMailSettings::self()->folderListItem());
     vlay->addWidget(mFolderListGroupBox);
-    connect(mFolderListGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mFolderListGroup, qOverload<int>(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
 
     QHBoxLayout *folderCBHLayout = new QHBoxLayout;
     mFolderQuickSearchCB = new QCheckBox(i18n("Show folder quick search field"), this);
@@ -504,7 +504,7 @@
     mFavoriteFoldersViewGroupBox->setTitle(i18n("Show Favorite Folders View"));
     mFavoriteFoldersViewGroupBox->setLayout(new QVBoxLayout());
     mFavoriteFoldersViewGroup = new QButtonGroup(this);
-    connect(mFavoriteFoldersViewGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mFavoriteFoldersViewGroup, qOverload<int>(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
 
     QRadioButton *favoriteFoldersViewHiddenRadio = new QRadioButton(i18n("Never"), mFavoriteFoldersViewGroupBox);
     mFavoriteFoldersViewGroup->addButton(favoriteFoldersViewHiddenRadio, static_cast<int>(MailCommon::MailCommonSettings::EnumFavoriteCollectionViewMode::HiddenMode));
@@ -525,7 +525,7 @@
     mFolderToolTipsGroupBox->setTitle(i18n("Folder Tooltips"));
     mFolderToolTipsGroupBox->setLayout(new QVBoxLayout());
     mFolderToolTipsGroup = new QButtonGroup(this);
-    connect(mFolderToolTipsGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mFolderToolTipsGroup, qOverload<int>(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
 
     QRadioButton *folderToolTipsAlwaysRadio = new QRadioButton(i18n("Always"), mFolderToolTipsGroupBox);
     mFolderToolTipsGroup->addButton(folderToolTipsAlwaysRadio, static_cast< int >(FolderTreeWidget::DisplayAlways));
@@ -543,7 +543,7 @@
                         Qt::Vertical, KMailSettings::self()->readerWindowModeItem());
     vlay->addWidget(mReaderWindowModeGroupBox);
 
-    connect(mReaderWindowModeGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mReaderWindowModeGroup, qOverload<int>(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
 
     vlay->addStretch(10);   // spacer
 }
@@ -629,7 +629,7 @@
 
     connect(aggregationConfigButton, &MessageList::Utils::AggregationConfigButton::configureDialogCompleted,
             this, &AppearancePageHeadersTab::slotSelectDefaultAggregation);
-    connect(mAggregationComboBox, QOverload<int>::of(&MessageList::Utils::AggregationComboBox::activated),
+    connect(mAggregationComboBox, qOverload<int>(&MessageList::Utils::AggregationComboBox::activated),
             this, &ConfigModuleTab::slotEmitChanged);
 
     // "Theme"
@@ -650,7 +650,7 @@
 
     connect(themeConfigButton, &MessageList::Utils::ThemeConfigButton::configureDialogCompleted,
             this, &AppearancePageHeadersTab::slotSelectDefaultTheme);
-    connect(mThemeComboBox, QOverload<int>::of(&MessageList::Utils::ThemeComboBox::activated),
+    connect(mThemeComboBox, qOverload<int>(&MessageList::Utils::ThemeComboBox::activated),
             this, &ConfigModuleTab::slotEmitChanged);
 
     vlay->addWidget(group);
@@ -738,7 +738,7 @@
     } // end for loop populating mDateDisplay
 
     vlay->addWidget(mDateDisplayBox);
-    connect(mDateDisplay, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mDateDisplay, qOverload<int>(&QButtonGroup::buttonClicked), this, &ConfigModuleTab::slotEmitChanged);
 
     vlay->addStretch(10);   // spacer
 }
diff -Nru kmail-19.04.3/src/configuredialog/configureappearancepage.h kmail-19.12.3/src/configuredialog/configureappearancepage.h
--- kmail-19.04.3/src/configuredialog/configureappearancepage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configureappearancepage.h	2020-03-02 07:34:49.000000000 +0000
@@ -58,7 +58,7 @@
     Q_OBJECT
 public:
     explicit AppearancePageFontsTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
     void save() override;
 
 private:
@@ -81,7 +81,7 @@
     Q_OBJECT
 public:
     explicit AppearancePageColorsTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
     void save() override;
 
 private:
@@ -102,7 +102,7 @@
     Q_OBJECT
 public:
     explicit AppearancePageLayoutTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void save() override;
 
@@ -127,7 +127,7 @@
 public:
     explicit AppearancePageHeadersTab(QWidget *parent = nullptr);
 
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void save() override;
 
diff -Nru kmail-19.04.3/src/configuredialog/configurecomposerpage.cpp kmail-19.12.3/src/configuredialog/configurecomposerpage.cpp
--- kmail-19.04.3/src/configuredialog/configurecomposerpage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configurecomposerpage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -58,7 +58,9 @@
 #include <QRegularExpressionValidator>
 
 #include <libkdepimakonadi/completionconfiguredialog.h>
-
+#ifdef KDEPIM_ENTERPRISE_BUILD
+#include <QComboBox>
+#endif
 QString ComposerPage::helpAnchor() const
 {
     return QStringLiteral("configure-composer");
@@ -245,7 +247,7 @@
     mWrapColumnSpin->setWhatsThis(helpText);
 
     connect(mWordWrapCheck, &QCheckBox::stateChanged, this, &ConfigModuleTab::slotEmitChanged);
-    connect(mWrapColumnSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, &ComposerPageGeneralTab::slotEmitChanged);
+    connect(mWrapColumnSpin, qOverload<int>(&QSpinBox::valueChanged), this, &ComposerPageGeneralTab::slotEmitChanged);
     // only enable the spinbox if the checkbox is checked
     connect(mWordWrapCheck, &QAbstractButton::toggled, mWrapColumnSpin, &QWidget::setEnabled);
 
@@ -281,7 +283,7 @@
     connect(mImprovePlainTextOfHtmlMessage, &QCheckBox::stateChanged, this, &ConfigModuleTab::slotEmitChanged);
     groupGridLayout->addWidget(mImprovePlainTextOfHtmlMessage, row, 0, 1, -1);
     ++row;
-
+    QLabel *label = nullptr;
 #ifdef KDEPIM_ENTERPRISE_BUILD
     ++row;
     // "Default forwarding type" combobox
@@ -297,7 +299,7 @@
     label = new QLabel(i18n("Default forwarding type:"), this);
     label->setBuddy(mForwardTypeCombo);
 
-    connect(mForwardTypeCombo, QOverload<int>::of(&QComboBox::activated), this, &ComposerPageGeneralTab::slotEmitChanged);
+    connect(mForwardTypeCombo, qOverload<int>(&QComboBox::activated), this, &ComposerPageGeneralTab::slotEmitChanged);
 
     groupGridLayout->addWidget(label, row, 0);
     groupGridLayout->addWidget(mForwardTypeCombo, row, 1);
@@ -340,7 +342,7 @@
 #ifdef KDEPIM_ENTERPRISE_BUILD
     // "Warn if too many recipients" checkbox/spinbox
     mRecipientCheck = new QCheckBox(
-        GlobalSettings::self()->tooManyRecipientsItem()->label(), this);
+        KMailSettings::self()->tooManyRecipientsItem()->label(), this);
     mRecipientCheck->setObjectName(QStringLiteral("kcfg_TooManyRecipients"));
     helpText = i18n(KMailSettings::self()->tooManyRecipientsItem()->whatsThis().toUtf8().constData());
     mRecipientCheck->setWhatsThis(helpText);
@@ -358,7 +360,7 @@
     mRecipientSpin->setToolTip(i18n("Set the maximum number of recipients for the warning"));
 
     connect(mRecipientCheck, &QCheckBox::stateChanged, this, &ComposerPageGeneralTab::slotEmitChanged);
-    connect(mRecipientSpin, QOverload<int>::of(&QSpinBox::valueChanged), this, &ComposerPageGeneralTab::slotEmitChanged);
+    connect(mRecipientSpin, qOverload<int>(&QSpinBox::valueChanged), this, &ComposerPageGeneralTab::slotEmitChanged);
     // only enable the spinbox if the checkbox is checked
     connect(mRecipientCheck, &QCheckBox::toggled, mRecipientSpin, &QSpinBox::setEnabled);
 
@@ -383,10 +385,10 @@
     mMaximumRecipients->setToolTip(helpText);
     mMaximumRecipients->setWhatsThis(helpText);
 
-    QLabel *label = new QLabel(MessageComposer::MessageComposerSettings::self()->maximumRecipientsItem()->label(), this);
+    label = new QLabel(MessageComposer::MessageComposerSettings::self()->maximumRecipientsItem()->label(), this);
     label->setBuddy(mMaximumRecipients);
 
-    connect(mMaximumRecipients, QOverload<int>::of(&QSpinBox::valueChanged), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mMaximumRecipients, qOverload<int>(&QSpinBox::valueChanged), this, &ConfigModuleTab::slotEmitChanged);
 
     groupGridLayout->addWidget(label, row, 0, 1, 2);
     groupGridLayout->addWidget(mMaximumRecipients, row, 2);
@@ -425,7 +427,7 @@
     mMaximumRecentAddress->setToolTip(helpText);
     mMaximumRecentAddress->setWhatsThis(helpText);
 
-    connect(mMaximumRecentAddress, QOverload<int>::of(&QSpinBox::valueChanged), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mMaximumRecentAddress, qOverload<int>(&QSpinBox::valueChanged), this, &ConfigModuleTab::slotEmitChanged);
     connect(mShowRecentAddressesInComposer, &QAbstractButton::toggled, mMaximumRecentAddress, &QWidget::setEnabled);
     connect(mShowRecentAddressesInComposer, &QAbstractButton::toggled, label, &QWidget::setEnabled);
 
@@ -463,7 +465,7 @@
     label = new QLabel(KMailSettings::self()->autosaveIntervalItem()->label(), this);
     label->setBuddy(mAutoSave);
 
-    connect(mAutoSave, QOverload<int>::of(&QSpinBox::valueChanged), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mAutoSave, qOverload<int>(&QSpinBox::valueChanged), this, &ConfigModuleTab::slotEmitChanged);
 
     groupGridLayout->addWidget(label, row, 0);
     groupGridLayout->addWidget(mAutoSave, row, 1);
@@ -1170,7 +1172,7 @@
     mMaximumAttachmentSize->setRange(-1, 99999);
     mMaximumAttachmentSize->setSingleStep(100);
     mMaximumAttachmentSize->setSuffix(i18nc("spinbox suffix: unit for kilobyte", " kB"));
-    connect(mMaximumAttachmentSize, QOverload<int>::of(&QSpinBox::valueChanged), this, &ConfigModuleTab::slotEmitChanged);
+    connect(mMaximumAttachmentSize, qOverload<int>(&QSpinBox::valueChanged), this, &ConfigModuleTab::slotEmitChanged);
     mMaximumAttachmentSize->setSpecialValueText(i18n("No limit"));
     layAttachment->addWidget(mMaximumAttachmentSize);
     vlay->addLayout(layAttachment);
diff -Nru kmail-19.04.3/src/configuredialog/configurecomposerpage.h kmail-19.12.3/src/configuredialog/configurecomposerpage.h
--- kmail-19.04.3/src/configuredialog/configurecomposerpage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configurecomposerpage.h	2020-03-02 07:34:49.000000000 +0000
@@ -84,7 +84,7 @@
     Q_OBJECT
 public:
     explicit ComposerPageTemplatesTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void save() override;
 
@@ -100,7 +100,7 @@
     Q_OBJECT
 public:
     explicit ComposerPageCustomTemplatesTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void save() override;
 
@@ -116,7 +116,7 @@
     Q_OBJECT
 public:
     explicit ComposerPageSubjectTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void save() override;
 
@@ -136,7 +136,7 @@
     Q_OBJECT
 public:
     explicit ComposerPageCharsetTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void save() override;
 
@@ -155,7 +155,7 @@
     Q_OBJECT
 public:
     explicit ComposerPageHeadersTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void save() override;
 
diff -Nru kmail-19.04.3/src/configuredialog/configuredialog.cpp kmail-19.12.3/src/configuredialog/configuredialog.cpp
--- kmail-19.04.3/src/configuredialog/configuredialog.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configuredialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -27,8 +27,6 @@
 #include "settings/kmailsettings.h"
 #include "kmkernel.h"
 
-#include <KWindowSystem>
-#include <KIconLoader>
 #include <QPushButton>
 
 ConfigureDialog::ConfigureDialog(QWidget *parent, bool modal)
@@ -39,8 +37,6 @@
                        |QDialogButtonBox::RestoreDefaults | QDialogButtonBox::Cancel
                        |QDialogButtonBox::Apply | QDialogButtonBox::Reset);
     setModal(modal);
-    KWindowSystem::setIcons(winId(), qApp->windowIcon().pixmap(IconSize(KIconLoader::Desktop), IconSize(KIconLoader::Desktop)),
-                            qApp->windowIcon().pixmap(IconSize(KIconLoader::Small), IconSize(KIconLoader::Small)));
     addModule(QStringLiteral("kmail_config_accounts"));
     addModule(QStringLiteral("kmail_config_appearance"));
     addModule(QStringLiteral("kmail_config_composer"));
diff -Nru kmail-19.04.3/src/configuredialog/configuremiscpage.cpp kmail-19.12.3/src/configuredialog/configuremiscpage.cpp
--- kmail-19.04.3/src/configuredialog/configuremiscpage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configuremiscpage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -71,9 +71,9 @@
         i18n(KMailSettings::self()->excludeImportantMailFromExpiryItem()->whatsThis().toUtf8().constData()));
 
     connect(mMMTab.mExcludeImportantFromExpiry, &QCheckBox::stateChanged, this, &MiscPageFolderTab::slotEmitChanged);
-    connect(mMMTab.mLoopOnGotoUnread, QOverload<int>::of(&KComboBox::activated), this, &MiscPageFolderTab::slotEmitChanged);
-    connect(mMMTab.mActionEnterFolder, QOverload<int>::of(&KComboBox::activated), this, &MiscPageFolderTab::slotEmitChanged);
-    connect(mMMTab.mDelayedMarkTime, QOverload<int>::of(&QSpinBox::valueChanged), this, &MiscPageFolderTab::slotEmitChanged);
+    connect(mMMTab.mLoopOnGotoUnread, qOverload<int>(&KComboBox::activated), this, &MiscPageFolderTab::slotEmitChanged);
+    connect(mMMTab.mActionEnterFolder, qOverload<int>(&KComboBox::activated), this, &MiscPageFolderTab::slotEmitChanged);
+    connect(mMMTab.mDelayedMarkTime, qOverload<int>(&QSpinBox::valueChanged), this, &MiscPageFolderTab::slotEmitChanged);
     connect(mMMTab.mDelayedMarkAsRead, &QAbstractButton::toggled, mMMTab.mDelayedMarkTime, &QWidget::setEnabled);
     connect(mMMTab.mDelayedMarkAsRead, &QAbstractButton::toggled, this, &ConfigModuleTab::slotEmitChanged);
     connect(mMMTab.mShowPopupAfterDnD, &QCheckBox::stateChanged, this, &MiscPageFolderTab::slotEmitChanged);
diff -Nru kmail-19.04.3/src/configuredialog/configuremiscpage.h kmail-19.12.3/src/configuredialog/configuremiscpage.h
--- kmail-19.04.3/src/configuredialog/configuremiscpage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configuremiscpage.h	2020-03-02 07:34:49.000000000 +0000
@@ -37,7 +37,7 @@
     explicit MiscPageFolderTab(QWidget *parent = nullptr);
 
     void save() override;
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
 private:
     void doLoadFromGlobalSettings() override;
diff -Nru kmail-19.04.3/src/configuredialog/configurepluginpage.h kmail-19.12.3/src/configuredialog/configurepluginpage.h
--- kmail-19.04.3/src/configuredialog/configurepluginpage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configurepluginpage.h	2020-03-02 07:34:49.000000000 +0000
@@ -31,7 +31,7 @@
     explicit ConfigurePluginPage(QWidget *parent);
     ~ConfigurePluginPage() override;
 
-    QString helpAnchor() const override;
+    Q_REQUIRED_RESULT QString helpAnchor() const override;
     void load() override;
     void save() override;
     void defaults() override;
diff -Nru kmail-19.04.3/src/configuredialog/configureplugins/configurepluginslistwidget.cpp kmail-19.12.3/src/configuredialog/configureplugins/configurepluginslistwidget.cpp
--- kmail-19.04.3/src/configuredialog/configureplugins/configurepluginslistwidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configureplugins/configurepluginslistwidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -206,7 +206,7 @@
                                                         pluginEditorGrammarGroupName());
 
     //Load generic plugins
-    //Necessary to initialize pluging when we load it outside kmail
+    //Necessary to initialize plugin when we load it outside kmail
     KMailPluginInterface::self()->initializePlugins();
     PimCommon::ConfigurePluginsListWidget::fillTopItems(KMailPluginInterface::self()->pluginsDataList(),
                                                         i18n("Tools Plugins"),
@@ -247,7 +247,7 @@
                                                         headerStyleGroupName());
     //Load Converter plugin
     PimCommon::ConfigurePluginsListWidget::fillTopItems(MessageComposer::PluginEditorConvertTextManager::self()->pluginsDataList(),
-                                                        i18n("Convertor Text Plugins"),
+                                                        i18n("Text Conversion Plugins"),
                                                         MessageComposer::PluginEditorConvertTextManager::self()->configGroupName(),
                                                         MessageComposer::PluginEditorConvertTextManager::self()->configPrefixSettingKey(),
                                                         mPluginConvertTextItems,
diff -Nru kmail-19.04.3/src/configuredialog/configureplugins/configurepluginslistwidget.h kmail-19.12.3/src/configuredialog/configureplugins/configurepluginslistwidget.h
--- kmail-19.04.3/src/configuredialog/configureplugins/configurepluginslistwidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configureplugins/configurepluginslistwidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -18,7 +18,7 @@
 #ifndef KMAILCONFIGUREPLUGINSLISTWIDGET_H
 #define KMAILCONFIGUREPLUGINSLISTWIDGET_H
 
-#include <QList>
+#include <QVector>
 #include <PimCommon/ConfigurePluginsListWidget>
 #include <PimCommon/PluginUtil>
 class ConfigurePluginsListWidget : public PimCommon::ConfigurePluginsListWidget
@@ -38,20 +38,20 @@
     void slotConfigureClicked(const QString &configureGroupName, const QString &identifier);
     void initializeAgentPlugins();
     PimCommon::PluginUtilData createAgentPluginData(const QString &agentIdentifier, const QString &path);
-    bool agentActivateState(const QString &agentIdentifier, const QString &pathName);
+    Q_REQUIRED_RESULT bool agentActivateState(const QString &agentIdentifier, const QString &pathName);
     void changeAgentActiveState(const QString &agentIdentifier, const QString &path, bool enable);
     void saveAkonadiAgent();
-    QList<PluginItem *> mPluginEditorItems;
-    QList<PluginItem *> mPluginMessageViewerItems;
-    QList<PluginItem *> mPluginCheckBeforeSendItems;
-    QList<PluginItem *> mPluginEditorInitItems;
-    QList<PluginItem *> mPluginEditorGrammarItems;
-    QList<PluginItem *> mPluginGenericItems;
-    QList<PluginItem *> mPluginWebEngineItems;
-    QList<PluginItem *> mPluginHeaderStyleItems;
-    QList<PluginItem *> mAgentPluginsItems;
-    QList<PluginItem *> mPluginConvertTextItems;
-    QList<PluginItem *> mPluginConfigureItems;
+    QVector<PluginItem *> mPluginEditorItems;
+    QVector<PluginItem *> mPluginMessageViewerItems;
+    QVector<PluginItem *> mPluginCheckBeforeSendItems;
+    QVector<PluginItem *> mPluginEditorInitItems;
+    QVector<PluginItem *> mPluginEditorGrammarItems;
+    QVector<PluginItem *> mPluginGenericItems;
+    QVector<PluginItem *> mPluginWebEngineItems;
+    QVector<PluginItem *> mPluginHeaderStyleItems;
+    QVector<PluginItem *> mAgentPluginsItems;
+    QVector<PluginItem *> mPluginConvertTextItems;
+    QVector<PluginItem *> mPluginConfigureItems;
     QVector<PimCommon::PluginUtilData> mPluginUtilDataList;
 };
 
diff -Nru kmail-19.04.3/src/configuredialog/configuresecuritypage.cpp kmail-19.12.3/src/configuredialog/configuresecuritypage.cpp
--- kmail-19.04.3/src/configuredialog/configuresecuritypage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configuresecuritypage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -166,7 +166,7 @@
 
     // "ignore", "ask", "deny", "always send" radiobuttons
     mMDNGroup = new QButtonGroup(this);
-    connect(mMDNGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &SecurityPageMDNTab::slotEmitChanged);
+    connect(mMDNGroup, qOverload<int>(&QButtonGroup::buttonClicked), this, &SecurityPageMDNTab::slotEmitChanged);
     mMDNGroup->addButton(mUi.radioIgnore, 0);
     mMDNGroup->addButton(mUi.radioAsk, 1);
     mMDNGroup->addButton(mUi.radioDeny, 2);
@@ -174,7 +174,7 @@
 
     // "Original Message quote" radiobuttons
     mOrigQuoteGroup = new QButtonGroup(this);
-    connect(mOrigQuoteGroup, QOverload<int>::of(&QButtonGroup::buttonClicked), this, &SecurityPageMDNTab::slotEmitChanged);
+    connect(mOrigQuoteGroup, qOverload<int>(&QButtonGroup::buttonClicked), this, &SecurityPageMDNTab::slotEmitChanged);
     mOrigQuoteGroup->addButton(mUi.radioNothing, 0);
     mOrigQuoteGroup->addButton(mUi.radioFull, 1);
     mOrigQuoteGroup->addButton(mUi.radioHeaders, 2);
@@ -281,12 +281,12 @@
     connect(mWidget->warnGroupBox, &QGroupBox::toggled, this, &SecurityPageWarningTab::slotEmitChanged);
     connect(mWidget->mWarnUnsigned, &QCheckBox::toggled, this, &SecurityPageWarningTab::slotEmitChanged);
     connect(mWidget->warnUnencryptedCB, &QCheckBox::toggled, this, &SecurityPageWarningTab::slotEmitChanged);
-    connect(mWidget->mWarnSignKeyExpiresSB, QOverload<int>::of(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
-    connect(mWidget->mWarnEncrKeyExpiresSB, QOverload<int>::of(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
-    connect(mWidget->mWarnEncrChainCertExpiresSB, QOverload<int>::of(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
-    connect(mWidget->mWarnSignChainCertExpiresSB, QOverload<int>::of(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
-    connect(mWidget->mWarnSignRootCertExpiresSB, QOverload<int>::of(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
-    connect(mWidget->mWarnEncrRootCertExpiresSB, QOverload<int>::of(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
+    connect(mWidget->mWarnSignKeyExpiresSB, qOverload<int>(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
+    connect(mWidget->mWarnEncrKeyExpiresSB, qOverload<int>(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
+    connect(mWidget->mWarnEncrChainCertExpiresSB, qOverload<int>(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
+    connect(mWidget->mWarnSignChainCertExpiresSB, qOverload<int>(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
+    connect(mWidget->mWarnSignRootCertExpiresSB, qOverload<int>(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
+    connect(mWidget->mWarnEncrRootCertExpiresSB, qOverload<int>(&KPluralHandlingSpinBox::valueChanged), this, &SecurityPageWarningTab::slotEmitChanged);
 
     connect(mWidget->gnupgButton, &QPushButton::clicked, this, &SecurityPageWarningTab::slotConfigureGnupg);
     connect(mWidget->enableAllWarningsPB, &QPushButton::clicked, this, &SecurityPageWarningTab::slotReenableAllWarningsClicked);
diff -Nru kmail-19.04.3/src/configuredialog/configuresecuritypage.h kmail-19.12.3/src/configuredialog/configuresecuritypage.h
--- kmail-19.04.3/src/configuredialog/configuresecuritypage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/configuredialog/configuresecuritypage.h	2020-03-02 07:34:49.000000000 +0000
@@ -37,7 +37,7 @@
     Q_OBJECT
 public:
     explicit SecurityPageGeneralTab(QWidget *parent = nullptr);
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void save() override;
 
diff -Nru kmail-19.04.3/src/data/dbusmail.desktop kmail-19.12.3/src/data/dbusmail.desktop
--- kmail-19.04.3/src/data/dbusmail.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/dbusmail.desktop	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-[Desktop Entry]
-Type=ServiceType
-X-KDE-ServiceType=DBUS/Mailer
-Comment=Mail program with a D-Bus interface
-Comment[ar]=برنامج بريد بواجهة D-Bus
-Comment[bs]=Mail program sa D-Bus sučeljem
-Comment[ca]=Un programa de correu amb una interfície de D-Bus
-Comment[ca@valencia]=Un programa de correu amb una interfície de D-Bus
-Comment[cs]=Poštovní program s DBUS rozhraním
-Comment[da]=E-mail-program med en D-BUS-grænseflade
-Comment[de]=E-Mail-Programm mit D-Bus-Schnittstelle
-Comment[el]=Πρόγραμμα αλληλογραφίας με διασύνδεση D-Bus
-Comment[en_GB]=Mail program with a D-Bus interface
-Comment[es]=Programa de correo con una interfaz D-Bus
-Comment[et]=E-posti rakendus D-Busi liidesega
-Comment[fi]=D-Bus-rajapintainen sähköpostiohjelma
-Comment[fr]=Programme de messagerie avec une interface D-Bus
-Comment[ga]=Clár ríomhphoist a bhfuil comhéadan D-Bus aige
-Comment[gl]=Programa de correo electrónico cunha interface D-BUS
-Comment[hu]=Levelezőprogram D-Bus-os felülettel
-Comment[ia]=Programma de e-posta con interfacie D-Bus
-Comment[it]=Programma di posta con un'interfaccia D-Bus
-Comment[ja]=D-Bus インターフェースを持つメールクライアント
-Comment[kk]=DBUS интерфейсті пошта бағдарламасы
-Comment[km]=កម្មវិធី​សំបុត្រ​ដែល​មាន​ចំណុច​ប្រទាក់ D-BUS
-Comment[ko]=D-Bus 인터페이스를 사용하는 이메일 프로그램
-Comment[lt]=Pašto programa su D-Bus sąsaja
-Comment[lv]=Pasta programma ar D-BUS saskarni
-Comment[mr]=DBus संवादासहीतचा मेल कार्यक्रम
-Comment[nb]=E-postprogram med D-Bus-grensesnitt
-Comment[nds]=Nettpostprogramm mit en D-Bus-Koppelsteed
-Comment[nl]=E-mailprogramma met een D-Bus-interface
-Comment[nn]=E-postprogram med eit D-Bus-grensesnitt
-Comment[pa]=ਇੱਕ ਡੀਬੱਸ ਇੰਟਰਫੇਸ ਨਾਲ ਮੇਲ ਪਰੋਗਰਾਮ
-Comment[pl]=Program pocztowy z interfejsem D-Bus
-Comment[pt]=Um programa de correio electrónico com uma interface D-Bus
-Comment[pt_BR]=Programa de e-mail com interface D-Bus
-Comment[ro]=Program de poștă cu interfață D-Bus
-Comment[ru]=Почтовый клиент с интерфейсом D-Bus
-Comment[sk]=Poštový program s D-Bus rozhraním
-Comment[sl]=Poštni program z vmesnikom D-Bus
-Comment[sr]=Поштански програм са д‑бус сучељем
-Comment[sr@ijekavian]=Поштански програм са д‑бус сучељем
-Comment[sr@ijekavianlatin]=Poštanski program sa D‑Bus sučeljem
-Comment[sr@latin]=Poštanski program sa D‑Bus sučeljem
-Comment[sv]=E-postprogram med D-Bus gränssnitt
-Comment[tr]=D-Bus arayüzü olan e-posta uygulaması
-Comment[uk]=Програма ел. пошти з інтерфейсом D-Bus
-Comment[wa]=Programe d' emilaedje avou ene eterface D-Bus
-Comment[x-test]=xxMail program with a D-Bus interfacexx
-Comment[zh_CN]=具有 D-BUS 接口的邮件程序
-Comment[zh_TW]=有 D-Bus 介面的郵件程式
diff -Nru kmail-19.04.3/src/data/kmail2.notifyrc kmail-19.12.3/src/data/kmail2.notifyrc
--- kmail-19.04.3/src/data/kmail2.notifyrc	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/kmail2.notifyrc	2020-03-02 07:34:49.000000000 +0000
@@ -1,5 +1,6 @@
 [Global]
 IconName=kmail
+DesktopEntry=org.kde.kmail
 Comment=KMail
 Comment[af]=KMail
 Comment[ar]=بريدك
@@ -83,6 +84,7 @@
 Name[en_GB]=Akonadi server sent a warning
 Name[es]=El servidor Akonadi envió un aviso
 Name[et]=Akonadi server saatis hoiatuse
+Name[eu]=Akonadi zerbitzariak abisu bat bidali du
 Name[fi]=Akonadi-palvelin lähetti varoituksen
 Name[fr]=Avertissement du serveur Akonadi
 Name[gl]=O servidor de Akonadi enviou unha advertencia
@@ -127,6 +129,7 @@
 Comment[en_GB]=Akonadi server sent a warning
 Comment[es]=El servidor Akonadi envió un aviso
 Comment[et]=Akonadi server saatis hoiatuse
+Comment[eu]=Akonadi zerbitzariak abisu bat bidali du
 Comment[fi]=Akonadi-palvelin lähetti varoituksen
 Comment[fr]=Avertissement du serveur Akonadi
 Comment[gl]=O servidor de Akonadi enviou unha advertencia
@@ -174,6 +177,7 @@
 Name[en_GB]=Akonadi server sent an error
 Name[es]=El servidor Akonadi envión un error
 Name[et]=Akonadi server saatis vea
+Name[eu]=Akonadi zerbitzariak errore bat bidali du
 Name[fi]=Akonadi-palvelin lähetti virheen
 Name[fr]=Erreur du serveur Akonadi
 Name[gl]=O servidor de Akonadi enviou un erro
@@ -218,6 +222,7 @@
 Comment[en_GB]=Akonadi server sent an error
 Comment[es]=El servidor Akonadi envió un error
 Comment[et]=Akonadi server saatis vea
+Comment[eu]=Akonadi zerbitzariak errore bat bidali du
 Comment[fi]=Akonadi-palvelin lähetti virheen
 Comment[fr]=Erreur du serveur Akonadi
 Comment[gl]=O servidor de Akonadi enviou un erro
@@ -265,6 +270,7 @@
 Name[en_GB]=A resource is broken
 Name[es]=Un recurso está dañado
 Name[et]=Ressurss on katki
+Name[eu]=Baliabide bat hondatuta dago
 Name[fi]=Resurssi on rikki
 Name[fr]=Une ressource est endommagée
 Name[gl]=Un recurso está estragado
@@ -308,6 +314,7 @@
 Comment[en_GB]=A resource change its state to broken
 Comment[es]=Un recurso cambia su estado a dañado
 Comment[et]=Ressurssi olekuks on nüüd katki.
+Comment[eu]=Baliabide batek bere egoera hondatura aldatu du
 Comment[fi]=Resurssi vaihtoi tilakseen ”rikki”
 Comment[fr]=Une ressource a changé son état à « endommagé »
 Comment[gl]=Un recurso cambiou de estado a «estragado».
@@ -346,39 +353,49 @@
 Name=Impossible to send email
 Name[ca]=És impossible enviar el correu
 Name[ca@valencia]=És impossible enviar el correu
+Name[cs]=E-mail nelze odeslat
 Name[de]=Nachrichten kann nicht versendet werden
 Name[en_GB]=Impossible to send email
 Name[es]=No es posible enviar correo
+Name[eu]=Ezin da e-posta bidali
 Name[fi]=Sähköpostin lähettäminen on mahdotonta
 Name[fr]=Impossible d'envoyer le courrier électronique
 Name[gl]=Non se pode enviar a mensaxe
+Name[ia]=Impossibile  inviar e-posta
 Name[it]=Impossibile inviare il messaggio di posta
 Name[ko]=이메일을 보낼 수 없음
 Name[nl]=Verzenden van een e-mail is onmogelijk
 Name[pl]=Nie można wysłać wiadomości
-Name[pt]=Não é possível enviar o e-mail
+Name[pt]=Não foi possível enviar o e-mail
 Name[pt_BR]=Não foi possível enviar o e-mail
+Name[sk]=Nemožné poslať email
 Name[sv]=Omöjligt att skicka e-post
 Name[uk]=Не вдалося надіслати повідомлення
 Name[x-test]=xxImpossible to send emailxx
+Name[zh_CN]=无法发送电子邮件
 Comment=Problem during send mail
 Comment[ca]=Problema durant l'enviament del correu
 Comment[ca@valencia]=Problema durant l'enviament del correu
+Comment[cs]=Během odesílání e-mailu nastaly problémy
 Comment[de]=Probleme beim Versenden der E-Mail
 Comment[en_GB]=Problem during send mail
 Comment[es]=Problema al enviar correo
+Comment[eu]=Arazoa posta bidali bitartean
 Comment[fi]=Ongelma lähetettäessä sähköpostia
 Comment[fr]=Problème lors de l'envoi du courrier électronique
 Comment[gl]=Problema ao enviar o correo
+Comment[ia]=Problema durante expedition de e-posta
 Comment[it]=Problema durante l'invio della posta
 Comment[ko]=이메일 전송 중 문제 발생
-Comment[nl]=Probleem bij verzenden van e-mail
+Comment[nl]=probleem bij verzenden van e-mail
 Comment[pl]=Błąd podczas wysyłania poczty
-Comment[pt]=Problemas durante o envio do e-mail
+Comment[pt]=Ocorreu um problema no envio do e-mail
 Comment[pt_BR]=Problema ao enviar o e-mail
+Comment[sk]=Chyba pri odosielaní mailu
 Comment[sv]=Problem när e-post skulle skickas
 Comment[uk]=Проблема під час надсилання пошти
 Comment[x-test]=xxProblem during send mailxx
+Comment[zh_CN]=发送邮件时出现问题
 Action=Popup
 
 [Event/folderarchivedone]
@@ -394,6 +411,7 @@
 Name[en_GB]=Archive Mails in Folder done
 Name[es]=Archivado de correos en carpeta terminado
 Name[et]=Kirjad on kausta arhiveeritud
+Name[eu]=Postak karpetan artxibatzea osatu da
 Name[fi]=Viestien arkistointi kansioihin valmis
 Name[fr]=Archivage des dossiers terminé
 Name[gl]=Rematou «Arquivar o correo do cartafol»
@@ -420,7 +438,7 @@
 Name[uk]=Архівування пошти до теки завершено
 Name[x-test]=xxArchive Mails in Folder donexx
 Name[zh_CN]=文件夹中的邮件归档完成
-Name[zh_TW]=資料夾中的郵件已歸檔完成
+Name[zh_TW]=資料夾中的郵件已封存完成
 Action=None
 
 [Event/folderarchiveerror]
@@ -435,6 +453,7 @@
 Name[en_GB]=Folder Archive Error
 Name[es]=Error de archivado de carpeta
 Name[et]=Kirjade arhiveerimise tõrge
+Name[eu]=Karpeta artxibatzeko errorea
 Name[fi]=Kansion arkistointivirhe
 Name[fr]=Erreur d'archivage des dossiers
 Name[gl]=Erro do arquivo de cartafoles
@@ -446,7 +465,7 @@
 Name[nb]=Feil i postarkiv
 Name[nds]=Orner-Archiveerfehler
 Name[nl]=fout in archiveren van map
-Name[pl]=Usługa archiwizacji poczty
+Name[pl]=Usługa archiwizowania poczty
 Name[pt]=Erro no Arquivo de Pastas
 Name[pt_BR]=Erro no arquivamento de pastas
 Name[ru]=Ошибка архивирования папки
@@ -461,5 +480,30 @@
 Name[uk]=Помилка архівування до теки
 Name[x-test]=xxFolder Archive Errorxx
 Name[zh_CN]=文件夹归档错误
-Name[zh_TW]=資料夾歸檔錯誤
+Name[zh_TW]=資料夾封存錯誤
 Action=Popup
+
+[Event/undosend]
+Name=An email can be undo send
+Name[ca]=Es pot desfer l'enviament d'un correu electrònic
+Name[ca@valencia]=Es pot desfer l'enviament d'un correu electrònic
+Name[cs]=Odeslaný e-mail lze vrátit
+Name[en_GB]=An email can be undo send
+Name[es]=Se puede deshacer el envío de un correo electrónico
+Name[eu]=E-posta baten bidalketa desegin daiteke
+Name[fi]=Viestin lähetyksen voi perua
+Name[fr]=Vous pouvez annuler l'envoi d'un courriel
+Name[gl]=O envío dun correo electrónico pode desfacerse
+Name[ia]=Un message de eposta pote haber annullate le invio
+Name[ko]=이메일 전송 실행 취소 가능
+Name[nl]=Verzenden van een e-mailbericht kan ongedaan gemaakt worden
+Name[pl]=Wysłanie wiadomości można wycofać
+Name[pt]=Pode ser anulado o envio de um e-mail
+Name[pt_BR]=O envio de um e-mail pode ser desfeito
+Name[sk]=E-mail je možné vrátiť späť
+Name[sv]=Sändning av ett brev kan ångras
+Name[uk]=Не можна скасувати надсилання пошти
+Name[x-test]=xxAn email can be undo sendxx
+Name[zh_CN]=电子邮件可以撤消发送
+Action=Popup
+Urgency=Normal
diff -Nru kmail-19.04.3/src/data/kmail_config_accounts.desktop kmail-19.12.3/src/data/kmail_config_accounts.desktop
--- kmail-19.04.3/src/data/kmail_config_accounts.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/kmail_config_accounts.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -100,7 +100,7 @@
 Comment[eo]=Agordo por sendi kaj ricevi mesaĝojn
 Comment[es]=Configuración para enviar y recibir mensajes
 Comment[et]=Kirjade saatmise ja saamise seadistused
-Comment[eu]=Mezuak bidali eta jasotzeko konfigurazioa
+Comment[eu]=Mezuak bidali eta jasotzeko ezarpena
 Comment[fa]=برپایی برای ارسال و دریافت پیامها
 Comment[fi]=Viestien lähetys- ja vastaanottoasetukset
 Comment[fr]=Configuration de l'envoi et de la réception de messages
@@ -161,6 +161,7 @@
 X-KDE-Keywords[en_GB]=kmail,accounts
 X-KDE-Keywords[es]=kmail,cuentas
 X-KDE-Keywords[et]=kmail,kontod
+X-KDE-Keywords[eu]=kmail,kontuak
 X-KDE-Keywords[fi]=kmail,accounts,tilit
 X-KDE-Keywords[fr]=kmail,comptes
 X-KDE-Keywords[ga]=kmail,cuntais
diff -Nru kmail-19.04.3/src/data/kmail_config_appearance.desktop kmail-19.12.3/src/data/kmail_config_appearance.desktop
--- kmail-19.04.3/src/data/kmail_config_appearance.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/kmail_config_appearance.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -102,7 +102,7 @@
 Comment[en_GB]=Customise Visual Appearance
 Comment[es]=Personalizar la apariencia visual
 Comment[et]=Välimuse seadistused
-Comment[eu]=Pertsonalizatu itxura
+Comment[eu]=Egokitu itxura norbere erara
 Comment[fa]=سفارشی کردن ظاهر تصویری
 Comment[fi]=Mukauta ulkoasua
 Comment[fr]=Personnalisation de l'apparence
@@ -164,6 +164,7 @@
 X-KDE-Keywords[en_GB]=kmail,appearance
 X-KDE-Keywords[es]=kmail,apariencia
 X-KDE-Keywords[et]=kmail,välimus
+X-KDE-Keywords[eu]=kmail,itxura
 X-KDE-Keywords[fi]=kmail,appearance,ulkoasu
 X-KDE-Keywords[fr]=kmail,apparence
 X-KDE-Keywords[ga]=kmail,cuma
diff -Nru kmail-19.04.3/src/data/kmail_config_composer.desktop kmail-19.12.3/src/data/kmail_config_composer.desktop
--- kmail-19.04.3/src/data/kmail_config_composer.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/kmail_config_composer.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -92,6 +92,7 @@
 Comment[en_GB]=Message Composer Settings
 Comment[es]=Preferencias del editor de mensajes
 Comment[et]=Kirjakoostaja seadistused
+Comment[eu]=Mezu editoreko ezarpenak
 Comment[fi]=Viestimuokkaimen asetukset
 Comment[fr]=Configuration de l'éditeur de messages
 Comment[gl]=Configuracións do compositor de mensaxes
@@ -102,7 +103,7 @@
 Comment[kk]=Хат құрастарғышын баптау
 Comment[km]=ការ​កំណត់​កម្មវិធី​តែង​សារ
 Comment[ko]=메시지 작성기 설정
-Comment[lt]=Laiškų rengyklės nustatymai
+Comment[lt]=Laiškų rengyklės nuostatos
 Comment[lv]=Vēstuļu rastītāja iestatījumi
 Comment[mr]=संदेश संपादक संयोजना
 Comment[nb]=Innstillinger for meldingskomposer
@@ -139,6 +140,7 @@
 X-KDE-Keywords[en_GB]=kmail,composer
 X-KDE-Keywords[es]=kmail,editor
 X-KDE-Keywords[et]=kmail,koostaja
+X-KDE-Keywords[eu]=kmail,editorea
 X-KDE-Keywords[fi]=kmail,composer, kirjoittaminen
 X-KDE-Keywords[fr]=kmail,éditeur
 X-KDE-Keywords[ga]=kmail,cumadóir
diff -Nru kmail-19.04.3/src/data/kmail_config_misc.desktop kmail-19.12.3/src/data/kmail_config_misc.desktop
--- kmail-19.04.3/src/data/kmail_config_misc.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/kmail_config_misc.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -30,7 +30,7 @@
 Name[en_GB]=Misc
 Name[es]=Varios
 Name[et]=Muud
-Name[eu]=Miszelanea
+Name[eu]=Hainbat
 Name[fi]=Muut
 Name[fr]=Divers
 Name[fy]=Ferskate
@@ -115,7 +115,7 @@
 Comment[kk]=Басқа параметрлері
 Comment[km]=ការ​កំណត់​ដែល​មិន​ត្រូវ​នឹង​កន្លែង​ផ្សេង
 Comment[ko]=어떤 곳에도 어울리지 않는 설정
-Comment[lt]=Kiti nustatymai
+Comment[lt]=Kitos nuostatos
 Comment[lv]=Iestatījumi, kas citur neiederas
 Comment[mk]=Поставувања што не се вклопуваат на друго место
 Comment[mr]=कोठेही न बसणाऱ्या संयोजना
@@ -140,7 +140,7 @@
 Comment[sr@latin]=Postavke koje ne pripadaju drugde
 Comment[sv]=Inställningar som inte passar någon annanstans
 Comment[ta]=அமைப்புகள் எந்த இடத்திலும் பொருந்தவில்லை
-Comment[tg]=Дигар танзимотҳо
+Comment[tg]=Дигар танзимот
 Comment[tr]=Diğer bölümlere uymayan yapılandırma seçenekleri
 Comment[uk]=Інші параметри
 Comment[wa]=Apontiaedjes k' on n' sait wice mete d' ôte
@@ -159,6 +159,7 @@
 X-KDE-Keywords[en_GB]=kmail,misc
 X-KDE-Keywords[es]=kmail,miscelánea
 X-KDE-Keywords[et]=kmail,muud
+X-KDE-Keywords[eu]=kmail,hainbat
 X-KDE-Keywords[fi]=kmail,misc,muut
 X-KDE-Keywords[fr]=kmail,divers
 X-KDE-Keywords[ga]=kmail,éagsúil
diff -Nru kmail-19.04.3/src/data/kmail_config_plugins.desktop kmail-19.12.3/src/data/kmail_config_plugins.desktop
--- kmail-19.04.3/src/data/kmail_config_plugins.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/kmail_config_plugins.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -30,7 +30,7 @@
 Name[eo]=Kromaĵoj
 Name[es]=Complementos
 Name[et]=Pluginad
-Name[eu]=Plugin-ak
+Name[eu]=Pluginak
 Name[fa]=وصله‌ها
 Name[fi]=Liitännäiset
 Name[fr]=Modules externes
@@ -93,9 +93,11 @@
 Comment[en_GB]=Settings Plugins
 Comment[es]=Preferencias de complementos
 Comment[et]=Seadistusplugin
+Comment[eu]=Ezarpen pluginak
 Comment[fi]=Asetusliitännäiset
 Comment[fr]=Modules de paramètres
 Comment[gl]=Complementos de configuración
+Comment[ia]=Plugins de preferentias
 Comment[it]=Estensioni per le impostazioni
 Comment[ko]=설정 플러그인
 Comment[nl]=Plug-ins voor instellingen
@@ -125,9 +127,11 @@
 X-KDE-Keywords[en_GB]=kmail,plugins
 X-KDE-Keywords[es]=kmail,complementos
 X-KDE-Keywords[et]=kmail,pluginad
+X-KDE-Keywords[eu]=kmail,pluginak
 X-KDE-Keywords[fi]=kmail,liitännäiset
 X-KDE-Keywords[fr]=kmail,modules
 X-KDE-Keywords[gl]=kmail,complementos
+X-KDE-Keywords[ia]=kmail,plugins
 X-KDE-Keywords[it]=kmail,estensioni
 X-KDE-Keywords[ko]=kmail,plugins,플러그인
 X-KDE-Keywords[nl]=kmail,plug-ins
diff -Nru kmail-19.04.3/src/data/kmail_config_security.desktop kmail-19.12.3/src/data/kmail_config_security.desktop
--- kmail-19.04.3/src/data/kmail_config_security.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/kmail_config_security.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -31,7 +31,7 @@
 Name[eo]=Sekureco
 Name[es]=Seguridad
 Name[et]=Turvalisus
-Name[eu]=Sekuritatea
+Name[eu]=Segurtasuna
 Name[fa]=امنیت
 Name[fi]=Turvallisuus
 Name[fr]=Sécurité
@@ -92,8 +92,8 @@
 Comment[bg]=Настройки на сигурността
 Comment[br]=Kefluniadur surentez ar buhez prevez
 Comment[bs]=Postavke sigurnosti i privatnosti
-Comment[ca]=Arranjament de seguretat i privadesa
-Comment[ca@valencia]=Arranjament de seguretat i privadesa
+Comment[ca]=Arranjament de la seguretat i privadesa
+Comment[ca@valencia]=Arranjament de la seguretat i privadesa
 Comment[cs]=Nastavení soukromí a zabezpečení
 Comment[da]=Sikkerheds- & Privathedsindstillinger
 Comment[de]=Sicherheit und Privatsphäre
@@ -102,7 +102,7 @@
 Comment[eo]=Agordoj pri Sekureco kaj Privateco
 Comment[es]=Preferencias de seguridad y privacidad
 Comment[et]=Turva- ja privaatsusseadistused
-Comment[eu]=Sekuritate & pribakortasun ezarpenak
+Comment[eu]=Segurtasun eta pribatutasun ezarpenak
 Comment[fa]=امنیت و تنظیمات محرمانگی
 Comment[fi]=Turvallisuus- ja yksityisyysasetukset
 Comment[fr]=Paramètres de sécurité et de confidentialité
@@ -119,7 +119,7 @@
 Comment[kk]=Қауіпсіздігі пен Дербестік параметрлері
 Comment[km]=ការ​កំណត់​សុវត្ថិភាព & ភាព​ឯកជន
 Comment[ko]=보안과 개인 정보 설정
-Comment[lt]=Saugumo ir privatumo nustatymai
+Comment[lt]=Saugumo ir privatumo nuostatos
 Comment[lv]=Drošības un privātuma iestatījumi
 Comment[mk]=Поставувања за безбедност и приватност
 Comment[mr]=सुरक्षा व गुप्तता संयोजना
@@ -164,6 +164,7 @@
 X-KDE-Keywords[en_GB]=kmail,security
 X-KDE-Keywords[es]=kmail,seguridad
 X-KDE-Keywords[et]=kmail,turvalisus
+X-KDE-Keywords[eu]=kmail,segurtasuna
 X-KDE-Keywords[fi]=kmail,security,turvallisuus
 X-KDE-Keywords[fr]=kmail,sécurité
 X-KDE-Keywords[ga]=kmail,slándáil
diff -Nru kmail-19.04.3/src/data/kmail_view.desktop kmail-19.12.3/src/data/kmail_view.desktop
--- kmail-19.04.3/src/data/kmail_view.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/kmail_view.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -11,6 +11,7 @@
 Name[en_GB]=KMail view
 Name[es]=Vista KMail
 Name[et]=KMaili vaade
+Name[eu]=KMail ikuspegia
 Name[fi]=KMail-näkymä
 Name[fr]=KMail view
 Name[ga]=Amharc KMail
diff -Nru kmail-19.04.3/src/data/org.kde.kmail2.appdata.xml kmail-19.12.3/src/data/org.kde.kmail2.appdata.xml
--- kmail-19.04.3/src/data/org.kde.kmail2.appdata.xml	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/org.kde.kmail2.appdata.xml	2020-03-02 07:34:49.000000000 +0000
@@ -13,6 +13,7 @@
   <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
   <developer_name xml:lang="fr">La communauté KDE</developer_name>
   <developer_name xml:lang="gl">A comunidade de KDE</developer_name>
+  <developer_name xml:lang="ia">Le communitate de KDE</developer_name>
   <developer_name xml:lang="id">Komunitas KDE</developer_name>
   <developer_name xml:lang="it">La comunità KDE</developer_name>
   <developer_name xml:lang="ko">KDE 커뮤니티</developer_name>
@@ -20,6 +21,7 @@
   <developer_name xml:lang="pl">Społeczność KDE</developer_name>
   <developer_name xml:lang="pt">A Comunidade do KDE</developer_name>
   <developer_name xml:lang="pt-BR">A comunidade KDE</developer_name>
+  <developer_name xml:lang="sk">KDE Komunita</developer_name>
   <developer_name xml:lang="sv">KDE-gemenskapen</developer_name>
   <developer_name xml:lang="uk">Спільнота KDE</developer_name>
   <developer_name xml:lang="x-test">xxThe KDE Communityxx</developer_name>
@@ -68,12 +70,14 @@
   <summary>A feature-rich email application</summary>
   <summary xml:lang="ca">Una aplicació de correu electrònic rica en característiques</summary>
   <summary xml:lang="ca-valencia">Una aplicació de correu electrònic rica en característiques</summary>
+  <summary xml:lang="cs">Dobře vybavená aplikace na e-maily</summary>
   <summary xml:lang="de">Ein E-Mail-Programm mit vielen Funktionen</summary>
   <summary xml:lang="en-GB">A feature-rich email application</summary>
   <summary xml:lang="es">Una aplicación de correo rica en características</summary>
   <summary xml:lang="fi">Sähköpostisovellus.</summary>
   <summary xml:lang="fr">Une application de courriel riche en fonctionnalités</summary>
-  <summary xml:lang="gl">Un aplicativo de correo electrónico con moitas funcionalidades</summary>
+  <summary xml:lang="gl">Unha aplicación de correo electrónico con moitas funcionalidades</summary>
+  <summary xml:lang="ia">Un application de e-posta ric de characteristicas</summary>
   <summary xml:lang="id">Sebuah aplikasi email yang kaya fitur</summary>
   <summary xml:lang="it">Un programma di posta elettronica ricco di funzioni</summary>
   <summary xml:lang="ko">다기능 이메일 프로그램</summary>
@@ -81,6 +85,7 @@
   <summary xml:lang="pl">Zaawansowana aplikacja pocztowa</summary>
   <summary xml:lang="pt">Uma aplicação de e-mail rica em funcionalidades</summary>
   <summary xml:lang="pt-BR">Um aplicativo de e-mail rico em recursos</summary>
+  <summary xml:lang="sk">E-mailová aplikácia bohatá na funkcie</summary>
   <summary xml:lang="sv">Ett funktionsrikt e-postprogram</summary>
   <summary xml:lang="uk">Багата на можливості програма для роботи з електронною пошти</summary>
   <summary xml:lang="x-test">xxA feature-rich email applicationxx</summary>
@@ -102,6 +107,8 @@
     <p xml:lang="nl">KMail is een zeer moderne e-mailclient die goed integreert met breed gebruikte e-mailleveranciers zoals GMail. Het biedt vele hulpmiddelen en functies om uw productiviteit te maximaliseren en maakt werken met grote e-mailaccounts gemakkelijk en snel. KMail ondersteunt een grote variëteit van e-mailprotocollen - POP3, IMAP, Microsoft Exchange (EWS) en meer.</p>
     <p xml:lang="pl">KMail jest pełnowartościowym klientem pocztowym, który współgra z powszechnie wykorzystywanymi dostawcami pocztowymi takimi jak GMail. Zapewnia wiele narzędzi i daje wiele możliwości do maksymalizacji produktywności przez co czyni zarządzanie dużymi kontami pocztowymi łatwym i szybkim. KMail obsługuje różne protokoły pocztowe - POP3, IMAP, Microsoft Exchange (EWS) i więcej.</p>
     <p xml:lang="pt">O KMail é um cliente de e-mail do estado-da-arte que se integra bem com os fornecedores de e-mail largamente usados, como o GMail. Ele oferece várias ferramentas e funcionalidades para maximizar a sua produtividade e torna simples e rápido o tratamento de contas de correio grandes. O KMail suporta uma grande variedade de protocolos de e-mail - POP3, IMAP, Microsoft Exchange (EWS), entre outros.</p>
+    <p xml:lang="pt-BR">KMail é um cliente de e-mail que se integra muito bem com os provedores de e-mail amplamente utilizados, como o GMail. Ele oferece várias ferramentas e funcionalidades para maximizar a sua produtividade e torna simples e rápido o tratamento de contas de e-mail grandes. O KMail tem suporte a uma grande variedade de protocolos de e-mail - POP3, IMAP, Microsoft Exchange (EWS), entre outros.</p>
+    <p xml:lang="sk">KMail je najmodernejší e-mailový klient, ktorý sa dobre integruje s bežne používanými poskytovateľmi e-mailov, ako je GMail. Poskytuje mnoho nástrojov a funkcií na maximalizáciu vašej produktivity, uľahčuje a zrýchľuje prácu s veľkými e-mailovými účtami. KMail podporuje veľké množstvo e-mailových protokolov - POP3, IMAP, Microsoft Exchange (EWS) a ďalšie.</p>
     <p xml:lang="sv">Kmail är en toppmodern e-postprogram som är väl integrerad med använda i stor utsträckning, såsom GMail. Det tillhandahåller många verktyg och funktioner för att maximera din produktivitet och gör det snabbt och enkelt att arbeta med stora e-postkonton. Kmail stöder ett stort antal e-postprotokoll: POP3, IMAP, Microsoft Exchange (EWS) med flera.</p>
     <p xml:lang="uk">KMail — самодостатня програма для роботи з електронною поштою, яка дуже просто інтегрується зі службами надання послуг електронної пошти, зокрема GMail. У ній передбачено багато засобів та можливостей максимального сприяння вашій продуктивності. Вона робить роботу із об'ємними архівами електронної пошти простою і швидкою. У KMail передбачено підтримку широкого діапазону протоколів електронної пошти — POP3, IMAP, Microsoft Exchange (EWS) тощо.</p>
     <p xml:lang="x-test">xxKMail is a state-of-the-art email client that integrates well with widely used email providers like GMail. It provides many tools and features to maximize your productivity and makes working with large email accounts easy and fast. KMail supports a large variety of email protocols - POP3, IMAP, Microsoft Exchange (EWS) and more.xx</p>
@@ -153,12 +160,14 @@
       <li xml:lang="es">Seguro - Kmail dispone de preferencias predeterminadas seguras, para proteger su confidencialidad, implementación de cifrado de principio a fin, y detección de correo basura.</li>
       <li xml:lang="fi">Turvallisuus: KMailin oletusasetukset turvaavat yksityisyytesi, salaavat viestin lähettäjältä vastaanottajalle ja tunnistavat roskapostin.</li>
       <li xml:lang="gl">Seguro — KMail ten unha configuración predeterminada segura para protexer a súa intimidade, unha gran compatibilidade con cifrado de punto a punto, e detección de correo non desexado.</li>
-      <li xml:lang="id">Aman - KMail memiliki setingan baku yang aman untuk melindungi privasi Anda, dukungan enkripsi end-to-end yang hebat, dan deteksi spam.</li>
+      <li xml:lang="id">Aman - KMail memiliki setingan baku yang aman untuk memproteksi privasi Anda, dukungan enkripsi end-to-end yang hebat, dan deteksi spam.</li>
       <li xml:lang="it">Sicuro - KMail ha impostazioni predefinite sicure per proteggere la tua riservatezza, un notevole supporto per la cifratura tra entrambi i capi della comunicazione (end-to-end), e il rilevamento dello spam.</li>
       <li xml:lang="ko">보안 - KMail의 기본 설정은 개인 정보 보호, 종단간 암호화 지원, 스팸 감지를 활성화합니다.</li>
       <li xml:lang="nl">Veilig - KMail heeft veilige standaard instellingen om uw privacy te beschermen, zeer goede ondersteuning van end-to-end encryptie en spamdetectie.</li>
       <li xml:lang="pl">Bezpieczny - Domyślne ustawienia KMail są bezpieczne, tak aby chronić twoją prywatność, zapewnić dobrą obsługę szyfrowania i wykrywania spamu.</li>
       <li xml:lang="pt">Seguro - o KMail tem configurações predefinidas seguras para proteger a sua privacidade, um suporte óptimo de encriptação de um extremo ao outro e detecção de lixo electrónico.</li>
+      <li xml:lang="pt-BR">Seguro - O KMail tem configurações predefinidas seguras para proteger a sua privacidade, um excelente suporte para criptografia de ponta-a-ponta e detecção de spam.</li>
+      <li xml:lang="sk">Bezpečný - KMail má bezpečné predvolené nastavenia na ochranu vášho súkromia, skvelú podporu šifrovania end-to-end a detekciu spamu.</li>
       <li xml:lang="sv">Säkert: Kmail har säkra standardinställningar för att skydda din integritet, enastående genomgående krypteringsstöd, och skräppostdetektering.</li>
       <li xml:lang="uk">Безпека — типові параметри роботи KMail є безпечними, вони захистять ваші конфіденційні дані, забезпечать наскрізне шифрування даних та запобігатимуть появі спаму.</li>
       <li xml:lang="x-test">xxSecure - KMail has secure default settings to protect your privacy, great end-to-end encryption support, and spam detection.xx</li>
@@ -168,13 +177,15 @@
       <li xml:lang="en-GB">Powerful - Features include offline support, multiple sender identities, multi-language support, powerful filtering, searching and tagging functionality, mailing list management and very flexible configuration.</li>
       <li xml:lang="es">Potente - Sus características incluyen el uso sin conexión, múltiples identidades del remitente, uso de varios idiomas, potente filtrado, funcionalidad de búsqueda y etiquetado, gestión de listas de correo y configuración muy flexible.</li>
       <li xml:lang="fi">Tehokkuus: Ominaisuuksina mm. verkoton tila, useammat lähettäjähenkilöydet, useiden kielten tuki, tehokas suodatus, haku- ja tunnistetoiminnot, postilistojen hallinta ja monipuoliset asetukset.</li>
-      <li xml:lang="gl">Potente — Entre as súas funcionalidades están traballar sen internet, dispoñer de múltiples identidades de remitente, dispoñibilidade en varios idiomas, potentes funcionalidades de filtro, busca e etiquetado, xestión de listas de correo e gran flexibilidade de configuración.</li>
+      <li xml:lang="gl">Potente — Entre as súas funcionalidades están traballar sen Internet, dispoñer de múltiples identidades de remitente, dispoñibilidade en varios idiomas, potentes funcionalidades de filtro, busca e etiquetado, xestión de listas de correo e gran flexibilidade de configuración.</li>
       <li xml:lang="id">Hebat - Fitur-fitur termasuk dukungan offline, multi identitas pengirim, dukungan multi-bahasa, pemfilteran yang hebat, fungsi pencarian dan penge-tag-an, pengelolaan milis dan konfigurasi yang sangat fleksibel.</li>
       <li xml:lang="it">Potente - le funzioni includono il supporto per il funzionamento non in linea, identità con mittenti diversi, supporto per diverse lingue, filtri potenti, funzioni di ricerca e assegnazione di etichette, gestione di mailing list e una configurazione davvero flessibile.</li>
       <li xml:lang="ko">강력함 - 오프라인 지원, 다중 보내는 사람 프로필, 다국어 지원, 강력한 필터, 검색, 태그 기능, 메일링 리스트 관리, 유연한 설정 기능이 있습니다.</li>
       <li xml:lang="nl">Krachtig - Functies omvatten offline ondersteuning, meerdere identiteiten als verzender, ondersteuning van meerdere talen, krachtige functionaliteit voor filtering, zoeken en taggen, beheer van e-mailijsten en erg flexibele configuratie.</li>
       <li xml:lang="pl">Zaawansowany - Możliwości uwzględniają obsługę programu bez sieci, wiele tożsamości osoby wysyłającej, wielojęzyczność, filtrowanie, wyszukiwanie, oznaczanie, lista mailingowa oraz elastyczne ustawienia.</li>
       <li xml:lang="pt">Poderoso - As funcionalidades incluem o suporte desligado, múltiplas identidades de envio, suporte para várias línguas, funcionalidades de filtragem, pesquisa e marcação poderosas, gestão de listas de correio e uma configuração bastante flexível.</li>
+      <li xml:lang="pt-BR">Poderoso - As funcionalidades incluem o suporte offline, múltiplas identidades de envio, suporte para vários idiomas, recursos de filtragem, pesquisa e marcação de etiquetas poderosos, gerenciamento de listas de discussão e uma configuração bastante flexível.</li>
+      <li xml:lang="sk">Výkonný - Medzi funkcie patrí podpora offline, viacnásobné identity odosielateľa, podpora viacerých jazykov, výkonné filtrovanie, vyhľadávanie a označovanie, správa zoznamov adries a veľmi flexibilná konfigurácia.</li>
       <li xml:lang="sv">Kraftfullt: Funktioner omfattar stöd för nerkopplad användning, flera avsändaridentiteter, stöd för flera språk, kraftfull filtrering, sökning och etikettfunktion, hantering av sändlistor och mycket flexibel inställning.</li>
       <li xml:lang="uk">Потужність — серед можливостей програми можливість роботи у автономному режимі (без з'єднання із інтернетом), робота із декількома профілями надсилання повідомлень, підтримка багатомовності, потужні можливості з фільтрування, пошуку та встановлення міток, керування повідомленнями зі списків листування та надзвичайна гнучкість у налаштовуванні.</li>
       <li xml:lang="x-test">xxPowerful - Features include offline support, multiple sender identities, multi-language support, powerful filtering, searching and tagging functionality, mailing list management and very flexible configuration.xx</li>
@@ -191,6 +202,8 @@
       <li xml:lang="nl">Geïntegreerd - invitaties voor bijeenkomsten kunnen gemakkelijk als afspraken in KOrganizer worden toegevoegd, automatisch aanvullen van adressen, avatars en voorkeuren voor versleuteling worden geladen uit KAddressBook.</li>
       <li xml:lang="pl">Zintegrowany - Zaproszenia na spotkania można łatwo dodać do wydarzeń w KOrganizerze. Uzupełnianie adresów, awatary i ustawienia kryptograficzne są wczytywane z KsiążkiAdresowej.</li>
       <li xml:lang="pt">Integrado - Os convites para reuniões podem ser facilmente adicionados como eventos ao KOrganizer; as definições de completação automática de endereços, avatars e encriptação são carregadas a partir do KAddressBook.</li>
+      <li xml:lang="pt-BR">Integrado - Os convites para reuniões podem ser facilmente adicionados como eventos ao KOrganizer, as preferências de completação automática de endereços, avatares e criptografia são carregadas a partir do KAddressBook.</li>
+      <li xml:lang="sk">Integrovaný - Pozvánky na schôdzky sa dajú ľahko pridávať, pretože udalosti do KOrganizer sa načítavajú z KAddressBook, automatické dopĺňanie adries, avatary a nastavenia šifrovania.</li>
       <li xml:lang="sv">Integrerat: Mötesinbjudan kan enkelt läggas till som händelser i Korganizer, automatisk komplettering av adresser, avatarer och kryptoinställningar läses in från adressboken.</li>
       <li xml:lang="uk">Інтеграція — реалізовано можливості простого додавання запрошень на зустрічі як записів подій у KOrganizer, дані автоматичного доповнення адрес, аватари та параметри шифрування завантажуються напряму з KAddressBook.</li>
       <li xml:lang="x-test">xxIntegrated - Meeting invitations can be easily added as events into KOrganizer, address auto-completion, avatars and crypto preferences are loaded from KAddressBook.xx</li>
@@ -207,6 +220,8 @@
       <li xml:lang="nl">Voldoet aan standaarden - ondersteuning van standaard e-mailprotocollen, push e-mail, filtering aan de kant van de server en inline OpenPGP, PGP/MIME en S/MIME.</li>
       <li xml:lang="pl">Zgodny ze standardami  - Obsługuje wiele protokołów pocztowych, popychanie poczty, filtrowanie po stronie serwera oraz OpenPGP, PGP/MIME i S/MIME w wierszu.</li>
       <li xml:lang="pt">Compatível com as Normas - Suporta os protocolos-padrão de correio, filtragem do lado do servidor e OpenPGP, PGP/MIME e S/MIME incorporados.</li>
+      <li xml:lang="pt-BR">Compatibilidade com os Padrões - Suporte aos protocolos-padrão de e-mail, filtragem do lado do servidor e OpenPGP, PGP/MIME e S/MIME integrados.</li>
+      <li xml:lang="sk">Podporuje štandardy - Podporuje štandardné poštové protokoly, push e-mail, filtrovanie na strane servera a inline OpenPGP, PGP/MIME a S/MIME.</li>
       <li xml:lang="sv">Standardkompatibelt: Stöder standardiserade e-postprotokoll, push e-post, filtrering på serversidan samt OpenPGP, PGP/MIME och S/MIME på plats.</li>
       <li xml:lang="uk">Сумісність зі стандартами — передбачено підтримку стандартних протоколів електронної пошти, надсилання повідомлень, фільтрування на боці сервера та вбудовування OpenPGP, PGP/MIME і S/MIME.</li>
       <li xml:lang="x-test">xxStandard Compliant - Supports standard mail protocols, push email, server-side filtering and inline OpenPGP, PGP/MIME and S/MIME.xx</li>
@@ -224,4 +239,10 @@
   <provides>
     <binary>kmail</binary>
   </provides>
+  <releases>
+    <release version="5.13.3" date="2020-03-05"/>
+    <release version="5.13.2" date="2020-02-06"/>
+    <release version="5.13.1" date="2020-01-09"/>
+    <release version="5.13.0" date="2019-12-12"/>
+  </releases>
 </component>
diff -Nru kmail-19.04.3/src/data/org.kde.kmail2.desktop kmail-19.12.3/src/data/org.kde.kmail2.desktop
--- kmail-19.04.3/src/data/org.kde.kmail2.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/data/org.kde.kmail2.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -154,13 +154,14 @@
 GenericName[zh_TW]=收發信軟體
 Comment=Send, receive and manage your mail with KMail
 Comment[ar]=أرسل البريد واستلمه وأدره عبر «بريدك»
-Comment[ca]=Envia, rep i administra el vostre correu amb el KMail
-Comment[ca@valencia]=Envia, rep i administra el vostre correu amb el KMail
+Comment[ca]=Envia, rep i gestiona el vostre correu amb el KMail
+Comment[ca@valencia]=Envia, rep i gestiona el vostre correu amb el KMail
 Comment[da]=Send, modtag og håndtér din e-mail med KMail
 Comment[de]=Senden, empfangen und verwalten Ihrer E-Mails mit KMail
 Comment[en_GB]=Send, receive and manage your mail with KMail
 Comment[es]=Enviar, recibir y gestionar su correo con KMail
 Comment[et]=Kirjade saatmine, saamine ja haldamine KMailiga
+Comment[eu]=Bidali, jaso eta kudeatu zure posta KMail erabiliz
 Comment[fi]=Lähetä, vastaanota ja hallitse postiasi KMaililla
 Comment[fr]=Envoyez, recevez et gérez vos courriels avec KMail
 Comment[gl]=Enviar, recibir e xestionar o correo con KMail.
@@ -190,7 +191,6 @@
 StartupNotify=true
 X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.kde.kmail
-X-KDE-ServiceTypes=DBUS/Mailer
 Categories=Qt;KDE;Office;Network;Email;
 MimeType=x-scheme-handler/mailto;
 InitialPreference=10
@@ -205,9 +205,11 @@
 Name[de]=Neue Nachricht ...
 Name[en_GB]=New Message...
 Name[es]=Nuevo mensaje...
+Name[eu]=Mezu berria...
 Name[fi]=Uusi viesti…
 Name[fr]=Nouveau message...
 Name[gl]=Nova mensaxe…
+Name[ia]=Nove message...
 Name[it]=Nuovo messaggio...
 Name[ko]=새 메시지...
 Name[nl]=Nieuw bericht...
@@ -216,6 +218,7 @@
 Name[pt]=Nova Mensagem...
 Name[pt_BR]=Nova mensagem...
 Name[ru]=Написать письмо...
+Name[sk]=Nová správa...
 Name[sl]=Novo sporočilo ...
 Name[sv]=Nytt brev...
 Name[uk]=Нове повідомлення…
@@ -236,9 +239,11 @@
 Name[en_GB]=Check Mail
 Name[es]=Comprobar correo
 Name[et]=E-posti kontrollimine
+Name[eu]=Egiaztatu posta
 Name[fi]=Tarkista posti
 Name[fr]=Relever le courriel
 Name[gl]=Comprobar o correo
+Name[ia]=Verifica posta
 Name[it]=Controlla posta
 Name[ko]=메일 확인
 Name[nl]=E-mail controleren
@@ -247,7 +252,7 @@
 Name[pt]=Verificar o Correio
 Name[pt_BR]=Verificar e-mails
 Name[ru]=Проверить почту
-Name[sk]=S&kontrolovať poštu
+Name[sk]=Skontrolovať poštu
 Name[sl]=Preveri pošto
 Name[sr]=Провери пошту
 Name[sr@ijekavian]=Провери пошту
diff -Nru kmail-19.04.3/src/data/org.kde.kmail.service.in kmail-19.12.3/src/data/org.kde.kmail.service.in
--- kmail-19.04.3/src/data/org.kde.kmail.service.in	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/data/org.kde.kmail.service.in	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.kde.kmail
+Exec=${CMAKE_INSTALL_FULL_BINDIR}/kmail
diff -Nru kmail-19.04.3/src/dialog/addemailtoexistingcontactdialog.h kmail-19.12.3/src/dialog/addemailtoexistingcontactdialog.h
--- kmail-19.04.3/src/dialog/addemailtoexistingcontactdialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/dialog/addemailtoexistingcontactdialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -31,7 +31,7 @@
     explicit AddEmailToExistingContactDialog(QWidget *parent);
     ~AddEmailToExistingContactDialog();
 
-    Akonadi::Item selectedContact() const;
+    Q_REQUIRED_RESULT Akonadi::Item selectedContact() const;
 
 private:
     void slotSelectionChanged();
diff -Nru kmail-19.04.3/src/dialog/archivefolderdialog.cpp kmail-19.12.3/src/dialog/archivefolderdialog.cpp
--- kmail-19.04.3/src/dialog/archivefolderdialog.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/dialog/archivefolderdialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -79,7 +79,7 @@
 
     int row = 0;
 
-    // TODO: Explaination label
+    // TODO: Explanation label
 
     QLabel *folderLabel = new QLabel(i18n("&Folder:"), mainWidget);
     mainLayout->addWidget(folderLabel, row, 0);
@@ -102,7 +102,7 @@
     mFormatComboBox->addItem(i18n("BZ2-Compressed Tar Archive (.tar.bz2)"));
     mFormatComboBox->addItem(i18n("GZ-Compressed Tar Archive (.tar.gz)"));
     mFormatComboBox->setCurrentIndex(2);
-    connect(mFormatComboBox, QOverload<int>::of(&KComboBox::activated), this, &ArchiveFolderDialog::slotFixFileExtension);
+    connect(mFormatComboBox, qOverload<int>(&KComboBox::activated), this, &ArchiveFolderDialog::slotFixFileExtension);
     mainLayout->addWidget(mFormatComboBox, row, 1);
     row++;
 
diff -Nru kmail-19.04.3/src/dialog/archivefolderdialog.h kmail-19.12.3/src/dialog/archivefolderdialog.h
--- kmail-19.04.3/src/dialog/archivefolderdialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/dialog/archivefolderdialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -49,8 +49,8 @@
     void slotAccepted();
     void slotUrlChanged(const QString &);
 
-    bool allowToDeleteFolders(const Akonadi::Collection &folder) const;
-    QString standardArchivePath(const QString &folderName);
+    Q_REQUIRED_RESULT bool allowToDeleteFolders(const Akonadi::Collection &folder) const;
+    Q_REQUIRED_RESULT QString standardArchivePath(const QString &folderName);
 
     QWidget *mParentWidget = nullptr;
     QCheckBox *mDeleteCheckBox = nullptr;
diff -Nru kmail-19.04.3/src/dialog/kmknotify.cpp kmail-19.12.3/src/dialog/kmknotify.cpp
--- kmail-19.04.3/src/dialog/kmknotify.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/dialog/kmknotify.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -58,7 +58,7 @@
 
     mainLayout->addWidget(buttonBox);
 
-    connect(m_comboNotify, QOverload<int>::of(&QComboBox::activated), this, &KMKnotify::slotComboChanged);
+    connect(m_comboNotify, qOverload<int>(&QComboBox::activated), this, &KMKnotify::slotComboChanged);
     connect(okButton, &QPushButton::clicked, this, &KMKnotify::slotOk);
     connect(m_notifyWidget, &KNotifyConfigWidget::changed, this, &KMKnotify::slotConfigChanged);
     initCombobox();
@@ -107,7 +107,7 @@
     //TODO add other notifyrc here if necessary
 
     for (const QString &notify : lstNotify) {
-        const QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("knotifications5/") + notify);
+        const QString fullPath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("knotifications5/") + notify);
 
         if (!fullPath.isEmpty()) {
             const int slash = fullPath.lastIndexOf(QLatin1Char('/'));
diff -Nru kmail-19.04.3/src/dialog/spellcheckerconfigdialog.cpp kmail-19.12.3/src/dialog/spellcheckerconfigdialog.cpp
--- kmail-19.04.3/src/dialog/spellcheckerconfigdialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/dialog/spellcheckerconfigdialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+   Copyright (C) 2019 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 "spellcheckerconfigdialog.h"
+#include "kmkernel.h"
+#include "kmail_debug.h"
+#include <QCheckBox>
+#include <QLabel>
+
+#include <Sonnet/DictionaryComboBox>
+
+#include <KConfigGroup>
+
+SpellCheckerConfigDialog::SpellCheckerConfigDialog(QWidget *parent)
+    : Sonnet::ConfigDialog(parent)
+{
+    // Hackish way to hide the "Enable spell check by default" checkbox
+    // Our highlighter ignores this setting, so we should not expose its UI
+    QCheckBox *enabledByDefaultCB = findChild<QCheckBox *>(QStringLiteral("m_checkerEnabledByDefaultCB"));
+    if (enabledByDefaultCB) {
+        enabledByDefaultCB->hide();
+    } else {
+        qCWarning(KMAIL_LOG) << "Could not find any checkbox named 'm_checkerEnabledByDefaultCB'. Sonnet::ConfigDialog must have changed!";
+    }
+    QLabel *textLabel = findChild<QLabel *>(QStringLiteral("textLabel1"));
+    if (textLabel) {
+        textLabel->hide();
+    } else {
+        qCWarning(KMAIL_LOG) << "Could not find any label named 'textLabel'. Sonnet::ConfigDialog must have changed!";
+    }
+    Sonnet::DictionaryComboBox *dictionaryComboBox = findChild<Sonnet::DictionaryComboBox *>(QStringLiteral("m_langCombo"));
+    if (dictionaryComboBox) {
+        dictionaryComboBox->hide();
+    } else {
+        qCWarning(KMAIL_LOG) << "Could not find any Sonnet::DictionaryComboBox named 'dictionaryComboBox'. Sonnet::ConfigDialog must have changed!";
+    }
+    readConfig();
+}
+
+SpellCheckerConfigDialog::~SpellCheckerConfigDialog()
+{
+    writeConfig();
+}
+
+void SpellCheckerConfigDialog::readConfig()
+{
+    KConfigGroup notifyDialog(KMKernel::self()->config(), "KMKnotifyDialog");
+    const QSize size = notifyDialog.readEntry("Size", QSize(600, 400));
+    if (size.isValid()) {
+        resize(size);
+    }
+}
+
+void SpellCheckerConfigDialog::writeConfig()
+{
+    KConfigGroup notifyDialog(KMKernel::self()->config(), "KMKnotifyDialog");
+    notifyDialog.writeEntry("Size", size());
+    notifyDialog.sync();
+}
diff -Nru kmail-19.04.3/src/dialog/spellcheckerconfigdialog.h kmail-19.12.3/src/dialog/spellcheckerconfigdialog.h
--- kmail-19.04.3/src/dialog/spellcheckerconfigdialog.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/dialog/spellcheckerconfigdialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,37 @@
+/*
+   Copyright (C) 2019 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 SPELLCHECKERCONFIGDIALOG_H
+#define SPELLCHECKERCONFIGDIALOG_H
+
+#include <Sonnet/ConfigDialog>
+
+class SpellCheckerConfigDialog : public Sonnet::ConfigDialog
+{
+    Q_OBJECT
+public:
+    explicit SpellCheckerConfigDialog(QWidget *parent = nullptr);
+    ~SpellCheckerConfigDialog();
+
+private:
+    void readConfig();
+    void writeConfig();
+};
+
+#endif // SPELLCHECKERCONFIGDIALOG_H
diff -Nru kmail-19.04.3/src/editor/attachment/attachmentcontroller.cpp kmail-19.12.3/src/editor/attachment/attachmentcontroller.cpp
--- kmail-19.04.3/src/editor/attachment/attachmentcontroller.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/attachment/attachmentcontroller.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -127,16 +127,17 @@
 
 void AttachmentController::onShowAttachment(KMime::Content *content, const QByteArray &charset)
 {
+    const QString charsetStr = QString::fromLatin1(charset);
     if (content->bodyAsMessage()) {
         KMime::Message::Ptr m(new KMime::Message);
         m->setContent(content->bodyAsMessage()->encodedContent());
         m->parse();
         KMReaderMainWin *win = new KMReaderMainWin();
-        win->showMessage(QString::fromLatin1(charset), m);
+        win->showMessage(charsetStr, m);
         win->show();
     } else {
         KMReaderMainWin *win
-            = new KMReaderMainWin(content, MessageViewer::Viewer::Text, QString::fromLatin1(charset));
+            = new KMReaderMainWin(content, MessageViewer::Viewer::Text, charsetStr);
         win->show();
     }
 }
diff -Nru kmail-19.04.3/src/editor/attachment/attachmentview.cpp kmail-19.12.3/src/editor/attachment/attachmentview.cpp
--- kmail-19.04.3/src/editor/attachment/attachmentview.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/attachment/attachmentview.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -39,7 +39,6 @@
 #include <QLabel>
 #include <QDrag>
 
-#include <KConfigGroup>
 #include <QIcon>
 #include <KLocalizedString>
 
diff -Nru kmail-19.04.3/src/editor/codec/codecaction.h kmail-19.12.3/src/editor/codec/codecaction.h
--- kmail-19.04.3/src/editor/codec/codecaction.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/codec/codecaction.h	2020-03-02 07:34:49.000000000 +0000
@@ -49,7 +49,7 @@
       mode.  In Reader mode it probably makes more sense to use KCodecAction::currentCodec()
       and KCodecAction::currentAutoDetectScript().
     */
-    QList<QByteArray> mimeCharsets() const;
+    Q_REQUIRED_RESULT QList<QByteArray> mimeCharsets() const;
 
     void setAutoCharset();
     void setCharset(const QByteArray &charset);
diff -Nru kmail-19.04.3/src/editor/codec/codecmanager.h kmail-19.12.3/src/editor/codec/codecmanager.h
--- kmail-19.04.3/src/editor/codec/codecmanager.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/codec/codecmanager.h	2020-03-02 07:34:49.000000000 +0000
@@ -33,7 +33,7 @@
     /**
       A list of preferred charsets to use when composing messages.
     */
-    QList<QByteArray> preferredCharsets() const;
+    Q_REQUIRED_RESULT QList<QByteArray> preferredCharsets() const;
 
     /**
       Re-read the preferred charsets from settings.
diff -Nru kmail-19.04.3/src/editor/kmcomposereditorng.cpp kmail-19.12.3/src/editor/kmcomposereditorng.cpp
--- kmail-19.04.3/src/editor/kmcomposereditorng.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/kmcomposereditorng.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -21,6 +21,7 @@
 #include "util.h"
 #include "kmail_debug.h"
 #include "job/dndfromarkjob.h"
+#include "dialog/spellcheckerconfigdialog.h"
 
 #include <QMenu>
 #include <KToggleAction>
@@ -124,30 +125,10 @@
 void KMComposerEditorNg::showSpellConfigDialog(const QString &configFileName)
 {
     Q_UNUSED(configFileName);
-    QPointer<Sonnet::ConfigDialog> dialog = new Sonnet::ConfigDialog(this);
+    QPointer<SpellCheckerConfigDialog> dialog = new SpellCheckerConfigDialog(this);
     if (!spellCheckingLanguage().isEmpty()) {
         dialog->setLanguage(spellCheckingLanguage());
     }
-    // Hackish way to hide the "Enable spell check by default" checkbox
-    // Our highlighter ignores this setting, so we should not expose its UI
-    QCheckBox *enabledByDefaultCB = dialog->findChild<QCheckBox *>(QStringLiteral("m_checkerEnabledByDefaultCB"));
-    if (enabledByDefaultCB) {
-        enabledByDefaultCB->hide();
-    } else {
-        qCWarning(KMAIL_LOG) << "Could not find any checkbox named 'm_checkerEnabledByDefaultCB'. Sonnet::ConfigDialog must have changed!";
-    }
-    QLabel *textLabel = dialog->findChild<QLabel *>(QStringLiteral("textLabel1"));
-    if (textLabel) {
-        textLabel->hide();
-    } else {
-        qCWarning(KMAIL_LOG) << "Could not find any label named 'textLabel'. Sonnet::ConfigDialog must have changed!";
-    }
-    Sonnet::DictionaryComboBox *dictionaryComboBox = dialog->findChild<Sonnet::DictionaryComboBox *>(QStringLiteral("m_langCombo"));
-    if (dictionaryComboBox) {
-        dictionaryComboBox->hide();
-    } else {
-        qCWarning(KMAIL_LOG) << "Could not find any Sonnet::DictionaryComboBox named 'dictionaryComboBox'. Sonnet::ConfigDialog must have changed!";
-    }
 
     if (dialog->exec()) {
         setSpellCheckingLanguage(dialog->language());
@@ -162,3 +143,11 @@
     }
     return MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus::NotConverted;
 }
+
+bool KMComposerEditorNg::processModifyText(QKeyEvent *event)
+{
+    if (!mComposerWin->processModifyText(event)) {
+        return MessageComposer::RichTextComposerNg::processModifyText(event);
+    }
+    return true;
+}
diff -Nru kmail-19.04.3/src/editor/kmcomposereditorng.h kmail-19.12.3/src/editor/kmcomposereditorng.h
--- kmail-19.04.3/src/editor/kmcomposereditorng.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/kmcomposereditorng.h	2020-03-02 07:34:49.000000000 +0000
@@ -30,7 +30,7 @@
     explicit KMComposerEditorNg(KMComposerWin *win, QWidget *parent);
     ~KMComposerEditorNg() override;
 
-    QString smartQuote(const QString &msg) override;
+    Q_REQUIRED_RESULT QString smartQuote(const QString &msg) override;
 
     void setHighlighterColors(KPIMTextEdit::RichTextComposerEmailQuoteHighlighter *highlighter) override;
 
@@ -41,6 +41,7 @@
     void insertSnippet();
 
 protected:
+    bool processModifyText(QKeyEvent *event) override;
     void addExtraMenuEntry(QMenu *menu, QPoint pos) override;
     bool canInsertFromMimeData(const QMimeData *source) const override;
     void insertFromMimeData(const QMimeData *source) override;
diff -Nru kmail-19.04.3/src/editor/kmcomposerglobalaction.cpp kmail-19.12.3/src/editor/kmcomposerglobalaction.cpp
--- kmail-19.04.3/src/editor/kmcomposerglobalaction.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/kmcomposerglobalaction.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -129,7 +129,6 @@
     }
 }
 
-
 void KMComposerGlobalAction::slotInsertEmoticon(const QString &str)
 {
     QWidget *fw = mComposerWin->focusWidget();
diff -Nru kmail-19.04.3/src/editor/kmcomposerwin.cpp kmail-19.12.3/src/editor/kmcomposerwin.cpp
--- kmail-19.04.3/src/editor/kmcomposerwin.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/kmcomposerwin.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -36,7 +36,6 @@
 #include "editor/potentialphishingemail/potentialphishingemailjob.h"
 #include "editor/potentialphishingemail/potentialphishingemailwarning.h"
 #include "editor/warningwidgets/incorrectidentityfolderwarning.h"
-#include "editor/widgets/snippetwidget.h"
 #include "job/addressvalidationjob.h"
 #include "job/createnewcontactjob.h"
 #include "job/saveasfilejob.h"
@@ -60,8 +59,7 @@
 #include "warningwidgets/externaleditorwarning.h"
 #include "widgets/cryptostateindicatorwidget.h"
 #include "widgets/kactionmenutransport.h"
-#include "widgets/statusbarlabeltoggledstate.h"
-
+#include "undosend/undosendmanager.h"
 #include <Akonadi/Contact/ContactGroupExpandJob>
 #include <Akonadi/KMime/MessageFlags>
 #include <Akonadi/KMime/MessageStatus>
@@ -101,6 +99,8 @@
 #include <MailCommon/FolderRequester>
 #include <MailCommon/FolderSettings>
 #include <MailCommon/MailKernel>
+#include <MailCommon/SnippetTreeView>
+#include <MailCommon/SnippetsManager>
 
 #include <MailTransport/Transport>
 #include <MailTransport/TransportComboBox>
@@ -124,6 +124,10 @@
 #include <MessageComposer/SignatureController>
 #include <MessageComposer/TextPart>
 #include <MessageComposer/Util>
+#include <MessageComposer/StatusBarLabelToggledState>
+#include <MessageComposer/ConvertSnippetVariablesJob>
+#include <MessageComposer/ComposerViewInterface>
+
 #include <Sonnet/DictionaryComboBox>
 
 #include <MessageCore/AttachmentPart>
@@ -159,11 +163,9 @@
 #include <KActionMenu>
 #include <KCharsets>
 #include <KConfigGroup>
-#include <KDescendantsProxyModel>
 #include <KEditToolBar>
 #include <KEmailAddress>
 #include <KEncodingFileDialog>
-#include <KHelpClient>
 #include <KIO/JobUiDelegate>
 #include <KIconUtils>
 #include <KMessageBox>
@@ -174,33 +176,23 @@
 #include <KStandardShortcut>
 #include <KToggleAction>
 #include <KToolBar>
-#include <KToolInvocation>
-#include <KXMLGUIFactory>
-
 #include <QDBusConnection>
-#include <QDBusMessage>
-#include <QTemporaryDir>
-#include <QTemporaryFile>
 #include <sonnet_version.h>
-
+#include <KXMLGUIFactory>
 // Qt includes
 #include <QAction>
 #include <QApplication>
 #include <QCheckBox>
 #include <QClipboard>
-#include <QFileDialog>
 #include <QFontDatabase>
 #include <QInputDialog>
 #include <QMenu>
 #include <QMimeData>
-#include <QMimeDatabase>
-#include <QMimeType>
 #include <QPointer>
 #include <QShortcut>
 #include <QSplitter>
 #include <QStandardPaths>
 #include <QStatusBar>
-#include <QTextDocumentWriter>
 #include <QMenuBar>
 #include <MessageComposer/PluginEditorConverterInitialData>
 #include <MessageComposer/PluginEditorConverterBeforeConvertingData>
@@ -308,7 +300,7 @@
     MailTransport::TransportComboBox *transport = new MailTransport::TransportComboBox(mHeadersArea);
     transport->setToolTip(i18n("Select the outgoing account to use for sending this message"));
     mComposerBase->setTransportCombo(transport);
-    connect(transport, QOverload<int>::of(&MailTransport::TransportComboBox::activated), this, &KMComposerWin::slotTransportChanged);
+    connect(transport, qOverload<int>(&MailTransport::TransportComboBox::activated), this, &KMComposerWin::slotTransportChanged);
     connect(transport, &MailTransport::TransportComboBox::transportRemoved, this, &KMComposerWin::slotTransportRemoved);
     mEdtFrom = new MessageComposer::ComposerLineEdit(false, mHeadersArea);
     mEdtFrom->setObjectName(QStringLiteral("fromLine"));
@@ -364,7 +356,7 @@
     mRichTextEditorwidget = new KPIMTextEdit::RichTextEditorWidget(composerEditorNg, mCryptoStateIndicatorWidget);
 
     connect(composerEditorNg, &KMComposerEditorNg::insertEmoticon, mGlobalAction, &KMComposerGlobalAction::slotInsertEmoticon);
-    //Don't use new connect api here. It crashs
+    //Don't use new connect api here. It crashes
     connect(composerEditorNg, SIGNAL(textChanged()), this, SLOT(slotEditorTextChanged()));
     connect(composerEditorNg, &KMComposerEditorNg::selectionChanged, this, &KMComposerWin::slotSelectionChanged);
     //connect(editor, &KMComposerEditor::textChanged, this, &KMComposeWin::slotEditorTextChanged);
@@ -390,7 +382,9 @@
     connect(composerEditorNg, &KMComposerEditorNg::spellCheckStatus, this, &KMComposerWin::slotSpellCheckingStatus);
     connect(composerEditorNg, &KMComposerEditorNg::insertModeChanged, this, &KMComposerWin::slotOverwriteModeChanged);
     connect(composerEditorNg, &KMComposerEditorNg::spellCheckingFinished, this, &KMComposerWin::slotDelayedCheckSendNow);
-    mSnippetWidget = new SnippetWidget(composerEditorNg, actionCollection(), mSnippetSplitter);
+    mSnippetWidget = new MailCommon::SnippetTreeView(actionCollection(), mSnippetSplitter);
+    connect(mSnippetWidget, &MailCommon::SnippetTreeView::insertSnippetInfo, this, &KMComposerWin::insertSnippetInfo);
+    connect(composerEditorNg, &KMComposerEditorNg::insertSnippet, mSnippetWidget->snippetsManager(), &MailCommon::SnippetsManager::insertSnippet);
     mSnippetWidget->setVisible(KMailSettings::self()->showSnippetManager());
     mSnippetSplitter->addWidget(mSnippetWidget);
     mSnippetSplitter->setCollapsible(0, false);
@@ -430,6 +424,7 @@
     mPluginEditorManagerInterface->setParentWidget(this);
     mPluginEditorManagerInterface->setRichTextEditor(mRichTextEditorwidget->editor());
     mPluginEditorManagerInterface->setActionCollection(actionCollection());
+    mPluginEditorManagerInterface->setComposerInterface(mComposerBase);
 
     mPluginEditorCheckBeforeSendManagerInterface->setParentWidget(this);
 
@@ -455,11 +450,11 @@
 
     applyMainWindowSettings(KMKernel::self()->config()->group("Composer"));
 
-    connect(mEdtSubject, &PimCommon::LineEditWithAutoCorrection::textChanged, this, &KMComposerWin::slotUpdateWindowTitle);
+    mUpdateWindowTitleConnection = connect(mEdtSubject, &PimCommon::LineEditWithAutoCorrection::textChanged, this, &KMComposerWin::slotUpdateWindowTitle);
     mIdentityConnection = connect(identity, &KIdentityManagement::IdentityCombo::identityChanged, [this](uint val) {
         slotIdentityChanged(val);
     });
-    connect(kmkernel->identityManager(), QOverload<uint>::of(&KIdentityManagement::IdentityManager::changed), this, [this](uint val) {
+    connect(kmkernel->identityManager(), qOverload<uint>(&KIdentityManagement::IdentityManager::changed), this, [this](uint val) {
         if (mComposerBase->identityCombo()->currentIdentity() == val) {
             slotIdentityChanged(val);
         }
@@ -506,6 +501,7 @@
 
 KMComposerWin::~KMComposerWin()
 {
+    disconnect(mUpdateWindowTitleConnection);
     // When we have a collection set, store the message back to that collection.
     // Note that when we save the message or sent it, mFolder is set back to 0.
     // So this for example kicks in when opening a draft and then closing the window.
@@ -517,6 +513,73 @@
     delete mComposerBase;
 }
 
+void KMComposerWin::insertSnippetInfo(const MailCommon::SnippetInfo &info)
+{
+    {
+        if (!info.to.isEmpty()) {
+            const QStringList lst = info.to.split(QLatin1Char(','));
+            for (const QString &addr : lst) {
+                mComposerBase->recipientsEditor()->addRecipient(addr, MessageComposer::Recipient::To);
+            }
+        }
+    }
+    {
+        if (!info.cc.isEmpty()) {
+            const QStringList lst = info.cc.split(QLatin1Char(','));
+            for (const QString &addr : lst) {
+                mComposerBase->recipientsEditor()->addRecipient(addr, MessageComposer::Recipient::Cc);
+            }
+        }
+    }
+    {
+        if (!info.bcc.isEmpty()) {
+            const QStringList lst = info.bcc.split(QLatin1Char(','));
+            for (const QString &addr : lst) {
+                mComposerBase->recipientsEditor()->addRecipient(addr, MessageComposer::Recipient::Bcc);
+            }
+        }
+    }
+    {
+        if (!info.attachment.isEmpty()) {
+            const QStringList lst = info.attachment.split(QLatin1Char(','));
+            for (const QString &attach : lst) {
+                const QUrl localUrl = QUrl::fromLocalFile(attach);
+                addAttachment(localUrl, QString());
+            }
+        }
+    }
+    {
+        if (!info.subject.isEmpty()) {
+            //Convert subject
+            MessageComposer::ConvertSnippetVariablesJob *job = new MessageComposer::ConvertSnippetVariablesJob(this);
+            job->setText(info.subject);
+            MessageComposer::ComposerViewInterface *interface = new MessageComposer::ComposerViewInterface(mComposerBase);
+            job->setComposerViewInterface(interface);
+            connect(job, &MessageComposer::ConvertSnippetVariablesJob::textConverted, this, [this](const QString &str) {
+                if (!str.isEmpty()) {
+                    if (mComposerBase->subject().isEmpty()) { //Add subject only if we don't have subject
+                        mEdtSubject->setText(str);
+                    }
+                }
+            });
+            job->start();
+        }
+    }
+    {
+        if (!info.text.isEmpty()) {
+            //Convert plain text
+            MessageComposer::ConvertSnippetVariablesJob *job = new MessageComposer::ConvertSnippetVariablesJob(this);
+            job->setText(info.text);
+            MessageComposer::ComposerViewInterface *interface = new MessageComposer::ComposerViewInterface(mComposerBase);
+            job->setComposerViewInterface(interface);
+            connect(job, &MessageComposer::ConvertSnippetVariablesJob::textConverted, this, [this](const QString &str) {
+                mComposerBase->editor()->insertPlainText(str);
+            });
+            job->start();
+        }
+    }
+}
+
 void KMComposerWin::slotSpellCheckingLanguage(const QString &language)
 {
     mComposerBase->editor()->setSpellCheckingLanguage(language);
@@ -836,9 +899,9 @@
     mGrid->addWidget(mComposerBase->recipientsEditor(), row, 0, 1, 2);
     ++row;
     connect(mEdtFrom, &MessageComposer::ComposerLineEdit::focusDown, mComposerBase->recipientsEditor(), &KPIM::MultiplyingLineEditor::setFocusTop);
-    connect(mComposerBase->recipientsEditor(), &KPIM::MultiplyingLineEditor::focusUp, mEdtFrom, QOverload<>::of(&QWidget::setFocus));
+    connect(mComposerBase->recipientsEditor(), &KPIM::MultiplyingLineEditor::focusUp, mEdtFrom, qOverload<>(&QWidget::setFocus));
 
-    connect(mComposerBase->recipientsEditor(), &KPIM::MultiplyingLineEditor::focusDown, mEdtSubject, QOverload<>::of(&QWidget::setFocus));
+    connect(mComposerBase->recipientsEditor(), &KPIM::MultiplyingLineEditor::focusDown, mEdtSubject, qOverload<>(&QWidget::setFocus));
     connect(mEdtSubject, &PimCommon::SpellCheckLineEdit::focusUp, mComposerBase->recipientsEditor(), &KPIM::MultiplyingLineEditor::setFocusBottom);
 
     prevFocus = mComposerBase->recipientsEditor();
@@ -1106,7 +1169,6 @@
         mRecentAction->addUrl(QUrl(url));
     }
 
-
     action = new QAction(QIcon::fromTheme(QStringLiteral("x-office-address-book")), i18n("&Address Book"), this);
     KMail::Util::addQActionHelpText(action, i18n("Open Address Book"));
     actionCollection()->addAction(QStringLiteral("addressbook"), action);
@@ -1289,7 +1351,7 @@
 
     mCryptoModuleAction = new KSelectAction(i18n("&Cryptographic Message Format"), this);
     actionCollection()->addAction(QStringLiteral("options_select_crypto"), mCryptoModuleAction);
-    connect(mCryptoModuleAction, QOverload<int>::of(&KSelectAction::triggered), this, &KMComposerWin::slotCryptoModuleSelected);
+    connect(mCryptoModuleAction, qOverload<int>(&KSelectAction::triggered), this, &KMComposerWin::slotCryptoModuleSelected);
     mCryptoModuleAction->setToolTip(i18n("Select a cryptographic format for this message"));
     mCryptoModuleAction->setItems(listCryptoFormat);
 
@@ -1351,7 +1413,7 @@
             localEditorManagerActionsType.next();
             QList<QAction *> lst = localEditorManagerActionsType.value();
             if (!lst.isEmpty()) {
-                const QString actionlistname = QStringLiteral("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(localEditorManagerActionsType.key());
+                const QString actionlistname = QLatin1String("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(localEditorManagerActionsType.key());
                 hashActions.insert(actionlistname, lst);
             }
         }
@@ -1360,7 +1422,7 @@
             localEditorConvertTextManagerActionsType.next();
             QList<QAction *> lst = localEditorConvertTextManagerActionsType.value();
             if (!lst.isEmpty()) {
-                const QString actionlistname = QStringLiteral("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(localEditorConvertTextManagerActionsType.key());
+                const QString actionlistname = QLatin1String("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(localEditorConvertTextManagerActionsType.key());
                 if (hashActions.contains(actionlistname)) {
                     lst = hashActions.value(actionlistname) + lst;
                     hashActions.remove(actionlistname);
@@ -1370,7 +1432,7 @@
         }
 
         const QList<KToggleAction *> customToolsWidgetActionList = mCustomToolsWidget->actionList();
-        const QString actionlistname = QStringLiteral("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(MessageComposer::PluginActionType::Tools);
+        const QString actionlistname = QLatin1String("kmaileditor") + MessageComposer::PluginActionType::actionXmlExtension(MessageComposer::PluginActionType::Tools);
         for (KToggleAction *act : customToolsWidgetActionList) {
             QList<QAction *> lst;
             lst << act;
@@ -1442,15 +1504,15 @@
     mCursorColumnLabel->setTextFormat(Qt::PlainText);
     statusBar()->addPermanentWidget(mCursorColumnLabel);
 
-    mStatusBarLabelToggledOverrideMode = new StatusBarLabelToggledState(this);
+    mStatusBarLabelToggledOverrideMode = new MessageComposer::StatusBarLabelToggledState(this);
     mStatusBarLabelToggledOverrideMode->setStateString(i18n("OVR"), i18n("INS"));
     statusBar()->addPermanentWidget(mStatusBarLabelToggledOverrideMode, 0);
-    connect(mStatusBarLabelToggledOverrideMode, &StatusBarLabelToggledState::toggleModeChanged, this, &KMComposerWin::slotOverwriteModeWasChanged);
+    connect(mStatusBarLabelToggledOverrideMode, &MessageComposer::StatusBarLabelToggledState::toggleModeChanged, this, &KMComposerWin::slotOverwriteModeWasChanged);
 
-    mStatusBarLabelSpellCheckingChangeMode = new StatusBarLabelToggledState(this);
+    mStatusBarLabelSpellCheckingChangeMode = new MessageComposer::StatusBarLabelToggledState(this);
     mStatusBarLabelSpellCheckingChangeMode->setStateString(i18n("Spellcheck: on"), i18n("Spellcheck: off"));
     statusBar()->addPermanentWidget(mStatusBarLabelSpellCheckingChangeMode, 0);
-    connect(mStatusBarLabelSpellCheckingChangeMode, &StatusBarLabelToggledState::toggleModeChanged, this, &KMComposerWin::slotAutoSpellCheckingToggled);
+    connect(mStatusBarLabelSpellCheckingChangeMode, &MessageComposer::StatusBarLabelToggledState::toggleModeChanged, this, &KMComposerWin::slotAutoSpellCheckingToggled);
 }
 
 void KMComposerWin::setupEditor()
@@ -1693,7 +1755,7 @@
         //
         // Espen 2000-05-16
         // Delay the signature appending. It may start a fileseletor.
-        // Not user friendy if this modal fileseletor opens before the
+        // Not user friendly if this modal fileseletor opens before the
         // composer.
         //
         if (MessageComposer::MessageComposerSettings::self()->prependSignature()) {
@@ -1739,6 +1801,10 @@
     if (col.isValid()) {
         mComposerBase->setFcc(col);
         mFccFolder->setCollection(col);
+        mIncorrectIdentityFolderWarning->clearFccInvalid();
+    } else {
+        mIncorrectIdentityFolderWarning->fccIsInvalid();
+        qCWarning(KMAIL_LOG) << "setFcc: collection invalid " << idString;
     }
 }
 
@@ -1869,8 +1935,11 @@
     }
 }
 
-void KMComposerWin::slotSendSuccessful()
+void KMComposerWin::slotSendSuccessful(Akonadi::Item::Id id)
 {
+    if (id != -1) {
+        UndoSendManager::self()->addItem(id, subject(), KMailSettings::self()->undoSendDelay());
+    }
     setModified(false);
     mComposerBase->cleanupAutoSave();
     mFolder = Akonadi::Collection(); // see dtor
@@ -1973,8 +2042,8 @@
 bool KMComposerWin::showErrorMessage(KJob *job)
 {
     if (job->error()) {
-        if (static_cast<KIO::Job *>(job)->uiDelegate()) {
-            static_cast<KIO::Job *>(job)->uiDelegate()->showErrorMessage();
+        if (auto uiDelegate = static_cast<KIO::Job *>(job)->uiDelegate()) {
+            uiDelegate->showErrorMessage();
         } else {
             qCDebug(KMAIL_LOG) << " job->errorString() :" << job->errorString();
         }
@@ -2187,6 +2256,9 @@
 void KMComposerWin::slotPasteAsAttachment()
 {
     const QMimeData *mimeData = QApplication::clipboard()->mimeData();
+    if (!mimeData) {
+        return;
+    }
     if (insertFromMimeData(mimeData, true)) {
         return;
     }
@@ -2288,6 +2360,7 @@
 void KMComposerWin::slotUpdateWindowTitle()
 {
     QString s(mEdtSubject->toPlainText());
+    mComposerBase->setSubject(s);
     // Remove characters that show badly in most window decorations:
     // newlines tend to become boxes.
     if (s.isEmpty()) {
@@ -2509,10 +2582,12 @@
 
 void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn, bool willSendItWithoutReediting)
 {
-    const MessageComposer::ComposerViewBase::MissingAttachment forgotAttachment = userForgotAttachment();
-    if ((forgotAttachment == MessageComposer::ComposerViewBase::FoundMissingAttachmentAndAddedAttachment)
-        || (forgotAttachment == MessageComposer::ComposerViewBase::FoundMissingAttachmentAndCancel)) {
-        return;
+    if (saveIn == MessageComposer::MessageSender::SaveInNone) {
+        const MessageComposer::ComposerViewBase::MissingAttachment forgotAttachment = userForgotAttachment();
+        if ((forgotAttachment == MessageComposer::ComposerViewBase::FoundMissingAttachmentAndAddedAttachment)
+            || (forgotAttachment == MessageComposer::ComposerViewBase::FoundMissingAttachmentAndCancel)) {
+            return;
+        }
     }
 
     //TODO generate new message from plugins.
@@ -2527,6 +2602,20 @@
         if (!MessageComposer::Util::sendMailDispatcherIsOnline()) {
             method = MessageComposer::MessageSender::SendLater;
         }
+        if (KMailSettings::self()->enabledUndoSend()) {
+            mComposerBase->setSendLaterInfo(nullptr);
+            const bool wasRegistered = sendLaterRegistered();
+            if (wasRegistered) {
+                SendLater::SendLaterInfo *info = new SendLater::SendLaterInfo;
+                info->setRecurrence(false);
+                info->setSubject(subject());
+                info->setDateTime(QDateTime::currentDateTime().addSecs(KMailSettings::self()->undoSendDelay()));
+                mComposerBase->setSendLaterInfo(info);
+            }
+            method = MessageComposer::MessageSender::SendLater;
+            willSendItWithoutReediting = true;
+            saveIn = MessageComposer::MessageSender::SaveInOutbox;
+        }
     }
 
     if (saveIn == MessageComposer::MessageSender::SaveInNone || willSendItWithoutReediting) {   // don't save as draft or template, send immediately
@@ -2604,7 +2693,7 @@
         setEnabled(false);
 
         // Validate the To:, CC: and BCC fields
-        AddressValidationJob *job = new AddressValidationJob(recipients.join(QStringLiteral(", ")), this, this);
+        AddressValidationJob *job = new AddressValidationJob(recipients.join(QLatin1String(", ")), this, this);
         job->setDefaultDomain(defaultDomainName);
         job->setProperty("method", static_cast<int>(method));
         job->setProperty("saveIn", static_cast<int>(saveIn));
@@ -2695,6 +2784,11 @@
     mComposerBase->send(method, saveIn, false);
 }
 
+bool KMComposerWin::sendLaterRegistered() const
+{
+    return SendLater::SendLaterUtil::sentLaterAgentWasRegistered() && SendLater::SendLaterUtil::sentLaterAgentEnabled();
+}
+
 void KMComposerWin::slotSendLater()
 {
     if (!TransportManager::self()->showTransportCreationDialog(this, TransportManager::IfNoTransportExists)) {
@@ -2705,7 +2799,7 @@
     }
     mComposerBase->setSendLaterInfo(nullptr);
     if (mComposerBase->editor()->checkExternalEditorFinished()) {
-        const bool wasRegistered = (SendLater::SendLaterUtil::sentLaterAgentWasRegistered() && SendLater::SendLaterUtil::sentLaterAgentEnabled());
+        const bool wasRegistered = sendLaterRegistered();
         if (wasRegistered) {
             SendLater::SendLaterInfo *info = nullptr;
             QPointer<SendLater::SendLaterDialog> dlg = new SendLater::SendLaterDialog(info, this);
@@ -3331,6 +3425,11 @@
     mExtraHeaders = headers;
 }
 
+bool KMComposerWin::processModifyText(QKeyEvent *event)
+{
+    return mPluginEditorManagerInterface->processProcessKeyEvent(event);
+}
+
 MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus KMComposerWin::convertPlainText(MessageComposer::TextPart *textPart)
 {
     return mPluginEditorConvertTextManagerInterface->convertTextToFormat(textPart);
diff -Nru kmail-19.04.3/src/editor/kmcomposerwin.h kmail-19.12.3/src/editor/kmcomposerwin.h
--- kmail-19.04.3/src/editor/kmcomposerwin.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/kmcomposerwin.h	2020-03-02 07:34:49.000000000 +0000
@@ -62,11 +62,9 @@
 class KToggleAction;
 class QUrl;
 class KRecentFilesAction;
-class SnippetWidget;
 class AttachmentMissingWarning;
 class ExternalEditorWarning;
 class CryptoStateIndicatorWidget;
-class StatusBarLabelToggledState;
 class PotentialPhishingEmailWarning;
 class KMComposerGlobalAction;
 class KMailPluginEditorManagerInterface;
@@ -94,10 +92,13 @@
 namespace MessageComposer {
 class ComposerLineEdit;
 class Composer;
+class StatusBarLabelToggledState;
 }
 
 namespace MailCommon {
 class FolderRequester;
+class SnippetTreeView;
+struct SnippetInfo;
 }
 
 namespace PimCommon {
@@ -186,7 +187,7 @@
     /**
       * Returns @c true while the message composing is in progress.
       */
-    bool isComposing() const override;
+    Q_REQUIRED_RESULT bool isComposing() const override;
 
     /** Disabled signing and encryption completely for this composer window. */
     void setSigningAndEncryptionDisabled(bool v) override;
@@ -212,7 +213,8 @@
 
     void addExtraCustomHeaders(const QMap<QByteArray, QString> &header) override;
 
-    MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus convertPlainText(MessageComposer::TextPart *textPart);
+    Q_REQUIRED_RESULT MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus convertPlainText(MessageComposer::TextPart *textPart);
+    Q_REQUIRED_RESULT bool processModifyText(QKeyEvent *event);
 private:
     /**
     * Write settings to app's config file.
@@ -357,7 +359,7 @@
     void slotPrintComposeResult(KJob *job);
 
     void slotSendFailed(const QString &msg, MessageComposer::ComposerViewBase::FailedType type);
-    void slotSendSuccessful();
+    void slotSendSuccessful(Akonadi::Item::Id id);
 
     /**
      *  toggle automatic spellchecking
@@ -406,7 +408,7 @@
     /** Don't check for forgotten attachments for a mail, eg. when sending out invitations. */
     void disableForgottenAttachmentsCheck() override;
 
-    uint currentIdentity() const;
+    Q_REQUIRED_RESULT uint currentIdentity() const;
     QList<KToggleAction *> customToolsList() const;
     QList<QAction *> pluginToolsActionListForPopupMenu() const;
 private:
@@ -472,13 +474,13 @@
     /**
      * Header fields.
      */
-    QString subject() const;
-    QString from() const;
+    Q_REQUIRED_RESULT QString subject() const;
+    Q_REQUIRED_RESULT QString from() const;
 
     /**
      * Ask for confirmation if the message was changed before close.
      */
-    bool queryClose() override;
+    Q_REQUIRED_RESULT bool queryClose() override;
 
     /**
      * Turn encryption on/off. If setByUser is true then a message box is shown
@@ -492,7 +494,7 @@
      */
     void setSigning(bool sign, bool setByUser = false);
 
-    MessageComposer::ComposerViewBase::MissingAttachment userForgotAttachment();
+    Q_REQUIRED_RESULT MessageComposer::ComposerViewBase::MissingAttachment userForgotAttachment();
     /**
      * Send the message.
      */
@@ -542,11 +544,13 @@
 
     void insertUrls(const QMimeData *source, const QList<QUrl> &urlList);
     void initializePluginActions();
-    bool showErrorMessage(KJob *job);
-    int validateLineWrapWidth();
+    Q_REQUIRED_RESULT bool showErrorMessage(KJob *job);
+    Q_REQUIRED_RESULT int validateLineWrapWidth();
     void slotSelectionChanged();
     void slotMessage(const QString &str);
     void slotEditorPluginInsertText(const QString &str);
+    void insertSnippetInfo(const MailCommon::SnippetInfo &info);
+    Q_REQUIRED_RESULT bool sendLaterRegistered() const;
 
     Akonadi::Collection mCollectionForNewMessage;
     QMap<QByteArray, QString> mExtraHeaders;
@@ -632,10 +636,11 @@
     QString mdbusObjectPath;
     static int s_composerNumber;
     QMetaObject::Connection mIdentityConnection;
+    QMetaObject::Connection mUpdateWindowTitleConnection;
 
     MessageComposer::ComposerViewBase *mComposerBase = nullptr;
 
-    SnippetWidget *mSnippetWidget = nullptr;
+    MailCommon::SnippetTreeView *mSnippetWidget = nullptr;
     PimCommon::CustomToolsWidgetNg *mCustomToolsWidget = nullptr;
     AttachmentMissingWarning *mAttachmentMissing = nullptr;
     ExternalEditorWarning *mExternalEditorWarning = nullptr;
@@ -648,8 +653,8 @@
     bool mSendNowByShortcutUsed = false;
     KSplitterCollapserButton *mSnippetSplitterCollapser = nullptr;
     KToggleAction *mFollowUpToggleAction = nullptr;
-    StatusBarLabelToggledState *mStatusBarLabelToggledOverrideMode = nullptr;
-    StatusBarLabelToggledState *mStatusBarLabelSpellCheckingChangeMode = nullptr;
+    MessageComposer::StatusBarLabelToggledState *mStatusBarLabelToggledOverrideMode = nullptr;
+    MessageComposer::StatusBarLabelToggledState *mStatusBarLabelSpellCheckingChangeMode = nullptr;
     PotentialPhishingEmailWarning *mPotentialPhishingEmailWarning = nullptr;
     IncorrectIdentityFolderWarning *mIncorrectIdentityFolderWarning = nullptr;
     KMComposerGlobalAction *mGlobalAction = nullptr;
diff -Nru kmail-19.04.3/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.h kmail-19.12.3/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.h
--- kmail-19.04.3/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/plugininterface/kmailplugineditorconverttextmanagerinterface.h	2020-03-02 07:34:49.000000000 +0000
@@ -45,8 +45,8 @@
     KPIMTextEdit::RichTextComposer *richTextEditor() const;
     void setRichTextEditor(KPIMTextEdit::RichTextComposer *richTextEditor);
 
-    QHash<MessageComposer::PluginActionType::Type, QList<QAction *> > actionsType();
-    QList<QAction *> actionsType(MessageComposer::PluginActionType::Type type);
+    Q_REQUIRED_RESULT QHash<MessageComposer::PluginActionType::Type, QList<QAction *> > actionsType();
+    Q_REQUIRED_RESULT QList<QAction *> actionsType(MessageComposer::PluginActionType::Type type);
 
     void reformatText();
     MessageComposer::PluginEditorConvertTextInterface::ConvertTextStatus convertTextToFormat(MessageComposer::TextPart *textPart);
@@ -55,7 +55,7 @@
     void setDataBeforeConvertingText(const MessageComposer::PluginEditorConverterBeforeConvertingData &data);
     void enableDisablePluginActions(bool richText);
 
-    QList<QWidget *> statusBarWidgetList();
+    Q_REQUIRED_RESULT QList<QWidget *> statusBarWidgetList();
 Q_SIGNALS:
     void reformatingTextDone();
 
diff -Nru kmail-19.04.3/src/editor/plugininterface/kmailplugineditormanagerinterface.cpp kmail-19.12.3/src/editor/plugininterface/kmailplugineditormanagerinterface.cpp
--- kmail-19.04.3/src/editor/plugininterface/kmailplugineditormanagerinterface.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/plugininterface/kmailplugineditormanagerinterface.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -20,6 +20,7 @@
 #include "kmailplugineditormanagerinterface.h"
 #include "messagecomposer/plugineditormanager.h"
 #include "messagecomposer/plugineditor.h"
+#include "messagecomposer/plugincomposerinterface.h"
 #include "kmail_debug.h"
 
 #include <QAction>
@@ -72,6 +73,9 @@
     for (MessageComposer::PluginEditor *plugin : lstPlugin) {
         if (plugin->isEnabled()) {
             MessageComposer::PluginEditorInterface *interface = static_cast<MessageComposer::PluginEditorInterface *>(plugin->createInterface(this));
+            MessageComposer::PluginComposerInterface *composerInterface = new MessageComposer::PluginComposerInterface;
+            composerInterface->setComposerViewBase(mComposerInterface);
+            interface->setComposerInterface(composerInterface);
             interface->setRichTextEditor(mRichTextEditor);
             interface->setParentWidget(mParentWidget);
             interface->createAction(mActionCollection);
@@ -89,6 +93,30 @@
     interface->exec();
 }
 
+MessageComposer::ComposerViewBase *KMailPluginEditorManagerInterface::composerInterface() const
+{
+    return mComposerInterface;
+}
+
+void KMailPluginEditorManagerInterface::setComposerInterface(MessageComposer::ComposerViewBase *composerInterface)
+{
+    mComposerInterface = composerInterface;
+}
+
+bool KMailPluginEditorManagerInterface::processProcessKeyEvent(QKeyEvent *event)
+{
+    if (!mListPluginInterface.isEmpty()) {
+        for (MessageComposer::PluginEditorInterface *interface : qAsConst(mListPluginInterface)) {
+            if (static_cast<MessageComposer::PluginEditor *>(interface->plugin())->canProcessKeyEvent()) {
+                if (interface->processProcessKeyEvent(event)) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
 KActionCollection *KMailPluginEditorManagerInterface::actionCollection() const
 {
     return mActionCollection;
diff -Nru kmail-19.04.3/src/editor/plugininterface/kmailplugineditormanagerinterface.h kmail-19.12.3/src/editor/plugininterface/kmailplugineditormanagerinterface.h
--- kmail-19.04.3/src/editor/plugininterface/kmailplugineditormanagerinterface.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/plugininterface/kmailplugineditormanagerinterface.h	2020-03-02 07:34:49.000000000 +0000
@@ -28,6 +28,7 @@
 }
 namespace MessageComposer {
 class PluginEditorInterface;
+class ComposerViewBase;
 }
 class KActionCollection;
 class KMailPluginEditorManagerInterface : public QObject
@@ -48,9 +49,14 @@
     KActionCollection *actionCollection() const;
     void setActionCollection(KActionCollection *actionCollection);
 
-    QHash<MessageComposer::PluginActionType::Type, QList<QAction *> > actionsType();
-    QList<QAction *> actionsType(MessageComposer::PluginActionType::Type type);
-    QList<QWidget *> statusBarWidgetList();
+    Q_REQUIRED_RESULT QHash<MessageComposer::PluginActionType::Type, QList<QAction *> > actionsType();
+    Q_REQUIRED_RESULT QList<QAction *> actionsType(MessageComposer::PluginActionType::Type type);
+    Q_REQUIRED_RESULT QList<QWidget *> statusBarWidgetList();
+
+    MessageComposer::ComposerViewBase *composerInterface() const;
+    void setComposerInterface(MessageComposer::ComposerViewBase *composerInterface);
+
+    Q_REQUIRED_RESULT bool processProcessKeyEvent(QKeyEvent *event);
 
 Q_SIGNALS:
     void textSelectionChanged(bool hasSelection);
@@ -61,6 +67,7 @@
     Q_DISABLE_COPY(KMailPluginEditorManagerInterface)
     void slotPluginActivated(MessageComposer::PluginEditorInterface *interface);
     KPIMTextEdit::RichTextEditor *mRichTextEditor = nullptr;
+    MessageComposer::ComposerViewBase *mComposerInterface = nullptr;
     QWidget *mParentWidget = nullptr;
     KActionCollection *mActionCollection = nullptr;
     QList<MessageComposer::PluginEditorInterface *> mListPluginInterface;
diff -Nru kmail-19.04.3/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp kmail-19.12.3/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp
--- kmail-19.04.3/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/potentialphishingemail/autotests/potentialphishingemailjobtest.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -86,9 +86,9 @@
 void PotentialPhishingEmailJobTest::shouldEmitSignal()
 {
     PotentialPhishingEmailJob *job = new PotentialPhishingEmailJob;
-    QSignalSpy spy(job, SIGNAL(potentialPhishingEmailsFound(QStringList)));
+    QSignalSpy spy(job, &PotentialPhishingEmailJob::potentialPhishingEmailsFound);
     job->setPotentialPhishingEmails((QStringList() << QStringLiteral("\"bla@kde.org\" <foo@kde.org>")));
-    job->start();
+    QVERIFY(job->start());
     QCOMPARE(spy.count(), 1);
 }
 
diff -Nru kmail-19.04.3/src/editor/potentialphishingemail/potentialphishingdetailwidget.cpp kmail-19.12.3/src/editor/potentialphishingemail/potentialphishingdetailwidget.cpp
--- kmail-19.04.3/src/editor/potentialphishingemail/potentialphishingdetailwidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/potentialphishingemail/potentialphishingdetailwidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -20,9 +20,9 @@
 #include "potentialphishingdetailwidget.h"
 
 #include <KConfigGroup>
-#include <QBoxLayout>
 #include <QLabel>
 #include <QListWidget>
+#include <QVBoxLayout>
 #include <KSharedConfig>
 #include <KLocalizedString>
 
diff -Nru kmail-19.04.3/src/editor/potentialphishingemail/potentialphishingemailjob.h kmail-19.12.3/src/editor/potentialphishingemail/potentialphishingemailjob.h
--- kmail-19.04.3/src/editor/potentialphishingemail/potentialphishingemailjob.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/potentialphishingemail/potentialphishingemailjob.h	2020-03-02 07:34:49.000000000 +0000
@@ -34,10 +34,10 @@
     void setEmailWhiteList(const QStringList &emails);
     void setPotentialPhishingEmails(const QStringList &emails);
 
-    QStringList potentialPhisingEmails() const;
-    bool start();
+    Q_REQUIRED_RESULT QStringList potentialPhisingEmails() const;
+    Q_REQUIRED_RESULT bool start();
 
-    QStringList checkEmails() const;
+    Q_REQUIRED_RESULT QStringList checkEmails() const;
 
 Q_SIGNALS:
     void potentialPhishingEmailsFound(const QStringList &emails);
diff -Nru kmail-19.04.3/src/editor/validatesendmailshortcut.cpp kmail-19.12.3/src/editor/validatesendmailshortcut.cpp
--- kmail-19.04.3/src/editor/validatesendmailshortcut.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/validatesendmailshortcut.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -45,7 +45,7 @@
                                                           i18n("Remove Shortcut"),
                                                           i18n("Ask Before Sending"),
                                                           i18n("Sending Without Confirmation"));
-    if (result == KMessageBox::Yes) {
+    if (result == QDialogButtonBox::Yes) {
         QAction *act = mActionCollection->action(QStringLiteral("send_mail"));
         if (act) {
             act->setShortcut(QKeySequence());
@@ -54,13 +54,13 @@
             qCDebug(KMAIL_LOG) << "Unable to find action named \"send_mail\"";
         }
         sendNow = false;
-    } else if (result == KMessageBox::No) {
+    } else if (result == QDialogButtonBox::No) {
         KMailSettings::self()->setConfirmBeforeSendWhenUseShortcut(true);
         sendNow = true;
-    } else if (result == KMessageBox::Ok) {
+    } else if (result == QDialogButtonBox::Ok) {
         KMailSettings::self()->setConfirmBeforeSendWhenUseShortcut(false);
         sendNow = true;
-    } else if (result == KMessageBox::Cancel) {
+    } else if (result == QDialogButtonBox::Cancel) {
         return false;
     }
     KMailSettings::self()->setCheckSendDefaultActionShortcut(true);
diff -Nru kmail-19.04.3/src/editor/validatesendmailshortcut.h kmail-19.12.3/src/editor/validatesendmailshortcut.h
--- kmail-19.04.3/src/editor/validatesendmailshortcut.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/validatesendmailshortcut.h	2020-03-02 07:34:49.000000000 +0000
@@ -26,7 +26,7 @@
     ValidateSendMailShortcut(KActionCollection *actionCollection, QWidget *parent = nullptr);
     ~ValidateSendMailShortcut();
 
-    bool validate();
+    Q_REQUIRED_RESULT bool validate();
 
 private:
     QWidget *mParent = nullptr;
diff -Nru kmail-19.04.3/src/editor/warningwidgets/autotests/incorrectidentityfolderwarningtest.cpp kmail-19.12.3/src/editor/warningwidgets/autotests/incorrectidentityfolderwarningtest.cpp
--- kmail-19.04.3/src/editor/warningwidgets/autotests/incorrectidentityfolderwarningtest.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/warningwidgets/autotests/incorrectidentityfolderwarningtest.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -19,9 +19,8 @@
 
 #include "incorrectidentityfolderwarningtest.h"
 #include "../incorrectidentityfolderwarning.h"
-#include <QBoxLayout>
 #include <QTest>
-
+#include <QHBoxLayout>
 QTEST_MAIN(IncorrectIdentityFolderWarningTest)
 
 IncorrectIdentityFolderWarningTest::IncorrectIdentityFolderWarningTest(QObject *parent)
diff -Nru kmail-19.04.3/src/editor/warningwidgets/incorrectidentityfolderwarning.cpp kmail-19.12.3/src/editor/warningwidgets/incorrectidentityfolderwarning.cpp
--- kmail-19.04.3/src/editor/warningwidgets/incorrectidentityfolderwarning.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/warningwidgets/incorrectidentityfolderwarning.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -58,6 +58,14 @@
     updateText();
 }
 
+void IncorrectIdentityFolderWarning::clearFccInvalid()
+{
+    if (mFccIsInvalid) {
+        mFccIsInvalid = false;
+        updateText();
+    }
+}
+
 void IncorrectIdentityFolderWarning::addNewLine(QString &str)
 {
     if (!str.isEmpty()) {
@@ -83,8 +91,13 @@
         addNewLine(text);
         text += i18n("Dictionary was not found. Please verify that you will use a correct dictionary.");
     }
-    setText(text);
-    animatedShow();
+    if (text.isEmpty()) {
+        animatedHide();
+        setText(QString());
+    } else {
+        setText(text);
+        animatedShow();
+    }
 }
 
 void IncorrectIdentityFolderWarning::slotHideAnnimationFinished()
diff -Nru kmail-19.04.3/src/editor/warningwidgets/incorrectidentityfolderwarning.h kmail-19.12.3/src/editor/warningwidgets/incorrectidentityfolderwarning.h
--- kmail-19.04.3/src/editor/warningwidgets/incorrectidentityfolderwarning.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/warningwidgets/incorrectidentityfolderwarning.h	2020-03-02 07:34:49.000000000 +0000
@@ -33,6 +33,7 @@
     void fccIsInvalid();
     void identityInvalid();
     void dictionaryInvalid();
+    void clearFccInvalid();
 
 private:
     void addNewLine(QString &str);
diff -Nru kmail-19.04.3/src/editor/widgets/snippetwidget.cpp kmail-19.12.3/src/editor/widgets/snippetwidget.cpp
--- kmail-19.04.3/src/editor/widgets/snippetwidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/widgets/snippetwidget.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-/***************************************************************************
- *   snippet feature from kdevelop/plugins/snippet/                        *
- *                                                                         *
- *   Copyright (C) 2007 by Robert Gruber                                   *
- *   rgruber@users.sourceforge.net                                         *
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "snippetwidget.h"
-
-#include "editor/kmcomposereditorng.h"
-
-#include <MailCommon/SnippetsManager>
-
-#include <kactioncollection.h>
-#include <KLocalizedString>
-#include <QMenu>
-
-#include <QContextMenuEvent>
-#include <QHeaderView>
-
-SnippetWidget::SnippetWidget(KMComposerEditorNg *editor, KActionCollection *actionCollection, QWidget *parent)
-    : QTreeView(parent)
-{
-    header()->hide();
-    setAcceptDrops(true);
-    setDragEnabled(true);
-    setRootIsDecorated(true);
-    setAlternatingRowColors(true);
-    mSnippetsManager = new MailCommon::SnippetsManager(actionCollection, this, this);
-    mSnippetsManager->setEditor(editor, "insertPlainText", SIGNAL(insertSnippet()));
-
-    setModel(mSnippetsManager->model());
-    setSelectionModel(mSnippetsManager->selectionModel());
-
-    connect(this, &QAbstractItemView::activated,
-            mSnippetsManager->insertSnippetAction(), &QAction::trigger);
-    connect(mSnippetsManager->model(), &QAbstractItemModel::rowsInserted,
-            this, &QTreeView::expandAll);
-    connect(mSnippetsManager->model(), &QAbstractItemModel::rowsRemoved,
-            this, &QTreeView::expandAll);
-
-    expandAll();
-}
-
-SnippetWidget::~SnippetWidget()
-{
-}
-
-void SnippetWidget::contextMenuEvent(QContextMenuEvent *event)
-{
-    QMenu popup;
-
-    const bool itemSelected = mSnippetsManager->selectionModel()->hasSelection();
-
-    bool canAddSnippet = true;
-    if (itemSelected) {
-        popup.setTitle(mSnippetsManager->selectedName());
-        if (mSnippetsManager->snippetGroupSelected()) {
-            popup.addAction(mSnippetsManager->editSnippetGroupAction());
-            popup.addAction(mSnippetsManager->deleteSnippetGroupAction());
-        } else {
-            canAddSnippet = false; // subsnippets are not permitted
-            popup.addAction(mSnippetsManager->addSnippetAction());
-            popup.addAction(mSnippetsManager->editSnippetAction());
-            popup.addAction(mSnippetsManager->deleteSnippetAction());
-            popup.addAction(mSnippetsManager->insertSnippetAction());
-        }
-        popup.addSeparator();
-    } else {
-        popup.setTitle(i18n("Text Snippets"));
-    }
-    if (canAddSnippet) {
-        popup.addAction(mSnippetsManager->addSnippetAction());
-    }
-    popup.addAction(mSnippetsManager->addSnippetGroupAction());
-
-    popup.exec(event->globalPos());
-}
-
-void SnippetWidget::dropEvent(QDropEvent *event)
-{
-    if (event->source() == this) {
-        event->setDropAction(Qt::MoveAction);
-    }
-    QTreeView::dropEvent(event);
-}
diff -Nru kmail-19.04.3/src/editor/widgets/snippetwidget.h kmail-19.12.3/src/editor/widgets/snippetwidget.h
--- kmail-19.04.3/src/editor/widgets/snippetwidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/editor/widgets/snippetwidget.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/***************************************************************************
- *   snippet feature from kdevelop/plugins/snippet/                        *
- *                                                                         *
- *   Copyright (C) 2007 by Robert Gruber                                   *
- *   rgruber@users.sourceforge.net                                         *
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef KMAIL_SNIPPETWIDGET_H
-#define KMAIL_SNIPPETWIDGET_H
-
-#include <QTreeView>
-
-namespace MailCommon {
-class SnippetsManager;
-}
-
-class KActionCollection;
-class KMComposerEditorNg;
-
-class QContextMenuEvent;
-
-/**
- * @author Robert Gruber
- */
-class SnippetWidget : public QTreeView
-{
-    Q_OBJECT
-public:
-    explicit SnippetWidget(KMComposerEditorNg *editor, KActionCollection *actionCollection, QWidget *parent = nullptr);
-    ~SnippetWidget() override;
-
-protected:
-    void contextMenuEvent(QContextMenuEvent *) override;
-    void dropEvent(QDropEvent *) override;
-
-private:
-    MailCommon::SnippetsManager *mSnippetsManager = nullptr;
-};
-
-#endif
diff -Nru kmail-19.04.3/src/folderarchive/folderarchiveaccountinfo.h kmail-19.12.3/src/folderarchive/folderarchiveaccountinfo.h
--- kmail-19.04.3/src/folderarchive/folderarchiveaccountinfo.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/folderarchive/folderarchiveaccountinfo.h	2020-03-02 07:34:49.000000000 +0000
@@ -35,27 +35,27 @@
         FolderByYears
     };
 
-    bool isValid() const;
+    Q_REQUIRED_RESULT bool isValid() const;
 
-    QString instanceName() const;
+    Q_REQUIRED_RESULT QString instanceName() const;
     void setInstanceName(const QString &instance);
 
     void setArchiveTopLevel(Akonadi::Collection::Id id);
-    Akonadi::Collection::Id archiveTopLevel() const;
+    Q_REQUIRED_RESULT Akonadi::Collection::Id archiveTopLevel() const;
 
     void setFolderArchiveType(FolderArchiveType type);
-    FolderArchiveType folderArchiveType() const;
+    Q_REQUIRED_RESULT FolderArchiveType folderArchiveType() const;
 
     void setEnabled(bool enabled);
-    bool enabled() const;
+    Q_REQUIRED_RESULT bool enabled() const;
 
     void setKeepExistingStructure(bool b);
-    bool keepExistingStructure() const;
+    Q_REQUIRED_RESULT bool keepExistingStructure() const;
 
     void writeConfig(KConfigGroup &config);
     void readConfig(const KConfigGroup &config);
 
-    bool operator==(const FolderArchiveAccountInfo &other) const;
+    Q_REQUIRED_RESULT bool operator==(const FolderArchiveAccountInfo &other) const;
 
 private:
     Akonadi::Collection::Id mArchiveTopLevelCollectionId = -1;
diff -Nru kmail-19.04.3/src/folderarchive/folderarchivecache.h kmail-19.12.3/src/folderarchive/folderarchivecache.h
--- kmail-19.04.3/src/folderarchive/folderarchivecache.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/folderarchive/folderarchivecache.h	2020-03-02 07:34:49.000000000 +0000
@@ -40,7 +40,7 @@
 
     void addToCache(const QString &resourceName, Akonadi::Collection::Id id);
 
-    Akonadi::Collection::Id collectionId(FolderArchiveAccountInfo *info);
+    Q_REQUIRED_RESULT Akonadi::Collection::Id collectionId(FolderArchiveAccountInfo *info);
 
     void clearCacheWithContainsCollection(Akonadi::Collection::Id id);
 
diff -Nru kmail-19.04.3/src/folderarchive/folderarchivemanager.cpp kmail-19.12.3/src/folderarchive/folderarchivemanager.cpp
--- kmail-19.04.3/src/folderarchive/folderarchivemanager.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/folderarchive/folderarchivemanager.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -32,8 +32,6 @@
 #include <KSharedConfig>
 #include <KNotification>
 #include <KLocalizedString>
-#include <QIcon>
-#include <KIconLoader>
 #include "kmail_debug.h"
 
 #include <QRegularExpression>
diff -Nru kmail-19.04.3/src/folderarchive/folderarchiveutil.h kmail-19.12.3/src/folderarchive/folderarchiveutil.h
--- kmail-19.04.3/src/folderarchive/folderarchiveutil.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/folderarchive/folderarchiveutil.h	2020-03-02 07:34:49.000000000 +0000
@@ -22,9 +22,9 @@
 #include <QString>
 namespace FolderArchive {
 namespace FolderArchiveUtil {
-QString groupConfigPattern();
-bool resourceSupportArchiving(const QString &resource);
-QString configFileName();
+Q_REQUIRED_RESULT QString groupConfigPattern();
+Q_REQUIRED_RESULT bool resourceSupportArchiving(const QString &resource);
+Q_REQUIRED_RESULT QString configFileName();
 }
 }
 
diff -Nru kmail-19.04.3/src/identity/identityaddvcarddialog.cpp kmail-19.12.3/src/identity/identityaddvcarddialog.cpp
--- kmail-19.04.3/src/identity/identityaddvcarddialog.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identityaddvcarddialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -67,7 +67,7 @@
     QHBoxLayout *hlay = new QHBoxLayout(); // inherits spacing
     vlay->addLayout(hlay);
 
-    mVCardPath = new KUrlRequester;
+    mVCardPath = new KUrlRequester(this);
     mVCardPath->setObjectName(QStringLiteral("kurlrequester_vcardpath"));
     mVCardPath->setMimeTypeFilters({QStringLiteral("text/vcard"), QStringLiteral("all/allfiles")});
 
diff -Nru kmail-19.04.3/src/identity/identityaddvcarddialog.h kmail-19.12.3/src/identity/identityaddvcarddialog.h
--- kmail-19.04.3/src/identity/identityaddvcarddialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identityaddvcarddialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -36,9 +36,9 @@
     explicit IdentityAddVcardDialog(const QStringList &shadowIdentities, QWidget *parent = nullptr);
     ~IdentityAddVcardDialog();
 
-    DuplicateMode duplicateMode() const;
-    QString duplicateVcardFromIdentity() const;
-    QUrl existingVCard() const;
+    Q_REQUIRED_RESULT DuplicateMode duplicateMode() const;
+    Q_REQUIRED_RESULT QString duplicateVcardFromIdentity() const;
+    Q_REQUIRED_RESULT QUrl existingVCard() const;
 
 private:
     QButtonGroup *mButtonGroup = nullptr;
diff -Nru kmail-19.04.3/src/identity/identitydialog.cpp kmail-19.12.3/src/identity/identitydialog.cpp
--- kmail-19.04.3/src/identity/identitydialog.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identitydialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -87,7 +87,6 @@
 #include <KLocalizedString>
 #include <kmessagebox.h>
 #include <kfileitem.h>
-#include <QUrl>
 #include "kmail_debug.h"
 #include <QPushButton>
 #include <QComboBox>
diff -Nru kmail-19.04.3/src/identity/identitydialog.h kmail-19.12.3/src/identity/identitydialog.h
--- kmail-19.04.3/src/identity/identitydialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identitydialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -99,9 +99,9 @@
     void slotVCardRemoved();
     void slotHelp();
 
-    bool keyMatchesEmailAddress(const GpgME::Key &key, const QString &email);
-    bool checkFolderExists(const QString &folder);
-    bool validateAddresses(const QString &addresses);
+    Q_REQUIRED_RESULT bool keyMatchesEmailAddress(const GpgME::Key &key, const QString &email);
+    Q_REQUIRED_RESULT bool checkFolderExists(const QString &folder);
+    Q_REQUIRED_RESULT bool validateAddresses(const QString &addresses);
     void updateVcardButton();
     void editVcard(const QString &filename);
     void unregisterSpecialCollection(qint64 id);
diff -Nru kmail-19.04.3/src/identity/identityeditvcarddialog.cpp kmail-19.12.3/src/identity/identityeditvcarddialog.cpp
--- kmail-19.04.3/src/identity/identityeditvcarddialog.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identityeditvcarddialog.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -127,3 +127,13 @@
     }
     return mVcardFileName;
 }
+
+void IdentityEditVcardDialog::reject()
+{
+    if (KMessageBox::questionYesNo(
+            this,
+            i18nc("@info", "Do you really want to cancel?"),
+            i18nc("@title:window", "Confirmation")) == KMessageBox::Yes) {
+        QDialog::reject(); // Discard current changes
+    }
+}
diff -Nru kmail-19.04.3/src/identity/identityeditvcarddialog.h kmail-19.12.3/src/identity/identityeditvcarddialog.h
--- kmail-19.04.3/src/identity/identityeditvcarddialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identityeditvcarddialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -39,8 +39,9 @@
     * @brief saveVcard
     * @return The file path for current vcard.
     */
-    QString saveVcard() const;
+    Q_REQUIRED_RESULT QString saveVcard() const;
 
+    void reject() override;
 Q_SIGNALS:
     void vcardRemoved();
 
diff -Nru kmail-19.04.3/src/identity/identitylistview.h kmail-19.12.3/src/identity/identitylistview.h
--- kmail-19.04.3/src/identity/identitylistview.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identitylistview.h	2020-03-02 07:34:49.000000000 +0000
@@ -53,7 +53,7 @@
     IdentityListViewItem(IdentityListView *parent, const KIdentityManagement::Identity &ident);
     IdentityListViewItem(IdentityListView *parent, QTreeWidgetItem *after, const KIdentityManagement::Identity &ident);
 
-    uint uoid() const;
+    Q_REQUIRED_RESULT uint uoid() const;
 
     KIdentityManagement::Identity &identity() const;
     virtual void setIdentity(const KIdentityManagement::Identity &ident);
diff -Nru kmail-19.04.3/src/identity/identitypage.cpp kmail-19.12.3/src/identity/identitypage.cpp
--- kmail-19.04.3/src/identity/identitypage.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identitypage.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -60,8 +60,8 @@
     mIPage.mIdentityList->setIdentityManager(mIdentityManager);
 
     connect(mIPage.mIdentityList, &QTreeWidget::itemSelectionChanged, this, &IdentityPage::slotIdentitySelectionChanged);
-    connect(this, QOverload<bool>::of(&IdentityPage::changed), this, &IdentityPage::slotIdentitySelectionChanged);
-    connect(mIPage.mIdentityList, QOverload<KMail::IdentityListViewItem *, const QString &>::of(&IdentityListView::rename),
+    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);
diff -Nru kmail-19.04.3/src/identity/identitypage.h kmail-19.12.3/src/identity/identitypage.h
--- kmail-19.04.3/src/identity/identitypage.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/identitypage.h	2020-03-02 07:34:49.000000000 +0000
@@ -44,7 +44,7 @@
     explicit IdentityPage(QWidget *parent = nullptr);
     ~IdentityPage() override;
 
-    QString helpAnchor() const;
+    Q_REQUIRED_RESULT QString helpAnchor() const;
 
     void load();
     void save() override;
diff -Nru kmail-19.04.3/src/identity/newidentitydialog.h kmail-19.12.3/src/identity/newidentitydialog.h
--- kmail-19.04.3/src/identity/newidentitydialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/newidentitydialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -48,9 +48,9 @@
     };
     explicit NewIdentityDialog(KIdentityManagement::IdentityManager *manager, QWidget *parent = nullptr);
 
-    QString identityName() const;
-    QString duplicateIdentity() const;
-    DuplicateMode duplicateMode() const;
+    Q_REQUIRED_RESULT QString identityName() const;
+    Q_REQUIRED_RESULT QString duplicateIdentity() const;
+    Q_REQUIRED_RESULT DuplicateMode duplicateMode() const;
 
 private:
     void slotHelp();
diff -Nru kmail-19.04.3/src/identity/xfaceconfigurator.cpp kmail-19.12.3/src/identity/xfaceconfigurator.cpp
--- kmail-19.04.3/src/identity/xfaceconfigurator.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/xfaceconfigurator.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -108,14 +108,14 @@
     QStackedWidget *widgetStack = new QStackedWidget(this);
     widgetStack->setEnabled(false);   // since !mEnableCheck->isChecked()
     vlay->addWidget(widgetStack, 1);
-    connect(sourceCombo, QOverload<int>::of(&QComboBox::highlighted), widgetStack, &QStackedWidget::setCurrentIndex);
-    connect(sourceCombo, QOverload<int>::of(&QComboBox::activated), widgetStack, &QStackedWidget::setCurrentIndex);
+    connect(sourceCombo, qOverload<int>(&QComboBox::highlighted), widgetStack, &QStackedWidget::setCurrentIndex);
+    connect(sourceCombo, qOverload<int>(&QComboBox::activated), widgetStack, &QStackedWidget::setCurrentIndex);
     connect(mEnableCheck, &QCheckBox::toggled, sourceCombo, &QComboBox::setEnabled);
     connect(mEnableCheck, &QCheckBox::toggled, widgetStack, &QStackedWidget::setEnabled);
     connect(mEnableCheck, &QCheckBox::toggled, label, &QLabel::setEnabled);
     // The focus might be still in the widget that is disabled
     connect(mEnableCheck, &QAbstractButton::clicked,
-            mEnableCheck, QOverload<>::of(&QWidget::setFocus));
+            mEnableCheck, qOverload<>(&QWidget::setFocus));
 
     int pageno = 0;
     // page 0: create X-Face from image file or address book entry
@@ -276,7 +276,7 @@
 
     if (!str.isEmpty()) {
         if (str.startsWith(QLatin1String("x-face:"), Qt::CaseInsensitive)) {
-            str = str.remove(QStringLiteral("x-face:"), Qt::CaseInsensitive);
+            str.remove(QStringLiteral("x-face:"), Qt::CaseInsensitive);
             mTextEdit->editor()->setPlainText(str);
         }
         KXFace xf;
diff -Nru kmail-19.04.3/src/identity/xfaceconfigurator.h kmail-19.12.3/src/identity/xfaceconfigurator.h
--- kmail-19.04.3/src/identity/xfaceconfigurator.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/identity/xfaceconfigurator.h	2020-03-02 07:34:49.000000000 +0000
@@ -35,10 +35,10 @@
     explicit XFaceConfigurator(QWidget *parent = nullptr);
     ~XFaceConfigurator();
 
-    bool isXFaceEnabled() const;
+    Q_REQUIRED_RESULT bool isXFaceEnabled() const;
     void setXFaceEnabled(bool enable);
 
-    QString xface() const;
+    Q_REQUIRED_RESULT QString xface() const;
     void setXFace(const QString &text);
 
 private:
diff -Nru kmail-19.04.3/src/job/addressvalidationjob.h kmail-19.12.3/src/job/addressvalidationjob.h
--- kmail-19.04.3/src/job/addressvalidationjob.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/job/addressvalidationjob.h	2020-03-02 07:34:49.000000000 +0000
@@ -35,7 +35,7 @@
 
     void start() override;
 
-    bool isValid() const;
+    Q_REQUIRED_RESULT bool isValid() const;
 
     void setDefaultDomain(const QString &domainName);
 
diff -Nru kmail-19.04.3/src/job/createfollowupreminderonexistingmessagejob.h kmail-19.12.3/src/job/createfollowupreminderonexistingmessagejob.h
--- kmail-19.04.3/src/job/createfollowupreminderonexistingmessagejob.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/job/createfollowupreminderonexistingmessagejob.h	2020-03-02 07:34:49.000000000 +0000
@@ -34,16 +34,16 @@
 
     void start();
 
-    Akonadi::Collection collection() const;
+    Q_REQUIRED_RESULT Akonadi::Collection collection() const;
     void setCollection(const Akonadi::Collection &collection);
 
-    QDate date() const;
+    Q_REQUIRED_RESULT QDate date() const;
     void setDate(const QDate &date);
 
-    Akonadi::Item messageItem() const;
+    Q_REQUIRED_RESULT Akonadi::Item messageItem() const;
     void setMessageItem(const Akonadi::Item &messageItem);
 
-    bool canStart() const;
+    Q_REQUIRED_RESULT bool canStart() const;
 
 private:
     Q_DISABLE_COPY(CreateFollowupReminderOnExistingMessageJob)
diff -Nru kmail-19.04.3/src/job/dndfromarkjob.h kmail-19.12.3/src/job/dndfromarkjob.h
--- kmail-19.04.3/src/job/dndfromarkjob.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/job/dndfromarkjob.h	2020-03-02 07:34:49.000000000 +0000
@@ -30,7 +30,7 @@
 public:
     explicit DndFromArkJob(QObject *parent = nullptr);
     static bool dndFromArk(const QMimeData *source);
-    bool extract(const QMimeData *source);
+    Q_REQUIRED_RESULT bool extract(const QMimeData *source);
     void setComposerWin(KMComposerWin *composerWin);
 
 private:
diff -Nru kmail-19.04.3/src/job/fillcomposerjob.h kmail-19.12.3/src/job/fillcomposerjob.h
--- kmail-19.04.3/src/job/fillcomposerjob.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/job/fillcomposerjob.h	2020-03-02 07:34:49.000000000 +0000
@@ -32,7 +32,8 @@
     {
     }
 
-    FillComposerJobSettings(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow)
+    FillComposerJobSettings(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType,
+                            const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow)
         : mTo(to)
         , mCc(cc)
         , mBcc(bcc)
diff -Nru kmail-19.04.3/src/job/handleclickedurljob.cpp kmail-19.12.3/src/job/handleclickedurljob.cpp
--- kmail-19.04.3/src/job/handleclickedurljob.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/job/handleclickedurljob.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -48,29 +48,29 @@
     const QList<QPair<QString, QString> > fields = MessageCore::StringUtil::parseMailtoUrl(mUrl);
     for (int i = 0; i < fields.count(); ++i) {
         const QPair<QString, QString> element = fields.at(i);
-        if (element.first == QStringLiteral("to")) {
+        if (element.first == QLatin1String("to")) {
             mMsg->to()->fromUnicodeString(element.second, "utf-8");
-        } else if (element.first == QStringLiteral("subject")) {
+        } else if (element.first == QLatin1String("subject")) {
             const QString subject = element.second;
             if (!subject.isEmpty()) {
                 mMsg->subject()->fromUnicodeString(subject, "utf-8");
             }
-        } else if (element.first == QStringLiteral("body")) {
+        } else if (element.first == QLatin1String("body")) {
             const QString body = element.second;
             if (!body.isEmpty()) {
                 mMsg->setBody(body.toUtf8());
             }
-        } else if (element.first == QStringLiteral("cc")) {
+        } else if (element.first == QLatin1String("cc")) {
             const QString cc = element.second;
             if (!cc.isEmpty()) {
                 mMsg->cc()->fromUnicodeString(cc, "utf-8");
             }
-        } else if (element.first == QStringLiteral("bcc")) {
+        } else if (element.first == QLatin1String("bcc")) {
             const QString bcc = element.second;
             if (!bcc.isEmpty()) {
                 mMsg->bcc()->fromUnicodeString(bcc, "utf-8");
             }
-        } else if (element.first == QStringLiteral("attach")) {
+        } else if (element.first == QLatin1String("attach")) {
             const QString attach = element.second;
             if (!attach.isEmpty()) {
                 qCDebug(KMAIL_LOG) << "Attachment not supported yet";
diff -Nru kmail-19.04.3/src/job/opencomposerjob.cpp kmail-19.12.3/src/job/opencomposerjob.cpp
--- kmail-19.04.3/src/job/opencomposerjob.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/job/opencomposerjob.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -36,7 +36,6 @@
 OpenComposerJob::OpenComposerJob(QObject *parent)
     : QObject(parent)
     , mMsg(nullptr)
-    , mContext(KMail::Composer::New)
 {
 }
 
@@ -102,7 +101,9 @@
         }
     } else if (!mOpenComposerSettings.mBody.isEmpty()) {
         mContext = KMail::Composer::NoTemplate;
-        mMsg->setBody(mOpenComposerSettings.mBody.toLatin1());
+        mMsg->setBody(mOpenComposerSettings.mBody.toUtf8());
+        mMsg->assemble();
+        mMsg->parse();
         slotOpenComposer();
     } else {
         TemplateParser::TemplateParserJob *parser = new TemplateParser::TemplateParserJob(mMsg, TemplateParser::TemplateParserJob::NewMessage);
@@ -150,6 +151,8 @@
     }
     if (!mOpenComposerSettings.mHidden) {
         cWin->show();
+        cWin->raise();
+        cWin->activateWindow();
     }
     deleteLater();
 }
diff -Nru kmail-19.04.3/src/job/opencomposerjob.h kmail-19.12.3/src/job/opencomposerjob.h
--- kmail-19.04.3/src/job/opencomposerjob.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/job/opencomposerjob.h	2020-03-02 07:34:49.000000000 +0000
@@ -30,7 +30,8 @@
     {
     }
 
-    OpenComposerSettings(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity)
+    OpenComposerSettings(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo,
+                         const QString &identity)
         : mAttachmentPaths(attachmentPaths)
         , mCustomHeaders(customHeaders)
         , mTo(to)
@@ -75,7 +76,7 @@
     void slotOpenComposer();
     OpenComposerSettings mOpenComposerSettings;
     KMime::Message::Ptr mMsg;
-    KMail::Composer::TemplateContext mContext;
+    KMail::Composer::TemplateContext mContext = KMail::Composer::New;
     uint mIdentityId = 0;
 };
 
diff -Nru kmail-19.04.3/src/job/removecollectionjob.cpp kmail-19.12.3/src/job/removecollectionjob.cpp
--- kmail-19.04.3/src/job/removecollectionjob.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/job/removecollectionjob.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -127,7 +127,9 @@
 void RemoveCollectionJob::slotDeletionCollectionResult(KJob *job)
 {
     if (job) {
-        MailCommon::Util::showJobErrorMessage(job);
+        if (!MailCommon::Util::showJobErrorMessage(job)) {
+            //TODO
+        }
     }
     deleteLater();
 }
diff -Nru kmail-19.04.3/src/kmail_options.h kmail-19.12.3/src/kmail_options.h
--- kmail-19.04.3/src/kmail_options.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmail_options.h	2020-03-02 07:34:49.000000000 +0000
@@ -22,7 +22,7 @@
         i18n("Send BCC: to 'address'"),
         QStringLiteral("address"))
             << QCommandLineOption(
-        QStringList() << QStringLiteral("h") << QStringLiteral("replyTo"),
+        QStringList() << QStringLiteral("r") << QStringLiteral("replyTo"),
         i18n("Set replyTo to 'address'"),
         QStringLiteral("address"))
             << QCommandLineOption(
diff -Nru kmail-19.04.3/src/kmail_part.cpp kmail-19.12.3/src/kmail_part.cpp
--- kmail-19.04.3/src/kmail_part.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmail_part.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -28,7 +28,6 @@
 
 #include "kmmainwin.h"
 #include "kmmainwidget.h"
-#include "kmstartup.h"
 #include "aboutdata.h"
 
 #include <QVBoxLayout>
@@ -48,7 +47,7 @@
 #include "foldershortcutactionmanager.h"
 #include "kmmigrateapplication.h"
 #include <KLocalizedString>
-
+#include "messageviewer/config-messageviewer.h"
 #include <KSharedConfig>
 
 K_PLUGIN_FACTORY(KMailFactory, registerPlugin<KMailPart>();
@@ -65,9 +64,6 @@
     KMMigrateApplication migrate;
     migrate.migrate();
 
-    // import i18n data and icons from libraries:
-    KMail::insertLibraryIcons();
-
     //local, do the init
     KMKernel *mKMailKernel = new KMKernel();
     mKMailKernel->init();
@@ -98,6 +94,9 @@
     KParts::StatusBarExtension *statusBar = new KParts::StatusBarExtension(this);
     statusBar->addStatusBarItem(mainWidget->vacationScriptIndicator(), 2, false);
     statusBar->addStatusBarItem(mainWidget->zoomLabelIndicator(), 3, false);
+#ifdef USE_DKIM_CHECKER
+    statusBar->addStatusBarItem(mainWidget->dkimWidgetInfo(), 4, false);
+#endif
 
     setXMLFile(QStringLiteral("kmail_part.rc"), true);
     KSettings::Dispatcher::registerComponent(QStringLiteral("kmail2"), mKMailKernel, "slotConfigChanged");
@@ -131,7 +130,7 @@
 {
     KParts::ReadOnlyPart::guiActivateEvent(e);
     if (e->activated()) {
-        mainWidget->initializeFilterActions();
+        mainWidget->initializeFilterActions(true);
         mainWidget->tagActionManager()->createActions();
         mainWidget->folderShortcutActionManager()->createActions();
         mainWidget->populateMessageListStatusFilterCombo();
diff -Nru kmail-19.04.3/src/kmail_private_export.h kmail-19.12.3/src/kmail_private_export.h
--- kmail-19.04.3/src/kmail_private_export.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/kmail_private_export.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,34 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2019 Laurent Montel <montel@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library 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
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KMAILPRIVATE_EXPORT_H
+#define KMAILPRIVATE_EXPORT_H
+
+#include "kmail_export.h"
+
+/* Classes which are exported only for unit tests */
+#ifdef BUILD_TESTING
+    #ifndef KMAILTESTS_TESTS_EXPORT
+        #define KMAILTESTS_TESTS_EXPORT KMAIL_EXPORT
+    # endif
+#else /* not compiling tests */
+    #define KMAILTESTS_TESTS_EXPORT
+#endif
+
+#endif
diff -Nru kmail-19.04.3/src/kmcommands.cpp kmail-19.12.3/src/kmcommands.cpp
--- kmail-19.04.3/src/kmcommands.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmcommands.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -796,25 +796,43 @@
             }
             startOfMessage += 1; // the message starts after the '\n'
         }
+        QList<KMime::Message::Ptr> listMessages;
+
         // check for multiple messages in the file
         bool multipleMessages = true;
-        int endOfMessage = mMsgString.indexOf(QLatin1String("\nFrom "));
+        int endOfMessage = mMsgString.indexOf(QLatin1String("\nFrom "), startOfMessage);
+        while (endOfMessage != -1) {
+            KMime::Message *msg = new KMime::Message;
+            msg->setContent(KMime::CRLFtoLF(mMsgString.mid(startOfMessage, endOfMessage - startOfMessage).toUtf8()));
+            msg->parse();
+            if (!msg->hasContent()) {
+                delete msg;
+                msg = nullptr;
+                doesNotContainMessage();
+                return;
+            }
+            KMime::Message::Ptr mMsg(msg);
+            listMessages << mMsg;
+            startOfMessage = endOfMessage + 1;
+            endOfMessage = mMsgString.indexOf(QLatin1String("\nFrom "), startOfMessage);
+        }
         if (endOfMessage == -1) {
             endOfMessage = mMsgString.length();
             multipleMessages = false;
-        }
-        KMime::Message *msg = new KMime::Message;
-        msg->setContent(KMime::CRLFtoLF(mMsgString.mid(startOfMessage, endOfMessage - startOfMessage).toUtf8()));
-        msg->parse();
-        if (!msg->hasContent()) {
-            delete msg;
-            msg = nullptr;
-            doesNotContainMessage();
-            return;
+            KMime::Message *msg = new KMime::Message;
+            msg->setContent(KMime::CRLFtoLF(mMsgString.mid(startOfMessage, endOfMessage - startOfMessage).toUtf8()));
+            msg->parse();
+            if (!msg->hasContent()) {
+                delete msg;
+                msg = nullptr;
+                doesNotContainMessage();
+                return;
+            }
+            KMime::Message::Ptr mMsg(msg);
+            listMessages << mMsg;
         }
         KMReaderMainWin *win = new KMReaderMainWin();
-        KMime::Message::Ptr mMsg(msg);
-        win->showMessage(mEncoding, mMsg);
+        win->showMessage(mEncoding, listMessages);
         win->show();
         if (multipleMessages) {
             KMessageBox::information(win,
@@ -1105,7 +1123,7 @@
 
 KMCommand::Result KMPrintCommand::execute()
 {
-    KMReaderWin *printerWin = new KMReaderWin(nullptr, kmkernel->mainWin(), nullptr);
+    KMReaderWin *printerWin = new KMReaderWin(nullptr, parentWidget(), nullptr);
     printerWin->setPrinting(true);
     printerWin->readConfig();
     printerWin->setPrintElementBackground(MessageViewer::MessageViewerSettings::self()->printBackgroundColorImages());
@@ -1747,9 +1765,9 @@
     fetchScope().fetchFullPayload(true);
 }
 
-KMSaveAttachmentsCommand::KMSaveAttachmentsCommand(QWidget *parent, const Akonadi::Item::List &msgs)
+KMSaveAttachmentsCommand::KMSaveAttachmentsCommand(QWidget *parent, const Akonadi::Item::List &msgs, MessageViewer::Viewer *viewer)
     : KMCommand(parent, msgs)
-    , mViewer(nullptr)
+    , mViewer(viewer)
 {
     fetchScope().fetchFullPayload(true);
 }
@@ -1801,6 +1819,9 @@
     KMail::Util::lastEncryptAndSignState(lastEncrypt, lastSign, msg);
     win->setMessage(newMsg, lastSign, lastEncrypt, false, true);
 
+    //Make sure to use current folder as requested by David
+    //We avoid to use an invalid folder when we open an email on two different computer.
+    win->setFcc(QString::number(item.parentCollection().id()));
     win->show();
 
     return OK;
diff -Nru kmail-19.04.3/src/kmcommands.h kmail-19.12.3/src/kmcommands.h
--- kmail-19.04.3/src/kmcommands.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmcommands.h	2020-03-02 07:34:49.000000000 +0000
@@ -56,7 +56,7 @@
         Undefined, OK, Canceled, Failed
     };
 
-    // Trival constructor, don't retrieve any messages
+    // Trivial constructor, don't retrieve any messages
     explicit KMCommand(QWidget *parent = nullptr);
     KMCommand(QWidget *parent, const Akonadi::Item &);
     // Retrieve all messages in msgList when start is called.
@@ -309,7 +309,7 @@
       @param parent  The parent widget of the command used for message boxes.
       @param msgs    The messages of which the attachments should be saved.
     */
-    KMSaveAttachmentsCommand(QWidget *parent, const Akonadi::Item::List &msgs);
+    KMSaveAttachmentsCommand(QWidget *parent, const Akonadi::Item::List &msgs, MessageViewer::Viewer *viewer);
 
 private:
     Result execute() override;
diff -Nru kmail-19.04.3/src/kmkernel.cpp kmail-19.12.3/src/kmkernel.cpp
--- kmail-19.04.3/src/kmkernel.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmkernel.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -11,7 +11,6 @@
 #include <AkonadiSearch/PIM/indexeditems.h>
 #include <LibkdepimAkonadi/ProgressManagerAkonadi>
 using KPIM::BroadcastStatus;
-#include "kmstartup.h"
 #include "kmmainwin.h"
 #include "editor/composer.h"
 #include "kmreadermainwin.h"
@@ -192,7 +191,7 @@
     mCollectionModel->setDynamicSortFilter(true);
     mCollectionModel->setSortCaseSensitivity(Qt::CaseInsensitive);
 
-    connect(folderCollectionMonitor(), QOverload<const Akonadi::Collection &, const QSet<QByteArray> &>::of(&Akonadi::ChangeRecorder::collectionChanged), this,
+    connect(folderCollectionMonitor(), qOverload<const Akonadi::Collection &, const QSet<QByteArray> &>(&Akonadi::ChangeRecorder::collectionChanged), this,
             &KMKernel::slotCollectionChanged);
 
     connect(MailTransport::TransportManager::self(), &MailTransport::TransportManager::transportRemoved, this, &KMKernel::transportRemoved);
@@ -399,31 +398,31 @@
                 for (int i = 0; i < values.count(); ++i) {
                     const QPair<QString, QString> element = values.at(i);
                     const QString key = element.first.toLower();
-                    if (key == QLatin1Literal("to")) {
+                    if (key == QLatin1String("to")) {
                         if (!element.second.isEmpty()) {
                             to += element.second + QStringLiteral(", ");
                         }
                         previousKey.clear();
-                    } else if (key == QLatin1Literal("cc")) {
+                    } else if (key == QLatin1String("cc")) {
                         if (!element.second.isEmpty()) {
                             cc += element.second + QStringLiteral(", ");
                         }
                         previousKey.clear();
-                    } else if (key == QLatin1Literal("bcc")) {
+                    } else if (key == QLatin1String("bcc")) {
                         if (!element.second.isEmpty()) {
                             bcc += element.second + QStringLiteral(", ");
                         }
                         previousKey.clear();
-                    } else if (key == QLatin1Literal("subject")) {
+                    } else if (key == QLatin1String("subject")) {
                         subj = element.second;
                         previousKey.clear();
-                    } else if (key == QLatin1Literal("body")) {
+                    } else if (key == QLatin1String("body")) {
                         body = element.second;
                         previousKey = key;
-                    } else if (key == QLatin1Literal("in-reply-to")) {
+                    } else if (key == QLatin1String("in-reply-to")) {
                         inReplyTo = element.second;
                         previousKey.clear();
-                    } else if (key == QLatin1Literal("attachment") || key == QLatin1Literal("attach")) {
+                    } else if (key == QLatin1String("attachment") || key == QLatin1String("attach")) {
                         if (!element.second.isEmpty()) {
                             attachURLs << makeAbsoluteUrl(element.second, workingDir);
                         }
@@ -433,7 +432,7 @@
                         //Workaround: https://bugs.kde.org/show_bug.cgi?id=390939
                         //QMap<QString, QString> parseMailtoUrl(const QUrl &url) parses correctly url
                         //But if we have a "&" unknown key we lost it.
-                        if (previousKey == QLatin1Literal("body")) {
+                        if (previousKey == QLatin1String("body")) {
                             body += QLatin1Char('&') + key + QLatin1Char('=') + element.second;
                         }
                         //Don't clear previous key.
@@ -451,7 +450,7 @@
         }
         if (!to.isEmpty()) {
             // cut off the superfluous trailing ", "
-            to.truncate(to.length() - 2);
+            to.chop(2);
         }
     }
 
@@ -560,7 +559,8 @@
     }
 }
 
-void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity)
+void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo,
+                            const QString &identity)
 {
     const OpenComposerSettings settings(to, cc,
                                         bcc, subject,
@@ -574,7 +574,8 @@
     job->start();
 }
 
-void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity)
+void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType,
+                            const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity)
 {
     fillComposer(hidden, to, cc, bcc,
                  subject, body,
@@ -583,7 +584,8 @@
                  attachContDisp, attachCharset, identity, false);
 }
 
-void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity)
+void KMKernel::openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType,
+                            const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity)
 {
     fillComposer(false, to, cc, bcc,
                  subject, body,
@@ -592,7 +594,8 @@
                  attachContDisp, attachCharset, identity, true);
 }
 
-void KMKernel::fillComposer(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow)
+void KMKernel::fillComposer(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType,
+                            const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow)
 {
     const FillComposerJobSettings settings(hidden,
                                            to,
@@ -917,7 +920,7 @@
 }
 
 /* TODO later:
-   Asuming that:
+   Assuming that:
      - msgsender is nonblocking
        (our own, QSocketNotifier based. Pops up errors and sends signal
         senderFinished when done)
@@ -977,7 +980,7 @@
     for (const QFileInfo &file : autoSaveFiles) {
         // Disregard the '.' and '..' folders
         const QString filename = file.fileName();
-        if (filename == QLatin1String(".")
+        if (filename == QLatin1Char('.')
             || filename == QLatin1String("..")
             || file.isDir()) {
             continue;
@@ -1160,7 +1163,8 @@
     }
 }
 
-void KMKernel::action(bool mailto, bool check, bool startInTray, const QString &to, const QString &cc, const QString &bcc, const QString &subj, const QString &body, const QUrl &messageFile, const QList<QUrl> &attachURLs, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity)
+void KMKernel::action(bool mailto, bool check, bool startInTray, const QString &to, const QString &cc, const QString &bcc, const QString &subj, const QString &body, const QUrl &messageFile, const QList<QUrl> &attachURLs, const QStringList &customHeaders, const QString &replyTo,
+                      const QString &inReplyTo, const QString &identity)
 {
     if (mailto) {
         openComposer(to, cc, bcc, subj, body, 0,
@@ -1240,9 +1244,9 @@
 
     if (mConfigureDialog->isHidden()) {
         mConfigureDialog->show();
-    } else {
-        mConfigureDialog->raise();
     }
+    mConfigureDialog->raise();
+    mConfigureDialog->activateWindow();
 }
 
 void KMKernel::slotConfigChanged()
@@ -1518,7 +1522,7 @@
         QString information = i18np("This identity has been changed to use the default transport:",
                                     "These %1 identities have been changed to use the default transport:",
                                     changedIdents.count());
-        //Don't set parent otherwise we will swith to current KMail and we configure it. So not good
+        //Don't set parent otherwise we will switch to current KMail and we configure it. So not good
         KMessageBox::informationList(nullptr, information, changedIdents);
         im->commit();
     }
@@ -1626,7 +1630,7 @@
 
 void KMKernel::agentInstanceBroken(const Akonadi::AgentInstance &instance)
 {
-    const QString summary = i18n("Resource %1 is broken.", instance.name());
+    const QString summary = i18n("Resource %1 is broken.\n%2", instance.name(), instance.statusMessage());
     KNotification::event(QStringLiteral("akonadi-resource-broken"),
                          QString(),
                          summary,
@@ -1659,11 +1663,21 @@
     const QStringList lst = dir.entryList(QStringList{QStringLiteral("messageviewer_*")});
     qCDebug(KMAIL_LOG) << " list file to delete " << lst;
     for (const QString &file : lst) {
+        QFile tempFile(QDir::tempPath() + QLatin1Char('/') + file);
+        if (!tempFile.remove()) {
+            fprintf(stderr, "%s was not removed .\n", qPrintable(tempFile.fileName()));
+        } else {
+            fprintf(stderr, "%s was removed .\n", qPrintable(tempFile.fileName()));
+        }
+    }
+    const QStringList lstRepo = dir.entryList(QStringList{QStringLiteral("messageviewer_*.index.*")});
+    qCDebug(KMAIL_LOG) << " list repo to delete " << lstRepo;
+    for (const QString &file : lstRepo) {
         QDir tempDir(QDir::tempPath() + QLatin1Char('/') + file);
         if (!tempDir.removeRecursively()) {
-            fprintf(stderr, "%s was not removed .\n", qPrintable(tempDir.absolutePath()));
+            fprintf(stderr, "%s was not removed .\n", qPrintable(tempDir.path()));
         } else {
-            fprintf(stderr, "%s was removed .\n", qPrintable(tempDir.absolutePath()));
+            fprintf(stderr, "%s was removed .\n", qPrintable(tempDir.path()));
         }
     }
 }
diff -Nru kmail-19.04.3/src/kmkernel.h kmail-19.12.3/src/kmkernel.h
--- kmail-19.04.3/src/kmkernel.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmkernel.h	2020-03-02 07:34:49.000000000 +0000
@@ -179,7 +179,8 @@
     * @param inReplyTo A list of in-reply-to headers.
     * @param identity The mail identity.
     */
-    Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders, const QString &replyTo = QString(), const QString &inReplyTo = QString(), const QString &identity = QString());
+    Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &messageFile, const QStringList &attachmentPaths, const QStringList &customHeaders,
+                                   const QString &replyTo = QString(), const QString &inReplyTo = QString(), const QString &identity = QString());
 
     /**
     * Opens a composer window and prefills it with different
@@ -202,7 +203,8 @@
     * @param attachCharset The charset of the attachment.
     * @param identity The identity identifier which will be used as sender identity.
     */
-    Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity);
+    Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, bool hidden, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType,
+                                   const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity);
 
     /**
     * Opens a composer window and prefills it with different
@@ -225,7 +227,8 @@
     * @param attachCharset The charset of the attachment.
     * @param identity The identity identifier which will be used as sender identity.
     */
-    Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity);
+    Q_SCRIPTABLE void openComposer(const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType,
+                                   const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity);
 
     /**
     * Opens a composer window and prefills it with different
@@ -317,7 +320,8 @@
     bool doSessionManagement();
     bool firstInstance() const;
     void setFirstInstance(bool value);
-    void action(bool mailto, bool check, bool startInTray, const QString &to, const QString &cc, const QString &bcc, const QString &subj, const QString &body, const QUrl &messageFile, const QList<QUrl> &attach, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo, const QString &identity);
+    void action(bool mailto, bool check, bool startInTray, const QString &to, const QString &cc, const QString &bcc, const QString &subj, const QString &body, const QUrl &messageFile, const QList<QUrl> &attach, const QStringList &customHeaders, const QString &replyTo, const QString &inReplyTo,
+                const QString &identity);
 
     //sets online status for akonadi accounts. true for online, false for offline
     void setAccountStatus(bool);
@@ -418,7 +422,7 @@
       to regenerate their menus */
     void updatedTemplates();
 
-    /// Save contents of all open composer widnows to ~/dead.letter
+    /// Save contents of all open composer windows to ~/dead.letter
     void dumpDeadLetters();
 
     /** Call this slot instead of directly KConfig::sync() to
@@ -474,7 +478,8 @@
      * Fills a composer cWin
      *
     */
-    void fillComposer(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType, const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow);
+    void fillComposer(bool hidden, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QString &attachName, const QByteArray &attachCte, const QByteArray &attachData, const QByteArray &attachType, const QByteArray &attachSubType,
+                      const QByteArray &attachParamAttr, const QString &attachParamValue, const QByteArray &attachContDisp, const QByteArray &attachCharset, unsigned int identity, bool forceShowWindow);
 
     void verifyAccount();
     void resourceGoOnLine();
diff -Nru kmail-19.04.3/src/kmlaunchexternalcomponent.cpp kmail-19.12.3/src/kmlaunchexternalcomponent.cpp
--- kmail-19.04.3/src/kmlaunchexternalcomponent.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmlaunchexternalcomponent.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -29,8 +29,6 @@
 #include "followupreminderinterface.h"
 #include "MailCommon/FilterManager"
 
-#include <QDBusInterface>
-#include <QDBusReply>
 #include <QProcess>
 #include "kmail_debug.h"
 #include <QStandardPaths>
@@ -96,11 +94,11 @@
 
 void KMLaunchExternalComponent::slotExportData()
 {
-    const QString path = QStandardPaths::findExecutable(QStringLiteral("pimsettingexporter"));
+    const QString path = QStandardPaths::findExecutable(QStringLiteral("pimdataexporter"));
     if (!QProcess::startDetached(path)) {
-        KMessageBox::error(mParentWidget, i18n("Could not start \"PIM Setting Exporter\" program. "
+        KMessageBox::error(mParentWidget, i18n("Could not start \"PIM Data Exporter\" program. "
                                                "Please check your installation."),
-                           i18n("Unable to start \"PIM Setting Exporter\" program"));
+                           i18n("Unable to start \"PIM Data Exporter\" program"));
     }
 }
 
diff -Nru kmail-19.04.3/src/kmmainwidget.cpp kmail-19.12.3/src/kmmainwidget.cpp
--- kmail-19.04.3/src/kmmainwidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmmainwidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -85,6 +85,7 @@
 #include "messageviewer/viewer.h"
 #include "messageviewer/headerstyleplugin.h"
 #include "messageviewer/headerstyle.h"
+#include "messageviewer/config-messageviewer.h"
 
 #include <MessageViewer/AttachmentStrategy>
 
@@ -157,7 +158,6 @@
 #include <kstandardshortcut.h>
 #include <kcharsets.h>
 #include "kmail_debug.h"
-#include <ktip.h>
 
 #include <kstandardaction.h>
 #include <ktoggleaction.h>
@@ -192,6 +192,10 @@
 #include <job/removeduplicatemailjob.h>
 #include <job/removecollectionjob.h>
 
+#ifdef USE_DKIM_CHECKER
+#include <MessageViewer/DKIMWidgetInfo>
+#endif
+
 using namespace KMime;
 using namespace Akonadi;
 using namespace MailCommon;
@@ -204,7 +208,7 @@
 Q_GLOBAL_STATIC(KMMainWidget::PtrList, theMainWidgetList)
 
 //-----------------------------------------------------------------------------
-KMMainWidget::KMMainWidget(QWidget *parent, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, KSharedConfig::Ptr config)
+KMMainWidget::KMMainWidget(QWidget *parent, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, const KSharedConfig::Ptr &config)
     : QWidget(parent)
     , mManageShowCollectionProperties(new ManageShowCollectionProperties(this, this))
 {
@@ -226,7 +230,7 @@
     mFavoritesModel = nullptr;
     mSievePasswordProvider = new KMSieveImapPasswordProvider(winId());
     mVacationManager = new KSieveUi::VacationManager(mSievePasswordProvider, this);
-    connect(mVacationManager, &KSieveUi::VacationManager::updateVacationScriptStatus, this, QOverload<bool, const QString &>::of(&KMMainWidget::updateVacationScriptStatus));
+    connect(mVacationManager, &KSieveUi::VacationManager::updateVacationScriptStatus, this, qOverload<bool, const QString &>(&KMMainWidget::updateVacationScriptStatus));
 
     mToolbarActionSeparator = new QAction(this);
     mToolbarActionSeparator->setSeparator(true);
@@ -333,6 +337,16 @@
     setupUnifiedMailboxChecker();
 }
 
+#ifdef USE_DKIM_CHECKER
+QWidget *KMMainWidget::dkimWidgetInfo() const
+{
+    if (mMsgView) {
+        return mMsgView->viewer()->dkimWidgetInfo();
+    }
+    return nullptr;
+}
+#endif
+
 void KMMainWidget::restoreCollectionFolderViewConfig()
 {
     ETMViewStateSaver *saver = new ETMViewStateSaver;
@@ -1001,7 +1015,7 @@
     opt |= FolderTreeWidget::DontKeyFilter;
     mFolderTreeWidget = new FolderTreeWidget(this, mGUIClient, opt);
 
-    connect(mFolderTreeWidget->folderTreeView(), QOverload<const Akonadi::Collection &>::of(&EntityTreeView::currentChanged), this, &KMMainWidget::slotFolderChanged);
+    connect(mFolderTreeWidget->folderTreeView(), qOverload<const Akonadi::Collection &>(&EntityTreeView::currentChanged), this, &KMMainWidget::slotFolderChanged);
 
     connect(mFolderTreeWidget->folderTreeView()->selectionModel(), &QItemSelectionModel::selectionChanged, this, &KMMainWidget::updateFolderMenu);
 
@@ -1076,7 +1090,7 @@
     if (mEnableFavoriteFolderView) {
         mFavoriteCollectionsView = new FavoriteCollectionWidget(KMKernel::self()->mailCommonSettings(), mGUIClient, this);
         refreshFavoriteFoldersViewProperties();
-        connect(mFavoriteCollectionsView, QOverload<const Akonadi::Collection &>::of(&EntityListView::currentChanged), this, &KMMainWidget::slotFolderChanged);
+        connect(mFavoriteCollectionsView, qOverload<const Akonadi::Collection &>(&EntityListView::currentChanged), this, &KMMainWidget::slotFolderChanged);
         connect(mFavoriteCollectionsView, &FavoriteCollectionWidget::newTabRequested, this, &KMMainWidget::slotCreateNewTab);
         mFavoritesModel = new Akonadi::FavoriteCollectionsModel(
             mFolderTreeWidget->folderTreeWidgetProxyModel(),
@@ -1171,7 +1185,7 @@
             this, &KMMainWidget::slotItemRemoved);
     connect(kmkernel->folderCollectionMonitor(), &Monitor::itemMoved,
             this, &KMMainWidget::slotItemMoved);
-    connect(kmkernel->folderCollectionMonitor(), QOverload<const Akonadi::Collection &, const QSet<QByteArray> &>::of(&ChangeRecorder::collectionChanged),
+    connect(kmkernel->folderCollectionMonitor(), qOverload<const Akonadi::Collection &, const QSet<QByteArray> &>(&ChangeRecorder::collectionChanged),
             this, &KMMainWidget::slotCollectionChanged);
 
     connect(kmkernel->folderCollectionMonitor(), &Monitor::collectionStatisticsChanged, this, &KMMainWidget::slotCollectionStatisticsChanged);
@@ -1422,41 +1436,33 @@
     if (!mCurrentFolderSettings) {
         return;
     }
-    bool mustDeleteExpirationAttribute = false;
-    MailCommon::ExpireCollectionAttribute *attr = MailCommon::Util::expirationCollectionAttribute(mCurrentCollection, mustDeleteExpirationAttribute);
-    bool canBeExpired = true;
-    if (!attr->isAutoExpire()) {
-        canBeExpired = false;
-    } else if (attr->unreadExpireUnits() == MailCommon::ExpireCollectionAttribute::ExpireNever
-               && attr->readExpireUnits() == MailCommon::ExpireCollectionAttribute::ExpireNever) {
-        canBeExpired = false;
-    }
+    const MailCommon::ExpireCollectionAttribute *attr = mCurrentCollection.attribute<MailCommon::ExpireCollectionAttribute>();
+    if (attr) {
+        bool canBeExpired = true;
+        if (!attr->isAutoExpire()) {
+            canBeExpired = false;
+        } else if (attr->unreadExpireUnits() == MailCommon::ExpireCollectionAttribute::ExpireNever
+                   && attr->readExpireUnits() == MailCommon::ExpireCollectionAttribute::ExpireNever) {
+            canBeExpired = false;
+        }
 
-    if (!canBeExpired) {
-        const QString message = i18n("This folder does not have any expiry options set");
-        KMessageBox::information(this, message);
-        if (mustDeleteExpirationAttribute) {
-            delete attr;
+        if (!canBeExpired) {
+            const QString message = i18n("This folder does not have any expiry options set");
+            KMessageBox::information(this, message);
+            return;
         }
-        return;
-    }
 
-    if (KMailSettings::self()->warnBeforeExpire()) {
-        const QString message = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>",
-                                     mCurrentFolderSettings->name().toHtmlEscaped());
-        if (KMessageBox::warningContinueCancel(this, message, i18n("Expire Folder"),
-                                               KGuiItem(i18n("&Expire")))
-            != KMessageBox::Continue) {
-            if (mustDeleteExpirationAttribute) {
-                delete attr;
+        if (KMailSettings::self()->warnBeforeExpire()) {
+            const QString message = i18n("<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>",
+                                         mCurrentFolderSettings->name().toHtmlEscaped());
+            if (KMessageBox::warningContinueCancel(this, message, i18n("Expire Folder"),
+                                                   KGuiItem(i18n("&Expire")))
+                != KMessageBox::Continue) {
+                return;
             }
-            return;
         }
-    }
 
-    MailCommon::Util::expireOldMessages(mCurrentCollection, true /*immediate*/);
-    if (mustDeleteExpirationAttribute) {
-        delete attr;
+        MailCommon::Util::expireOldMessages(mCurrentCollection, true /*immediate*/);
     }
 }
 
@@ -1472,8 +1478,9 @@
                          ? i18n("Are you sure you want to empty the trash folder?")
                          : i18n("<qt>Are you sure you want to move all messages from "
                                 "folder <b>%1</b> to the trash?</qt>", mCurrentCollection.name().toHtmlEscaped());
+    const QString icon = (isTrash) ? QStringLiteral("edit-delete-shred") : QStringLiteral("edit-delete");
 
-    if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem(title, QStringLiteral("edit-delete-shred")))
+    if (KMessageBox::warningContinueCancel(this, text, title, KGuiItem(title, icon))
         != KMessageBox::Continue) {
         return;
     }
@@ -1581,7 +1588,7 @@
                                                         i18n("Security Warning"),
                                                         KGuiItem(i18n("Load External References")),
                                                         KStandardGuiItem::cancel(),
-                                                        QStringLiteral("OverrideHtmlLoadExtWarning"), nullptr);
+                                                        QStringLiteral("OverrideHtmlLoadExtWarning"), KMessageBox::Option());
         if (result == KMessageBox::Cancel) {
             mPreferHtmlLoadExtAction->setChecked(false);
             return;
@@ -2349,7 +2356,7 @@
         dummyItem.setPayload<KMime::Message::Ptr>(mMsgView->message().payload<KMime::Message::Ptr>());
         saveCommand = new KMSaveAttachmentsCommand(this, dummyItem, mMsgView->viewer());
     } else {
-        saveCommand = new KMSaveAttachmentsCommand(this, selectedMessages);
+        saveCommand = new KMSaveAttachmentsCommand(this, selectedMessages, mMsgView->viewer());
     }
 
     saveCommand->start();
@@ -2975,11 +2982,11 @@
     mTrashThreadAction = new QAction(i18n("M&ove Thread to Trash"), this);
     actionCollection()->addAction(QStringLiteral("move_thread_to_trash"), mTrashThreadAction);
     actionCollection()->setDefaultShortcut(mTrashThreadAction, QKeySequence(Qt::CTRL + Qt::Key_Delete));
-    mTrashThreadAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete-shred")));
+    mTrashThreadAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-delete")));
     KMail::Util::addQActionHelpText(mTrashThreadAction, i18n("Move thread to trashcan"));
     connect(mTrashThreadAction, &QAction::triggered, this, &KMMainWidget::slotTrashThread);
 
-    mDeleteThreadAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("Delete T&hread"), this);
+    mDeleteThreadAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete-shred")), i18n("Delete T&hread"), this);
     actionCollection()->addAction(QStringLiteral("delete_thread"), mDeleteThreadAction);
     //Don't use new connect api.
     connect(mDeleteThreadAction, &QAction::triggered, this, &KMMainWidget::slotDeleteThread);
@@ -3579,6 +3586,10 @@
     mAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("configure")), i18n("Account &Settings"), this);
     actionCollection()->addAction(QStringLiteral("resource_settings"), mAccountSettings);
     connect(mAccountSettings, &QAction::triggered, this, &KMMainWidget::slotAccountSettings);
+
+    mRestartAccountSettings = new QAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Restart Account"), this);
+    actionCollection()->addAction(QStringLiteral("resource_restart"), mRestartAccountSettings);
+    connect(mRestartAccountSettings, &QAction::triggered, this, &KMMainWidget::slotRestartAccount);
 }
 
 void KMMainWidget::slotAddFavoriteFolder()
@@ -3847,9 +3858,7 @@
     } else if (single_actions) {
         actionList << mMsgActions->editAsNewAction();
     }
-    if (single_actions) {
-        actionList << mSaveAttachmentsAction;
-    }
+    actionList << mSaveAttachmentsAction;
     if (mCurrentCollection.isValid() && FolderArchive::FolderArchiveUtil::resourceSupportArchiving(mCurrentCollection.resource())) {
         actionList << mArchiveAction;
     }
@@ -4038,7 +4047,7 @@
     QAction *moveToTrash = akonadiStandardAction(Akonadi::StandardMailActionManager::MoveToTrash);
     KMail::Util::setActionTrashOrDelete(moveToTrash, isInTrashFolder);
 
-    mTrashThreadAction->setIcon(isInTrashFolder ? QIcon::fromTheme(QStringLiteral("edit-delete")) : QIcon::fromTheme(QStringLiteral("edit-delete-shred")));
+    mTrashThreadAction->setIcon(isInTrashFolder ? QIcon::fromTheme(QStringLiteral("edit-delete-shred")) : QIcon::fromTheme(QStringLiteral("edit-delete")));
     mTrashThreadAction->setText(isInTrashFolder ? i18n("Delete T&hread") : i18n("M&ove Thread to Trash"));
 
     mSearchMessages->setText((mCurrentCollection.resource() == QLatin1String("akonadi_search_resource")) ? i18n("Edit Search...") : i18n("&Find Messages..."));
@@ -4061,8 +4070,10 @@
     }
     if (mCurrentCollection.parentCollection() != Akonadi::Collection::root()) {
         mGUIClient->unplugActionList(QStringLiteral("resource_settings"));
+        mGUIClient->unplugActionList(QStringLiteral("resource_restart"));
     } else {
         mGUIClient->plugActionList(QStringLiteral("resource_settings"), {mAccountSettings});
+        mGUIClient->plugActionList(QStringLiteral("resource_restart"), {mRestartAccountSettings});
     }
 
     mGUIClient->unplugActionList(QStringLiteral("collectionview_actionlist"));
@@ -4101,7 +4112,7 @@
 void KMMainWidget::slotShowStartupFolder()
 {
     connect(MailCommon::FilterManager::instance(), &FilterManager::filtersChanged,
-            this, &KMMainWidget::initializeFilterActions);
+            this, [this]() { initializeFilterActions(true); });
     // Plug various action lists. This can't be done in the constructor, as that is called before
     // the main window or Kontact calls createGUI().
     // This function however is called with a single shot timer.
@@ -4123,7 +4134,7 @@
 {
     Akonadi::ServerManager::State state = Akonadi::ServerManager::self()->state();
     if (state == Akonadi::ServerManager::Running) {
-        initializeFilterActions();
+        initializeFilterActions(true);
     } else {
         connect(Akonadi::ServerManager::self(), &ServerManager::stateChanged,
                 this, &KMMainWidget::slotServerStateChanged);
@@ -4133,7 +4144,7 @@
 void KMMainWidget::slotServerStateChanged(Akonadi::ServerManager::State state)
 {
     if (state == Akonadi::ServerManager::Running) {
-        initializeFilterActions();
+        initializeFilterActions(true);
         disconnect(Akonadi::ServerManager::self(), SIGNAL(stateChanged(Akonadi::ServerManager::State)));
     }
 }
@@ -4198,6 +4209,11 @@
     mFilterCommands.clear();
 }
 
+void KMMainWidget::clearPluginActions()
+{
+    KMailPluginInterface::self()->clearPluginActions(QStringLiteral("kmail"), mGUIClient);
+}
+
 void KMMainWidget::initializePluginActions()
 {
     KMailPluginInterface::self()->initializePluginActions(QStringLiteral("kmail"), mGUIClient);
@@ -4223,15 +4239,17 @@
 }
 
 //-----------------------------------------------------------------------------
-void KMMainWidget::initializeFilterActions()
+void KMMainWidget::initializeFilterActions(bool clearFilter)
 {
-    clearFilterActions();
+    if (clearFilter) {
+        clearFilterActions();
+    }
     mApplyFilterActionsMenu->menu()->addAction(mApplyAllFiltersAction);
     mApplyFilterFolderActionsMenu->menu()->addAction(mApplyAllFiltersFolderAction);
     mApplyFilterFolderRecursiveActionsMenu->menu()->addAction(mApplyAllFiltersFolderRecursiveAction);
     bool addedSeparator = false;
 
-    const QList<MailFilter *> lstFilters = MailCommon::FilterManager::instance()->filters();
+    const QVector<MailFilter *> lstFilters = MailCommon::FilterManager::instance()->filters();
     for (MailFilter *filter : lstFilters) {
         if (!filter->isEmpty() && filter->configureShortcut() && filter->isEnabled()) {
             QString filterName = QStringLiteral("Filter %1").arg(filter->name());
@@ -4607,6 +4625,20 @@
     instance.configure(this);
 }
 
+void KMMainWidget::slotRestartAccount()
+{
+    if (!mCurrentCollection.isValid() || mCurrentCollection.parentCollection() != Akonadi::Collection::root()) {
+        return;
+    }
+
+    auto instance = Akonadi::AgentManager::self()->instance(mCurrentCollection.resource());
+    if (!instance.isValid()) {
+        return;
+    }
+
+    instance.restart();
+}
+
 void KMMainWidget::savePaneSelection()
 {
     if (mMessagePane) {
@@ -4674,7 +4706,7 @@
                                                               i18n("Security Warning"),
                                                               KGuiItem(i18n("Use HTML")),
                                                               KStandardGuiItem::cancel(),
-                                                              QStringLiteral("OverrideHtmlWarning"), nullptr);
+                                                              QStringLiteral("OverrideHtmlWarning"), KMessageBox::Option());
         if (result == KMessageBox::Cancel) {
             mDisplayMessageFormatMenu->setDisplayMessageFormat(MessageViewer::Viewer::Text);
             return;
diff -Nru kmail-19.04.3/src/kmmainwidget.h kmail-19.12.3/src/kmmainwidget.h
--- kmail-19.04.3/src/kmmainwidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmmainwidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -31,7 +31,7 @@
 #include "messageactions.h"
 #include <kactioncollection.h>
 #include <mailcommon/foldersettings.h>
-
+#include "messageviewer/config-messageviewer.h"
 #include <QPointer>
 #include <QTimer>
 #include <Akonadi/KMime/StandardMailActionManager>
@@ -83,7 +83,11 @@
 class ManageSieveScriptsDialog;
 class VacationManager;
 }
-
+#ifdef USE_DKIM_CHECKER
+namespace MessageViewer {
+class DKIMWidgetInfo;
+}
+#endif
 namespace MailCommon {
 class FolderSelectionDialog;
 class FavoriteCollectionWidget;
@@ -97,7 +101,7 @@
 public:
     typedef QList<KMMainWidget *> PtrList;
 
-    KMMainWidget(QWidget *parent, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, KSharedConfig::Ptr config = KMKernel::self()->config());
+    KMMainWidget(QWidget *parent, KXMLGUIClient *aGUIClient, KActionCollection *actionCollection, const KSharedConfig::Ptr &config = KMKernel::self()->config());
     ~KMMainWidget() override;
     void destruct();
 
@@ -140,7 +144,9 @@
     static const PtrList *mainWidgetList();
 
     QWidget *vacationScriptIndicator() const;
-
+#ifdef USE_DKIM_CHECKER
+    QWidget *dkimWidgetInfo() const;
+#endif
     MailCommon::FolderTreeView *folderTreeView() const;
 
     /** Returns the XML GUI client. */
@@ -159,11 +165,11 @@
     void populateMessageListStatusFilterCombo();
     void initializePluginActions();
 
-    Akonadi::Item::List currentSelection() const;
+    Q_REQUIRED_RESULT Akonadi::Item::List currentSelection() const;
 
-    QString fullCollectionPath() const;
+    Q_REQUIRED_RESULT QString fullCollectionPath() const;
 
-    void initializeFilterActions();
+    void initializeFilterActions(bool clearFilter);
     /** Clear and create actions for marked filters */
     void clearFilterActions();
     /**
@@ -173,13 +179,14 @@
      *         that is the action collection of this main widget as returned
      *         by actionCollection().
      */
-    QList<KActionCollection *> actionCollections() const;
+    Q_REQUIRED_RESULT QList<KActionCollection *> actionCollections() const;
     void refreshMessageListSelection();
     Akonadi::StandardMailActionManager *standardMailActionManager() const;
     QAction *akonadiStandardAction(Akonadi::StandardActionManager::Type type);
     QAction *akonadiStandardAction(Akonadi::StandardMailActionManager::Type type);
     QWidget *zoomLabelIndicator() const;
 
+    void clearPluginActions();
 public Q_SLOTS:
 
     /**
@@ -506,7 +513,6 @@
     void slotRedirectCurrentMessage();
     void slotEditCurrentVacation();
     void slotReplyMessageTo(const KMime::Message::Ptr &message, bool replyToAll);
-    void slotAccountSettings();
 private:
     void slotSetFocusToViewer();
     void deleteSelectedMessages(bool confirmDelete);    // completely delete message
@@ -521,6 +527,8 @@
     QAction *filterToAction(MailCommon::MailFilter *filter);
     Akonadi::Collection::List applyFilterOnCollection(bool recursive);
     void setShowStatusBarMessage(const QString &msg);
+    void slotRestartAccount();
+    void slotAccountSettings();
 
     // Message actions
     QAction *mDeleteAction = nullptr;
@@ -536,6 +544,7 @@
     QAction *mArchiveAction = nullptr;
     QAction *mSelectAllMessages = nullptr;
     KActionMenuTransport *mSendActionMenu = nullptr;
+    QAction *mRestartAccountSettings = nullptr;
     // Filter actions
     KActionMenu *mFilterMenu = nullptr;
     QAction *mExpireConfigAction = nullptr;
diff -Nru kmail-19.04.3/src/kmmainwin.cpp kmail-19.12.3/src/kmmainwin.cpp
--- kmail-19.04.3/src/kmmainwin.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmmainwin.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -82,7 +82,7 @@
             this, &KMMainWin::displayStatusMessage);
 
     connect(mKMMainWidget, &KMMainWidget::captionChangeRequest,
-            this, QOverload<const QString &>::of(&KMainWindow::setCaption));
+            this, qOverload<const QString &>(&KMainWindow::setCaption));
 
     mKMMainWidget->updateQuickSearchLineText();
     mHideMenuBarAction->setChecked(KMailSettings::self()->showMenuBar());
@@ -157,14 +157,15 @@
     // remove dynamically created actions before editing
     mKMMainWidget->clearFilterActions();
     mKMMainWidget->tagActionManager()->clearActions();
+    mKMMainWidget->clearPluginActions();
 
     createGUI(QStringLiteral("kmmainwin.rc"));
     applyMainWindowSettings(KMKernel::self()->config()->group("Main Window"));
 
     // plug dynamically created actions again
-    mKMMainWidget->initializeFilterActions();
+    mKMMainWidget->initializeFilterActions(false);
     mKMMainWidget->tagActionManager()->createActions();
-    mKMMainWidget->initializePluginActions();
+    //FIXME mKMMainWidget->initializePluginActions();
 }
 
 void KMMainWin::setupStatusBar()
@@ -176,7 +177,9 @@
     statusBar()->addWidget(mMessageLabel);
 
     QTimer::singleShot(2000, KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::reset);
-
+#ifdef USE_DKIM_CHECKER
+    statusBar()->addPermanentWidget(mKMMainWidget->dkimWidgetInfo());
+#endif
     statusBar()->addPermanentWidget(mKMMainWidget->zoomLabelIndicator());
     statusBar()->addPermanentWidget(mKMMainWidget->vacationScriptIndicator());
     statusBar()->addPermanentWidget(mProgressBar->littleProgress());
diff -Nru kmail-19.04.3/src/kmmainwin.h kmail-19.12.3/src/kmmainwin.h
--- kmail-19.04.3/src/kmmainwin.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmmainwin.h	2020-03-02 07:34:49.000000000 +0000
@@ -44,7 +44,7 @@
     /// Same as KMMainWin::restore(), except that it also restores the docked state,
     /// which we have saved in saveProperties().
     /// TODO: KDE5: Move to kdelibs, see http://reviewboard.kde.org/r/504
-    bool restoreDockedState(int number);
+    Q_REQUIRED_RESULT bool restoreDockedState(int number);
 
 public Q_SLOTS:
     void displayStatusMessage(const QString &);
diff -Nru kmail-19.04.3/src/kmmainwin.rc kmail-19.12.3/src/kmmainwin.rc
--- kmail-19.04.3/src/kmmainwin.rc	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmmainwin.rc	2020-03-02 07:34:49.000000000 +0000
@@ -2,7 +2,7 @@
      the same menu entries at the same place in KMail and Kontact  -->
 
 <!DOCTYPE gui>
-<gui version="541" name="kmmainwin" translationDomain="kmail">
+<gui version="542" name="kmmainwin" translationDomain="kmail">
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -287,6 +287,7 @@
   <Action name="folder_shortcut_command"/>
   <ActionList name="akonadi_collection_collectionproperties_actionlist"/>
   <ActionList name="resource_settings" />
+  <ActionList name="resource_restart" />
   <Separator/>
   <ActionList name="collectionview_actionlist" />
  </Menu>
diff -Nru kmail-19.04.3/src/kmreadermainwin.cpp kmail-19.12.3/src/kmreadermainwin.cpp
--- kmail-19.04.3/src/kmreadermainwin.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmreadermainwin.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -69,7 +69,10 @@
 #include <Akonadi/KMime/MessageFlags>
 #include "kpimtextedit/texttospeech.h"
 #include <mailcommon/mailutil.h>
-
+#include "messageviewer/config-messageviewer.h"
+#ifdef USE_DKIM_CHECKER
+#include <MessageViewer/DKIMWidgetInfo>
+#endif
 using namespace MailCommon;
 
 KMReaderMainWin::KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage format, bool htmlLoadExtDefault, const QString &name)
@@ -109,14 +112,20 @@
     mZoomLabelIndicator = new ZoomLabelWidget(statusBar());
     statusBar()->addPermanentWidget(mZoomLabelIndicator);
     setZoomChanged(mReaderWin->viewer()->webViewZoomFactor());
-
+#ifdef USE_DKIM_CHECKER
+    statusBar()->addPermanentWidget(mReaderWin->viewer()->dkimWidgetInfo());
+#endif
     if (!mReaderWin->message().isValid()) {
         menuBar()->hide();
         toolBar(QStringLiteral("mainToolBar"))->hide();
+    } else {
+        slotToggleMenubar(true);
     }
     connect(kmkernel, &KMKernel::configChanged, this, &KMReaderMainWin::slotConfigChanged);
     connect(mReaderWin, &KMReaderWin::showStatusBarMessage, this, &KMReaderMainWin::slotShowMessageStatusBar);
     connect(mReaderWin, &KMReaderWin::zoomChanged, this, &KMReaderMainWin::setZoomChanged);
+    connect(mReaderWin, &KMReaderWin::showPreviousMessage, this, &KMReaderMainWin::showPreviousMessage);
+    connect(mReaderWin, &KMReaderWin::showNextMessage, this, &KMReaderMainWin::showNextMessage);
 }
 
 KMReaderMainWin::~KMReaderMainWin()
@@ -180,14 +189,51 @@
     updateActions();
 }
 
-void KMReaderMainWin::showMessage(const QString &encoding, const KMime::Message::Ptr &message)
+void KMReaderMainWin::updateButtons()
 {
-    if (!message) {
+    if (mListMessage.count() <= 1) {
         return;
     }
+    mReaderWin->updateShowMultiMessagesButton((mCurrentMessageIndex > 0), (mCurrentMessageIndex < (mListMessage.count() - 1)));
+}
 
-    Akonadi::Item item;
+void KMReaderMainWin::showNextMessage()
+{
+    if (mCurrentMessageIndex >= (mListMessage.count() - 1)) {
+        return;
+    }
+    mCurrentMessageIndex++;
+    initializeMessage(mListMessage.at(mCurrentMessageIndex));
+    updateButtons();
+}
 
+void KMReaderMainWin::showPreviousMessage()
+{
+    if (mCurrentMessageIndex <= 0) {
+        return;
+    }
+    mCurrentMessageIndex--;
+    initializeMessage(mListMessage.at(mCurrentMessageIndex));
+    updateButtons();
+}
+
+void KMReaderMainWin::showMessage(const QString &encoding, const QList<KMime::Message::Ptr> &message)
+{
+    if (message.isEmpty()) {
+        return;
+    }
+
+    mListMessage = message;
+    mReaderWin->setOverrideEncoding(encoding);
+    mCurrentMessageIndex = 0;
+    initializeMessage(mListMessage.at(mCurrentMessageIndex));
+    mReaderWin->hasMultiMessages(message.count() > 1);
+    updateButtons();
+}
+
+void KMReaderMainWin::initializeMessage(const KMime::Message::Ptr &message)
+{
+    Akonadi::Item item;
     item.setPayload<KMime::Message::Ptr>(message);
     Akonadi::MessageFlags::copyMessageFlags(*message, item);
     item.setMimeType(KMime::Message::mimeType());
@@ -195,7 +241,6 @@
     mMsg = item;
     mMsgActions->setCurrentMessage(item);
 
-    mReaderWin->setOverrideEncoding(encoding);
     mReaderWin->setMessage(message);
     setCaption(message->subject()->asUnicodeString());
 
@@ -203,9 +248,20 @@
     updateActions();
 }
 
+void KMReaderMainWin::showMessage(const QString &encoding, const KMime::Message::Ptr &message)
+{
+    if (!message) {
+        return;
+    }
+    const QList<KMime::Message::Ptr> lst{message};
+    showMessage(encoding, lst);
+}
+
 void KMReaderMainWin::updateActions()
 {
-    menuBar()->show();
+    if (mHideMenuBarAction->isChecked()) {
+        menuBar()->show();
+    }
     toolBar(QStringLiteral("mainToolBar"))->show();
     if (mMsg.isValid()) {
         mTagActionManager->updateActionStates(1, mMsg);
@@ -396,7 +452,7 @@
     mSaveAtmAction = new QAction(QIcon::fromTheme(QStringLiteral("mail-attachment")), i18n("Save A&ttachments..."), actionCollection());
     connect(mSaveAtmAction, &QAction::triggered, mReaderWin->viewer(), &MessageViewer::Viewer::slotAttachmentSaveAll);
 
-    mTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete-shred")), i18n("&Move to Trash"), this);
+    mTrashAction = new QAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18n("&Move to Trash"), this);
     mTrashAction->setIconText(i18nc("@action:intoolbar Move to Trash", "Trash"));
     KMail::Util::addQActionHelpText(mTrashAction, i18n("Move message to trashcan"));
     actionCollection()->addAction(QStringLiteral("move_to_trash"), mTrashAction);
@@ -419,6 +475,8 @@
     if (mReaderWin->message().isValid()) {
         mTagActionManager->updateActionStates(1, mReaderWin->message());
     }
+    mHideMenuBarAction = KStandardAction::showMenubar(this, &KMReaderMainWin::slotToggleMenubar, actionCollection());
+    mHideMenuBarAction->setChecked(KMailSettings::self()->readerShowMenuBar());
 
     //----- Message Menu
     connect(mReaderWin->viewer(), &MessageViewer::Viewer::displayPopupMenu, this, &KMReaderMainWin::slotMessagePopup);
@@ -430,6 +488,28 @@
     connect(mReaderWin->viewer(), &MessageViewer::Viewer::moveMessageToTrash, this, &KMReaderMainWin::slotTrashMessage);
 }
 
+void KMReaderMainWin::slotToggleMenubar(bool dontShowWarning)
+{
+    if (!mReaderWin->message().isValid()) {
+        return;
+    }
+    if (menuBar()) {
+        if (mHideMenuBarAction->isChecked()) {
+            menuBar()->show();
+        } else {
+            if (!dontShowWarning) {
+                const QString accel = mHideMenuBarAction->shortcut().toString();
+                KMessageBox::information(this,
+                                         i18n("<qt>This will hide the menu bar completely."
+                                              " You can show it again by typing %1.</qt>", accel),
+                                         i18n("Hide menu bar"), QStringLiteral("HideMenuBarWarning"));
+            }
+            menuBar()->hide();
+        }
+        KMailSettings::self()->setReaderShowMenuBar(mHideMenuBarAction->isChecked());
+    }
+}
+
 QAction *KMReaderMainWin::copyActionMenu(QMenu *menu)
 {
     KMMainWidget *mainwin = kmkernel->getKMMainWidget();
diff -Nru kmail-19.04.3/src/kmreadermainwin.h kmail-19.12.3/src/kmreadermainwin.h
--- kmail-19.04.3/src/kmreadermainwin.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmreadermainwin.h	2020-03-02 07:34:49.000000000 +0000
@@ -57,6 +57,7 @@
     */
     void showMessage(const QString &encoding, const Akonadi::Item &msg, const Akonadi::Collection &parentCollection = Akonadi::Collection());
 
+    void showMessage(const QString &encoding, const QList<KMime::Message::Ptr> &message);
     void showMessage(const QString &encoding, const KMime::Message::Ptr &message);
     void showMessagePopup(const Akonadi::Item &msg, const QUrl &aUrl, const QUrl &imageUrl, const QPoint &aPoint, bool contactAlreadyExists, bool uniqueContactFound, const WebEngineViewer::WebHitTestResult &result);
 public Q_SLOTS:
@@ -86,7 +87,7 @@
     void slotShowMessageStatusBar(const QString &msg);
 
     void copyOrMoveItem(const Akonadi::Collection &collection, bool move);
-    Akonadi::Collection parentCollection() const;
+    Q_REQUIRED_RESULT Akonadi::Collection parentCollection() const;
     void initKMReaderMainWin();
     void setupAccel();
     QAction *copyActionMenu(QMenu *menu);
@@ -96,7 +97,14 @@
     void slotSelectMoreMessageTagList();
     void toggleMessageSetTag(const Akonadi::Item::List &select, const Akonadi::Tag &tag);
     void slotUpdateMessageTagList(const Akonadi::Tag &tag);
+    void initializeMessage(const KMime::Message::Ptr &message);
+    void showNextMessage();
+    void showPreviousMessage();
+    void updateButtons();
+    void slotToggleMenubar(bool dontShowWarning);
 
+    QList<KMime::Message::Ptr> mListMessage;
+    int mCurrentMessageIndex = 0;
     Akonadi::Collection mParentCollection;
     Akonadi::Item mMsg;
     // a few actions duplicated from kmmainwidget
@@ -106,6 +114,7 @@
     KMReaderWin *mReaderWin = nullptr;
     ZoomLabelWidget *mZoomLabelIndicator = nullptr;
     KMail::TagActionManager *mTagActionManager = nullptr;
+    KToggleAction *mHideMenuBarAction = nullptr;
 };
 
 #endif /*KMReaderMainWin_h*/
diff -Nru kmail-19.04.3/src/kmreadermainwin.rc kmail-19.12.3/src/kmreadermainwin.rc
--- kmail-19.04.3/src/kmreadermainwin.rc	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmreadermainwin.rc	2020-03-02 07:34:49.000000000 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE gui>
-<gui version="527" name="kmreadermainwin" translationDomain="kmail">
+<gui version="528" name="kmreadermainwin" translationDomain="kmail">
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
@@ -71,6 +71,7 @@
   <Menu noMerge="1" name="settings">
    <text>&amp;Settings</text>
    <Merge name="StandardToolBarMenuHandler"/>
+   <Action name="options_show_menubar" group="settings_configure" />
    <Separator/>
    <Action name="options_configure_keybinding" group="settings_configure"/>
    <Action name="options_configure_toolbars" group="settings_configure" />
diff -Nru kmail-19.04.3/src/kmreaderwin.cpp kmail-19.12.3/src/kmreaderwin.cpp
--- kmail-19.04.3/src/kmreaderwin.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmreaderwin.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -93,7 +93,7 @@
     QVBoxLayout *vlay = new QVBoxLayout(this);
     vlay->setContentsMargins(0, 4, 0, 0);
     mViewer = new Viewer(this, mainWindow, mActionCollection);
-    connect(mViewer, QOverload<const Akonadi::Item &, const QUrl &>::of(&Viewer::urlClicked), this, &KMReaderWin::slotUrlClicked);
+    connect(mViewer, qOverload<const Akonadi::Item &, const QUrl &>(&Viewer::urlClicked), this, &KMReaderWin::slotUrlClicked);
     connect(mViewer, &Viewer::requestConfigSync, kmkernel, &KMKernel::slotRequestConfigSync, Qt::QueuedConnection);   // happens anyway on shutdown, so we can skip it there with using a queued connection
     connect(mViewer, &Viewer::makeResourceOnline, kmkernel, &KMKernel::makeResourceOnline);
     connect(mViewer, &MessageViewer::Viewer::showReader, this, &KMReaderWin::slotShowReader);
@@ -101,7 +101,9 @@
     connect(mViewer, &MessageViewer::Viewer::showStatusBarMessage, this, &KMReaderWin::showStatusBarMessage);
     connect(mViewer, &MessageViewer::Viewer::printingFinished, this, &KMReaderWin::slotPrintingFinished);
     connect(mViewer, &MessageViewer::Viewer::zoomChanged, this, &KMReaderWin::zoomChanged);
-    connect(mViewer, QOverload<const Akonadi::Item &>::of(&Viewer::deleteMessage), this, &KMReaderWin::slotDeleteMessage);
+    connect(mViewer, qOverload<const Akonadi::Item &>(&Viewer::deleteMessage), this, &KMReaderWin::slotDeleteMessage);
+    connect(mViewer, &MessageViewer::Viewer::showNextMessage, this, &KMReaderWin::showNextMessage);
+    connect(mViewer, &MessageViewer::Viewer::showPreviousMessage, this, &KMReaderWin::showPreviousMessage);
 
     mViewer->addMessageLoadedHandler(new MessageViewer::MarkMessageReadHandler(this));
     mViewer->addMessageLoadedHandler(new MailCommon::SendMdnHandler(kmkernel, this));
@@ -248,6 +250,16 @@
     clear();
 }
 
+void KMReaderWin::updateShowMultiMessagesButton(bool enablePreviousButton, bool enableNextButton)
+{
+    mViewer->updateShowMultiMessagesButton(enablePreviousButton, enableNextButton);
+}
+
+void KMReaderWin::hasMultiMessages(bool multi)
+{
+    mViewer->hasMultiMessages(multi);
+}
+
 // enter items for the "Important changes" list here:
 static const char *const kmailChanges[] = {
     I18N_NOOP("KMail is now based on the Akonadi Personal Information Management framework, which brings many "
@@ -290,13 +302,13 @@
 void KMReaderWin::displaySplashPage(const QString &templateName, const QVariantHash &_data)
 {
     QVariantHash data = _data;
-    if (!data.contains(QStringLiteral("icon"))) {
+    if (!data.contains(QLatin1String("icon"))) {
         data[QStringLiteral("icon")] = QStringLiteral("kmail");
     }
-    if (!data.contains(QStringLiteral("name"))) {
+    if (!data.contains(QLatin1String("name"))) {
         data[QStringLiteral("name")] = i18n("KMail");
     }
-    if (!data.contains(QStringLiteral("subtitle"))) {
+    if (!data.contains(QLatin1String("subtitle"))) {
         data[QStringLiteral("subtitle")] = i18n("The KDE Mail Client");
     }
 
diff -Nru kmail-19.04.3/src/kmreaderwin.h kmail-19.12.3/src/kmreaderwin.h
--- kmail-19.04.3/src/kmreaderwin.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmreaderwin.h	2020-03-02 07:34:49.000000000 +0000
@@ -67,7 +67,7 @@
     /** Get selected override character encoding.
       @return The encoding selected by the user or an empty string if auto-detection
       is selected. */
-    QString overrideEncoding() const;
+    Q_REQUIRED_RESULT QString overrideEncoding() const;
     /** Set the override character encoding. */
     void setOverrideEncoding(const QString &encoding);
     void setPrinting(bool enable);
@@ -86,27 +86,27 @@
     void update(bool force = false);
 
     /** Return selected text */
-    QString copyText() const;
+    Q_REQUIRED_RESULT QString copyText() const;
 
     /** Override default html mail setting */
-    bool htmlOverride() const;
+    Q_REQUIRED_RESULT bool htmlOverride() const;
     void setHtmlOverride(bool override);
-    MessageViewer::Viewer::DisplayFormatMessage displayFormatMessageOverwrite() const;
+    Q_REQUIRED_RESULT MessageViewer::Viewer::DisplayFormatMessage displayFormatMessageOverwrite() const;
     void setDisplayFormatMessageOverwrite(MessageViewer::Viewer::DisplayFormatMessage format);
 
     /** Override default load external references setting */
-    bool htmlLoadExtOverride() const;
+    Q_REQUIRED_RESULT bool htmlLoadExtOverride() const;
     void setHtmlLoadExtDefault(bool loadExtDefault);
     void setHtmlLoadExtOverride(bool loadExtOverride);
 
     /** Is html mail to be supported? Takes into account override */
-    bool htmlMail() const;
+    Q_REQUIRED_RESULT bool htmlMail() const;
 
     /** Is loading ext. references to be supported? Takes into account override */
-    bool htmlLoadExternal();
+    Q_REQUIRED_RESULT bool htmlLoadExternal();
 
     /** Returns the MD5 hash for the list of new features */
-    static QString newFeaturesMD5();
+    static Q_REQUIRED_RESULT QString newFeaturesMD5();
 
     /** Display a generic HTML splash page instead of a message */
     void displaySplashPage(const QString &templateName, const QVariantHash &data);
@@ -169,16 +169,22 @@
     bool mimePartTreeIsEmpty() const;
     KActionMenu *shareServiceUrlMenu() const;
 
-    QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
+    Q_REQUIRED_RESULT QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
 
-    QList<QAction *> interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const;
+    Q_REQUIRED_RESULT QList<QAction *> interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const;
 
     void setPrintElementBackground(bool printElementBackground);
     /** Force update even if message is the same */
     void clearCache();
+
+    void hasMultiMessages(bool multi);
+
+    void updateShowMultiMessagesButton(bool enablePreviousButton, bool enableNextButton);
 Q_SIGNALS:
     void showStatusBarMessage(const QString &message);
     void zoomChanged(qreal factor);
+    void showPreviousMessage();
+    void showNextMessage();
 
 public Q_SLOTS:
 
diff -Nru kmail-19.04.3/src/kmstartup.cpp kmail-19.12.3/src/kmstartup.cpp
--- kmail-19.04.3/src/kmstartup.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmstartup.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2000 Don Sanders <sanders@kde.org>
-
-    KMail is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License, version 2, as
-    published by the Free Software Foundation.
-
-    KMail 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 "kmstartup.h"
-
-#include <kiconloader.h>
-
-namespace KMail {
-void insertLibraryIcons()
-{
-    static const char *const iconPath[] = {
-        "libkleopatra",
-        "messagelist",
-        "libmessageviewer",
-        "kmail2"
-    };
-
-    KIconLoader *il = KIconLoader::global();
-    unsigned int catalogSize = (sizeof iconPath / sizeof *iconPath);
-    for (unsigned int i = 0; i < catalogSize; ++i) {
-        il->addAppDir(QLatin1String(iconPath[i]));
-    }
-}
-}
diff -Nru kmail-19.04.3/src/kmstartup.h kmail-19.12.3/src/kmstartup.h
--- kmail-19.04.3/src/kmstartup.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmstartup.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/*
-    This file is part of KMail, the KDE mail client.
-    Copyright (c) 2000 Don Sanders <sanders@kde.org>
-
-    KMail is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License, version 2, as
-    published by the Free Software Foundation.
-
-    KMail 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
-*/
-#ifndef KMSTARTUP
-#define KMSTARTUP
-
-#include "kmail_export.h"
-
-namespace KMail {
-KMAIL_EXPORT void insertLibraryIcons();
-}
-
-#endif
diff -Nru kmail-19.04.3/src/kmsystemtray.cpp kmail-19.12.3/src/kmsystemtray.cpp
--- kmail-19.04.3/src/kmsystemtray.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmsystemtray.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -27,7 +27,6 @@
 #include "MailCommon/FolderTreeView"
 #include <AkonadiCore/NewMailNotifierAttribute>
 
-#include <kiconloader.h>
 #include <kwindowsystem.h>
 #include "kmail_debug.h"
 #include <QMenu>
diff -Nru kmail-19.04.3/src/kmsystemtray.h kmail-19.12.3/src/kmsystemtray.h
--- kmail-19.04.3/src/kmsystemtray.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kmsystemtray.h	2020-03-02 07:34:49.000000000 +0000
@@ -36,7 +36,7 @@
 {
     Q_OBJECT
 public:
-    /** construtor */
+    /** constructor */
     explicit KMSystemTray(QObject *parent = nullptr);
     /** destructor */
     ~KMSystemTray();
@@ -54,8 +54,8 @@
     void slotContextMenuAboutToShow();
     void slotSelectCollection(QAction *act);
 
-    bool mainWindowIsOnCurrentDesktop();
-    bool buildPopupMenu();
+    Q_REQUIRED_RESULT bool mainWindowIsOnCurrentDesktop();
+    Q_REQUIRED_RESULT bool buildPopupMenu();
     void fillFoldersMenu(QMenu *menu, const QAbstractItemModel *model, const QString &parentName = QString(), const QModelIndex &parentIndex = QModelIndex());
     int mDesktopOfMainWin = 0;
 
diff -Nru kmail-19.04.3/src/kontactplugin/kmail/kcmkmailsummary.desktop kmail-19.12.3/src/kontactplugin/kmail/kcmkmailsummary.desktop
--- kmail-19.04.3/src/kontactplugin/kmail/kcmkmailsummary.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/kmail/kcmkmailsummary.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -25,6 +25,7 @@
 Name[en_GB]=New Messages
 Name[es]=Mensajes nuevos
 Name[et]=Uued kirjad
+Name[eu]=Mezu berriak
 Name[fa]=پیامهای جدید
 Name[fi]=Uudet viestit
 Name[fr]=Nouveaux messages
@@ -71,8 +72,8 @@
 Comment[ar]=إعداد ملخّص البريد
 Comment[bg]=Настройки на обобщението на писмата
 Comment[bs]=Postavke kratkog sadržaja elektronske pošte
-Comment[ca]=Configuració del resum pel correu
-Comment[ca@valencia]=Configuració del resum pel correu
+Comment[ca]=Configuració del resum per al correu
+Comment[ca@valencia]=Configuració del resum per al correu
 Comment[cs]=Nastavení souhrnu pošty
 Comment[da]=Opsætning af postoversigt
 Comment[de]=Mailübersicht-Einstellungen
@@ -80,7 +81,7 @@
 Comment[en_GB]=Mail Summary Setup
 Comment[es]=Configuración del resumen de correo
 Comment[et]=E-posti kokkuvõtte seadistus
-Comment[eu]=Postaren laburpenaren konfigurazioa
+Comment[eu]=Posta laburpenaren ezarpena
 Comment[fa]=برپایی خلاصه نامه
 Comment[fi]=Sähköpostiyhteenvedon asetukset
 Comment[fr]=Configuration du résumé du courriel
@@ -97,7 +98,7 @@
 Comment[kk]=Пошта қортындысын баптау
 Comment[km]=រៀបចំ​សេចក្ដី​សង្ខេប​សំបុត្រ
 Comment[ko]=메일 요약 설정
-Comment[lt]=Pašto santraukos nustatymai
+Comment[lt]=Pašto santraukos nuostatos
 Comment[lv]=Pasta kopsavilkuma iestatījumi
 Comment[mk]=Поставување на преглед за е-пошта
 Comment[mr]=मेल सारांश संयोजना
@@ -141,6 +142,7 @@
 X-KDE-Keywords[en_GB]=email, summary, configure, settings
 X-KDE-Keywords[es]=correo, resumen, configurar, preferencias
 X-KDE-Keywords[et]=e-post, meil, kokkuvõte, seadistamine, seadistused
+X-KDE-Keywords[eu]=eposta, email, laburpen, konfiguratu, ezarpenak
 X-KDE-Keywords[fi]=email, sähköposti, summary, yhteenveto, configure, settings, asetukset
 X-KDE-Keywords[fr]=courriel,résumé,configuration,paramètres
 X-KDE-Keywords[ga]=ríomhphost, achoimre, cumraigh, socruithe
diff -Nru kmail-19.04.3/src/kontactplugin/kmail/kmail_plugin.cpp kmail-19.12.3/src/kontactplugin/kmail/kmail_plugin.cpp
--- kmail-19.04.3/src/kontactplugin/kmail/kmail_plugin.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/kmail/kmail_plugin.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -27,8 +27,8 @@
 #include "summarywidget.h"
 
 #include <KContacts/VCardDrag>
-#include <KCalCore/MemoryCalendar>
-#include <KCalCore/FileStorage>
+#include <KCalendarCore/MemoryCalendar>
+#include <KCalendarCore/FileStorage>
 #include <KCalUtils/ICalDrag>
 #include <KCalUtils/VCalDrag>
 
@@ -45,7 +45,7 @@
 #include <QStandardPaths>
 
 using namespace KCalUtils;
-using namespace KCalCore;
+using namespace KCalendarCore;
 
 EXPORT_KONTACT_PLUGIN(KMailPlugin, kmail)
 
@@ -126,7 +126,7 @@
         for (it = list.constBegin(); it != end; ++it) {
             to.append((*it).fullEmail());
         }
-        openComposer(to.join(QStringLiteral(", ")));
+        openComposer(to.join(QLatin1String(", ")));
     }
 
     qCWarning(KMAILPLUGIN_LOG) << QStringLiteral("Cannot handle drop events of type '%1'.").arg(de->mimeData()->formats().join(QLatin1Char(';')));
@@ -175,16 +175,6 @@
     m_instance = nullptr;
 }
 
-bool KMailPlugin::createDBUSInterface(const QString &serviceType)
-{
-    if (serviceType == QLatin1String("DBUS/Mailer")) {
-        if (part()) {
-            return true;
-        }
-    }
-    return false;
-}
-
 KParts::ReadOnlyPart *KMailPlugin::createPart()
 {
     KParts::ReadOnlyPart *part = loadPart();
diff -Nru kmail-19.04.3/src/kontactplugin/kmail/kmailplugin.desktop kmail-19.12.3/src/kontactplugin/kmail/kmailplugin.desktop
--- kmail-19.04.3/src/kontactplugin/kmail/kmailplugin.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/kmail/kmailplugin.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -23,8 +23,8 @@
 Comment[bg]=Приставка връзка между пощата и адресника
 Comment[br]=Lugent Kontact KMail
 Comment[bs]=Kontakt KMail Dodatak
-Comment[ca]=Connector del KMail pel Kontact
-Comment[ca@valencia]=Connector del KMail pel Kontact
+Comment[ca]=Connector del KMail per al Kontact
+Comment[ca@valencia]=Connector del KMail per al Kontact
 Comment[cs]=Modul KMailu pro aplikaci Kontact
 Comment[cy]=Ategyn KMail Kontact
 Comment[da]=Kontact KMail-plugin
@@ -34,7 +34,7 @@
 Comment[eo]=Kontact-KMail-kromaĵo
 Comment[es]=Complemento de KMail para Kontact
 Comment[et]=Kontacti KMaili plugin
-Comment[eu]=Kontact-en KMail plugin-a
+Comment[eu]=Kontact-en KMail-eko plugina
 Comment[fa]=وصله Kontact KMail
 Comment[fi]=Kontactin KMail-liitännäinen
 Comment[fr]=Module KMail pour Kontact
diff -Nru kmail-19.04.3/src/kontactplugin/kmail/kmail_plugin.h kmail-19.12.3/src/kontactplugin/kmail/kmail_plugin.h
--- kmail-19.04.3/src/kontactplugin/kmail/kmail_plugin.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/kmail/kmail_plugin.h	2020-03-02 07:34:49.000000000 +0000
@@ -45,7 +45,7 @@
     }
 
     void loadCommandLineOptions(QCommandLineParser *parser) override;
-    int activate(const QStringList &args, const QString &workingDir) override;
+    Q_REQUIRED_RESULT int activate(const QStringList &args, const QString &workingDir) override;
 };
 
 class KMailPlugin : public KontactInterface::Plugin
@@ -56,13 +56,12 @@
     KMailPlugin(KontactInterface::Core *core, const QVariantList &);
     ~KMailPlugin();
 
-    bool isRunningStandalone() const override;
-    bool createDBUSInterface(const QString &serviceType) override;
+    Q_REQUIRED_RESULT bool isRunningStandalone() const override;
     KontactInterface::Summary *createSummaryWidget(QWidget *parent) override;
-    int weight() const override;
+    Q_REQUIRED_RESULT int weight() const override;
 
-    QStringList invisibleToolbarActions() const override;
-    bool queryClose() const override;
+    Q_REQUIRED_RESULT QStringList invisibleToolbarActions() const override;
+    Q_REQUIRED_RESULT bool queryClose() const override;
 
     void shortcutChanged() override;
 
diff -Nru kmail-19.04.3/src/kontactplugin/kmail/summarywidget.cpp kmail-19.12.3/src/kontactplugin/kmail/summarywidget.cpp
--- kmail-19.04.3/src/kontactplugin/kmail/summarywidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/kmail/summarywidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -90,7 +90,7 @@
         = new KViewStateMaintainer<Akonadi::ETMViewStateSaver>(_config->group("CheckState"), this);
     mModelState->setSelectionModel(mSelectionModel);
 
-    connect(mChangeRecorder, QOverload<const Akonadi::Collection &>::of(&Akonadi::ChangeRecorder::collectionChanged), this, &SummaryWidget::slotCollectionChanged);
+    connect(mChangeRecorder, qOverload<const Akonadi::Collection &>(&Akonadi::ChangeRecorder::collectionChanged), this, &SummaryWidget::slotCollectionChanged);
     connect(mChangeRecorder, &Akonadi::ChangeRecorder::collectionRemoved, this, &SummaryWidget::slotCollectionChanged);
     connect(mChangeRecorder, &Akonadi::ChangeRecorder::collectionStatisticsChanged, this, &SummaryWidget::slotCollectionChanged);
     QTimer::singleShot(0, this, &SummaryWidget::slotUpdateFolderList);
@@ -165,7 +165,7 @@
                                           stats.count(),
                                           stats.unreadCount()));
 
-                connect(urlLabel, QOverload<const QString &>::of(&KUrlLabel::leftClickedUrl), this, &SummaryWidget::selectFolder);
+                connect(urlLabel, qOverload<const QString &>(&KUrlLabel::leftClickedUrl), this, &SummaryWidget::selectFolder);
 
                 // Read and unread count.
                 QLabel *label = new QLabel(i18nc("%1: number of unread messages "
diff -Nru kmail-19.04.3/src/kontactplugin/kmail/summarywidget.h kmail-19.12.3/src/kontactplugin/kmail/summarywidget.h
--- kmail-19.04.3/src/kontactplugin/kmail/summarywidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/kmail/summarywidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -55,9 +55,9 @@
 public:
     SummaryWidget(KontactInterface::Plugin *plugin, QWidget *parent);
 
-    int summaryHeight() const override;
+    Q_REQUIRED_RESULT int summaryHeight() const override;
 
-    QStringList configModules() const override;
+    Q_REQUIRED_RESULT QStringList configModules() const override;
 
 protected:
     bool eventFilter(QObject *obj, QEvent *e) override;
diff -Nru kmail-19.04.3/src/kontactplugin/summary/dropwidget.cpp kmail-19.12.3/src/kontactplugin/summary/dropwidget.cpp
--- kmail-19.04.3/src/kontactplugin/summary/dropwidget.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/summary/dropwidget.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -24,7 +24,6 @@
 #include <QDragEnterEvent>
 #include <QDropEvent>
 #include <QMimeData>
-
 DropWidget::DropWidget(QWidget *parent)
     : QWidget(parent)
 {
diff -Nru kmail-19.04.3/src/kontactplugin/summary/kcmkontactsummary.cpp kmail-19.12.3/src/kontactplugin/summary/kcmkontactsummary.cpp
--- kmail-19.04.3/src/kontactplugin/summary/kcmkontactsummary.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/summary/kcmkontactsummary.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -37,7 +37,7 @@
 
 #include <QLabel>
 #include <QVBoxLayout>
-
+#include <kconfigwidgets_version.h>
 extern "C"
 {
 Q_DECL_EXPORT KCModule *create_kontactsummary(QWidget *parent, const char *)
@@ -109,9 +109,13 @@
     layout->setStretchFactor(mPluginView, 1);
 
     load();
+#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 64, 0)
     connect(mPluginView, &QTreeWidget::itemChanged,
-            this, QOverload<>::of(&KCMKontactSummary::changed));
-
+            this, qOverload<>(&KCMKontactSummary::changed));
+#else
+    connect(mPluginView, &QTreeWidget::itemChanged,
+            this, &KCMKontactSummary::markAsChanged);
+#endif
     KAboutData *about = new KAboutData(QStringLiteral("kontactsummary"),
                                        i18n("kontactsummary"),
                                        QString(),
diff -Nru kmail-19.04.3/src/kontactplugin/summary/kcmkontactsummary.desktop kmail-19.12.3/src/kontactplugin/summary/kcmkontactsummary.desktop
--- kmail-19.04.3/src/kontactplugin/summary/kcmkontactsummary.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/summary/kcmkontactsummary.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -23,6 +23,7 @@
 Name[en_GB]=Summaries
 Name[es]=Resúmenes
 Name[et]=Kokkuvõtted
+Name[eu]=Laburpenak
 Name[fi]=Yhteenvedot
 Name[fr]=Résumés
 Name[ga]=Achoimrí
@@ -74,6 +75,7 @@
 Comment[en_GB]=Summary Selection
 Comment[es]=Selección de resumen
 Comment[et]=Kokkuvõtete valik
+Comment[eu]=Laburpen hautapena
 Comment[fi]=Yhteenvedon valinta
 Comment[fr]=Sélection des résumés
 Comment[ga]=Roghnú Achoimrí
diff -Nru kmail-19.04.3/src/kontactplugin/summary/summaryplugin.desktop kmail-19.12.3/src/kontactplugin/summary/summaryplugin.desktop
--- kmail-19.04.3/src/kontactplugin/summary/summaryplugin.desktop	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/summary/summaryplugin.desktop	2020-03-02 07:34:49.000000000 +0000
@@ -26,7 +26,7 @@
 Comment[en_GB]=Kontact SummaryView Plugin
 Comment[es]=Complemento de vista de resumen para Kontact
 Comment[et]=Kontakti kokkuvõttevaate plugin
-Comment[eu]=Kontact-en SummaryView plugin-a
+Comment[eu]=Kontact-eko laburpen ikuspegirako plugina
 Comment[fa]=وصله نمای خلاصه Kontact
 Comment[fi]=Kontactin yhteenvetonäkymän liitännäinen
 Comment[fr]=Module de vue résumée pour Kontact
diff -Nru kmail-19.04.3/src/kontactplugin/summary/summaryview_part.cpp kmail-19.12.3/src/kontactplugin/summary/summaryview_part.cpp
--- kmail-19.04.3/src/kontactplugin/summary/summaryview_part.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/summary/summaryview_part.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -436,7 +436,7 @@
 
     QStringList modules = configModules();
     modules.prepend(QStringLiteral("kcmkontactsummary.desktop"));
-    connect(dlg.data(), QOverload<>::of(&KCMultiDialog::configCommitted),
+    connect(dlg.data(), qOverload<>(&KCMultiDialog::configCommitted),
             this, &SummaryViewPart::updateWidgets);
 
     QStringList::ConstIterator strIt;
diff -Nru kmail-19.04.3/src/kontactplugin/summary/summaryview_part.h kmail-19.12.3/src/kontactplugin/summary/summaryview_part.h
--- kmail-19.04.3/src/kontactplugin/summary/summaryview_part.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/summary/summaryview_part.h	2020-03-02 07:34:49.000000000 +0000
@@ -25,7 +25,7 @@
 #define SUMMARYVIEW_PART_H
 
 #include <KParts/ReadOnlyPart>
-#include <kparts/readonlypart.h>
+#include <QMap>
 
 class DropWidget;
 
@@ -59,7 +59,7 @@
     void textChanged(const QString &);
 
 protected:
-    bool openFile() override;
+    Q_REQUIRED_RESULT bool openFile() override;
     void partActivateEvent(KParts::PartActivateEvent *event) override;
 
 protected Q_SLOTS:
diff -Nru kmail-19.04.3/src/kontactplugin/summary/summaryview_plugin.cpp kmail-19.12.3/src/kontactplugin/summary/summaryview_plugin.cpp
--- kmail-19.04.3/src/kontactplugin/summary/summaryview_plugin.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/kontactplugin/summary/summaryview_plugin.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -42,7 +42,7 @@
 {
     mSyncAction = new KSelectAction(QIcon::fromTheme(QStringLiteral("view-refresh")), i18n("Sync All"), this);
     actionCollection()->addAction(QStringLiteral("kontact_summary_sync"), mSyncAction);
-    connect(mSyncAction, QOverload<QAction *>::of(&KSelectAction::triggered), this, &SummaryView::syncAccount);
+    connect(mSyncAction, qOverload<QAction *>(&KSelectAction::triggered), this, &SummaryView::syncAccount);
     connect(mSyncAction->menu(), &QMenu::aboutToShow, this, &SummaryView::fillSyncActionSubEntries);
 
     insertSyncAction(mSyncAction);
@@ -56,14 +56,16 @@
     mAllSync = mSyncAction->addAction(i18nc("@action:inmenu sync everything", "All"));
 
     QStringList menuItems;
-    org::kde::kmail::kmail kmail(QStringLiteral("org.kde.kmail"), QStringLiteral("/KMail"), QDBusConnection::sessionBus());
-    const QDBusReply<QStringList> reply = kmail.accounts();
-    if (reply.isValid()) {
-        menuItems << reply.value();
-    }
-
-    for (const QString &acc : qAsConst(menuItems)) {
-        mSyncAction->addAction(acc);
+    if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.kde.kmail"))) {
+        org::kde::kmail::kmail kmail(QStringLiteral("org.kde.kmail"), QStringLiteral("/KMail"), QDBusConnection::sessionBus());
+        const QDBusReply<QStringList> reply = kmail.accounts();
+        if (reply.isValid()) {
+            menuItems << reply.value();
+        }
+
+        for (const QString &acc : qAsConst(menuItems)) {
+            mSyncAction->addAction(acc);
+        }
     }
 }
 
diff -Nru kmail-19.04.3/src/mailserviceimpl.h kmail-19.12.3/src/mailserviceimpl.h
--- kmail-19.04.3/src/mailserviceimpl.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/mailserviceimpl.h	2020-03-02 07:34:49.000000000 +0000
@@ -42,9 +42,9 @@
     Q_OBJECT
 public:
     MailServiceImpl();
-    bool sendMessage(const QString &from, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QStringList &attachments);
+    Q_REQUIRED_RESULT bool sendMessage(const QString &from, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QStringList &attachments);
 
-    bool sendMessage(const QString &from, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QByteArray &attachment);
+    Q_REQUIRED_RESULT bool sendMessage(const QString &from, const QString &to, const QString &cc, const QString &bcc, const QString &subject, const QString &body, const QByteArray &attachment);
 private:
     Q_DISABLE_COPY(MailServiceImpl)
 };
diff -Nru kmail-19.04.3/src/main.cpp kmail-19.12.3/src/main.cpp
--- kmail-19.04.3/src/main.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/main.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -30,8 +30,6 @@
 
 #include "aboutdata.h"
 
-#include "kmstartup.h"
-
 #include <QDir>
 #include <QApplication>
 #include <QSessionManager>
@@ -119,15 +117,11 @@
 
 int main(int argc, char *argv[])
 {
-#if defined(Q_OS_UNIX) && QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
-    // enforce xcb plugin fix bug Bug 367598
-    qputenv("QT_QPA_PLATFORM", "xcb");
-#endif
-    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
+    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
+    QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     KMailApplication app(argc, &argv);
     KLocalizedString::setApplicationDomain("kmail");
-    app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kmail")));
     app.setDesktopFileName(QStringLiteral("org.kde.kmail2"));
     KCrash::initialize();
@@ -149,9 +143,6 @@
     KMMigrateApplication migrate;
     migrate.migrate();
 
-    // import i18n data and icons from libraries:
-    KMail::insertLibraryIcons();
-
     //local, do the init
     KMKernel kmailKernel;
     kmailKernel.init();
diff -Nru kmail-19.04.3/src/searchdialog/incompleteindexdialog.h kmail-19.12.3/src/searchdialog/incompleteindexdialog.h
--- kmail-19.04.3/src/searchdialog/incompleteindexdialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/searchdialog/incompleteindexdialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -45,7 +45,7 @@
     void slotStopIndexing();
     void readConfig();
     void writeConfig();
-    QList<qlonglong> collectionsToReindex() const;
+    Q_REQUIRED_RESULT QList<qlonglong> collectionsToReindex() const;
     void waitForIndexer();
     void updateAllSelection(bool select);
 
diff -Nru kmail-19.04.3/src/searchdialog/kmsearchmessagemodel.h kmail-19.12.3/src/searchdialog/kmsearchmessagemodel.h
--- kmail-19.04.3/src/searchdialog/kmsearchmessagemodel.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/searchdialog/kmsearchmessagemodel.h	2020-03-02 07:34:49.000000000 +0000
@@ -53,7 +53,7 @@
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
 private:
-    QString fullCollectionPath(Akonadi::Collection::Id id) const;
+    Q_REQUIRED_RESULT QString fullCollectionPath(Akonadi::Collection::Id id) const;
 
     mutable QHash<Akonadi::Collection::Id, QString> m_collectionFullPathCache;
 };
diff -Nru kmail-19.04.3/src/searchdialog/searchdescriptionattribute.h kmail-19.12.3/src/searchdialog/searchdescriptionattribute.h
--- kmail-19.04.3/src/searchdialog/searchdescriptionattribute.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/searchdialog/searchdescriptionattribute.h	2020-03-02 07:34:49.000000000 +0000
@@ -30,17 +30,17 @@
 {
 public:
     SearchDescriptionAttribute();
-    QByteArray description() const;
+    Q_REQUIRED_RESULT QByteArray description() const;
     void setDescription(const QByteArray &desc);
-    Akonadi::Collection baseCollection() const;
+    Q_REQUIRED_RESULT Akonadi::Collection baseCollection() const;
     void setBaseCollection(const Akonadi::Collection &);
-    bool recursive() const;
+    Q_REQUIRED_RESULT bool recursive() const;
     void setRecursive(bool);
 
     void setListCollection(const QList<Akonadi::Collection::Id> &col);
     QList<Akonadi::Collection::Id> listCollection() const;
 
-    QByteArray type() const override;
+    Q_REQUIRED_RESULT QByteArray type() const override;
     Attribute *clone() const override;
     QByteArray serialized() const override;
     void deserialize(const QByteArray &data) override;
diff -Nru kmail-19.04.3/src/searchdialog/searchpatternwarning.cpp kmail-19.12.3/src/searchdialog/searchpatternwarning.cpp
--- kmail-19.04.3/src/searchdialog/searchpatternwarning.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/searchdialog/searchpatternwarning.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -37,7 +37,7 @@
 
 void SearchPatternWarning::setError(const QStringList &lstError)
 {
-    setText(i18n("Search failed some errors were found: <ul><li>%1</li></ul>", lstError.join(QStringLiteral("</li><li>"))));
+    setText(i18n("Search failed some errors were found: <ul><li>%1</li></ul>", lstError.join(QLatin1String("</li><li>"))));
 }
 
 void SearchPatternWarning::showWarningPattern(const QStringList &lstError)
diff -Nru kmail-19.04.3/src/searchdialog/searchwindow.cpp kmail-19.12.3/src/searchdialog/searchwindow.cpp
--- kmail-19.04.3/src/searchdialog/searchwindow.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/searchdialog/searchwindow.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -50,11 +50,9 @@
 #include "kmail_debug.h"
 #include <QIcon>
 #include <QSortFilterProxyModel>
-#include <KIconLoader>
 #include <kmime/kmime_message.h>
 #include <KStandardAction>
 #include <KStandardGuiItem>
-#include <KWindowSystem>
 #include <KMessageBox>
 #include <AkonadiSearch/PIM/indexeditems.h>
 
@@ -79,11 +77,6 @@
 {
     setWindowTitle(i18n("Find Messages"));
 
-    KWindowSystem::setIcons(winId(), qApp->windowIcon().pixmap(IconSize(KIconLoader::Desktop),
-                                                               IconSize(KIconLoader::Desktop)),
-                            qApp->windowIcon().pixmap(IconSize(KIconLoader::Small),
-                                                      IconSize(KIconLoader::Small)));
-
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
 
     QWidget *topWidget = new QWidget;
@@ -133,9 +126,9 @@
     mUi.mLbxMatches->setSortingEnabled(true);
 
     connect(mUi.mLbxMatches, &Akonadi::EntityTreeView::customContextMenuRequested, this, &SearchWindow::slotContextMenuRequested);
-    connect(mUi.mLbxMatches, QOverload<const Akonadi::Item &>::of(&Akonadi::EntityTreeView::doubleClicked),
+    connect(mUi.mLbxMatches, qOverload<const Akonadi::Item &>(&Akonadi::EntityTreeView::doubleClicked),
             this, &SearchWindow::slotViewMsg);
-    connect(mUi.mLbxMatches, QOverload<const Akonadi::Item &>::of(&Akonadi::EntityTreeView::currentChanged),
+    connect(mUi.mLbxMatches, qOverload<const Akonadi::Item &>(&Akonadi::EntityTreeView::currentChanged),
             this, &SearchWindow::slotCurrentChanged);
     connect(mUi.selectMultipleFolders, &QPushButton::clicked, this, &SearchWindow::slotSelectMultipleFolders);
 
@@ -227,6 +220,7 @@
     for (QAction *action : actList) {
         action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
     }
+    mUi.mProgressIndicator->hide();
 }
 
 SearchWindow::~SearchWindow()
@@ -523,7 +517,7 @@
     }
 
     connect(mSearchJob, &Akonadi::CollectionModifyJob::result, this, &SearchWindow::searchDone);
-    mUi.mProgressIndicator->start();
+    mUi.mProgressIndicator->show();
     enableGUI();
     mUi.mStatusLbl->setText(i18n("Searching..."));
 }
@@ -534,7 +528,7 @@
     mSearchJob = nullptr;
     QMetaObject::invokeMethod(this, &SearchWindow::enableGUI, Qt::QueuedConnection);
 
-    mUi.mProgressIndicator->stop();
+    mUi.mProgressIndicator->hide();
     if (job->error()) {
         qCDebug(KMAIL_LOG) << job->errorString();
         KMessageBox::sorry(this, i18n("Cannot get search result. %1", job->errorString()));
@@ -614,7 +608,7 @@
 
 void SearchWindow::slotStop()
 {
-    mUi.mProgressIndicator->stop();
+    mUi.mProgressIndicator->hide();
     if (mSearchJob) {
         mSearchJob->kill(KJob::Quietly);
         mSearchJob->deleteLater();
@@ -838,7 +832,7 @@
 
 void SearchWindow::slotSaveAttachments()
 {
-    KMSaveAttachmentsCommand *saveCommand = new KMSaveAttachmentsCommand(this, selectedMessages());
+    KMSaveAttachmentsCommand *saveCommand = new KMSaveAttachmentsCommand(this, selectedMessages(), nullptr);
     saveCommand->start();
 }
 
@@ -909,7 +903,7 @@
     }
 
     enableGUI();
-    mUi.mProgressIndicator->start();
+    mUi.mProgressIndicator->hide();
     mUi.mStatusLbl->setText(i18n("Checking index status..."));
     //Fetch collection ?
     for (const Akonadi::Collection &col : qAsConst(cols)) {
diff -Nru kmail-19.04.3/src/searchdialog/searchwindow.h kmail-19.12.3/src/searchdialog/searchwindow.h
--- kmail-19.04.3/src/searchdialog/searchwindow.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/searchdialog/searchwindow.h	2020-03-02 07:34:49.000000000 +0000
@@ -90,14 +90,14 @@
      *
      * @return The list of currently selected search result messages.
      */
-    Akonadi::Item::List selectedMessages() const;
+    Q_REQUIRED_RESULT Akonadi::Item::List selectedMessages() const;
 
     /**
      * Provides access to the currently selected message.
      *
      * @return the currently selected message.
      */
-    Akonadi::Item selectedMessage() const;
+    Q_REQUIRED_RESULT Akonadi::Item selectedMessage() const;
 
     /**
      * Loads a search pattern into the search window, appending its rules to the current one.
diff -Nru kmail-19.04.3/src/settings/kmail.kcfg.cmake kmail-19.12.3/src/settings/kmail.kcfg.cmake
--- kmail-19.04.3/src/settings/kmail.kcfg.cmake	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/settings/kmail.kcfg.cmake	2020-03-02 07:34:49.000000000 +0000
@@ -140,6 +140,14 @@
         <label></label>
         <whatsthis></whatsthis>
       </entry>
+
+      <entry key="ReaderShowMenuBar" type="Bool">
+        <default>true</default>
+         <!-- label and whatsthis are already provided by KStandardAction::showMenubar -->
+        <label></label>
+        <whatsthis></whatsthis>
+      </entry>
+
       <entry key="ComposerShowMenuBar" type="Bool">
         <default>true</default>
          <!-- label and whatsthis are already provided by KStandardAction::showMenubar -->
@@ -422,4 +430,13 @@
      <default>100</default>
    </entry>
  </group>
+
+ <group name="UndoSend">
+   <entry name="EnabledUndoSend" type="Bool">
+     <default>false</default>
+   </entry>
+   <entry name="UndoSendDelay" type="Int">
+     <default>10</default>
+   </entry>
+ </group>
 </kcfg>
diff -Nru kmail-19.04.3/src/sieveimapinterface/kmailsieveimapinstanceinterface.h kmail-19.12.3/src/sieveimapinterface/kmailsieveimapinstanceinterface.h
--- kmail-19.04.3/src/sieveimapinterface/kmailsieveimapinstanceinterface.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/sieveimapinterface/kmailsieveimapinstanceinterface.h	2020-03-02 07:34:49.000000000 +0000
@@ -28,7 +28,7 @@
     KMailSieveImapInstanceInterface();
     ~KMailSieveImapInstanceInterface() override = default;
 
-    QVector<KSieveUi::SieveImapInstance> sieveImapInstances() override;
+    Q_REQUIRED_RESULT QVector<KSieveUi::SieveImapInstance> sieveImapInstances() override;
 private:
     Q_DISABLE_COPY(KMailSieveImapInstanceInterface)
 };
diff -Nru kmail-19.04.3/src/sieveimapinterface/kmsieveimappasswordprovider.h kmail-19.12.3/src/sieveimapinterface/kmsieveimappasswordprovider.h
--- kmail-19.04.3/src/sieveimapinterface/kmsieveimappasswordprovider.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/sieveimapinterface/kmsieveimappasswordprovider.h	2020-03-02 07:34:49.000000000 +0000
@@ -29,11 +29,11 @@
 public:
     KMSieveImapPasswordProvider(WId wid);
 
-    QString password(const QString &identifier) override;
-    QString sieveCustomPassword(const QString &identifier) override;
+    Q_REQUIRED_RESULT QString password(const QString &identifier) override;
+    Q_REQUIRED_RESULT QString sieveCustomPassword(const QString &identifier) override;
 
 private:
-    QString walletPassword(const QString &identifier);
+    Q_REQUIRED_RESULT QString walletPassword(const QString &identifier);
 
     WId m_wid;
 };
diff -Nru kmail-19.04.3/src/sieveimapinterface/tests/vacation/main.cpp kmail-19.12.3/src/sieveimapinterface/tests/vacation/main.cpp
--- kmail-19.04.3/src/sieveimapinterface/tests/vacation/main.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/sieveimapinterface/tests/vacation/main.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -15,7 +15,6 @@
   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include <KLocalizedString>
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QStandardPaths>
diff -Nru kmail-19.04.3/src/tag/tagactionmanager.cpp kmail-19.12.3/src/tag/tagactionmanager.cpp
--- kmail-19.04.3/src/tag/tagactionmanager.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/tag/tagactionmanager.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -173,7 +173,7 @@
     Q_EMIT tagActionTriggered(Akonadi::Tag(tag.toLongLong()));
 }
 
-void TagActionManager::createTagActions(const QList<MailCommon::Tag::Ptr> &tags)
+void TagActionManager::createTagActions(const QVector<MailCommon::Tag::Ptr> &tags)
 {
     clearActions();
 
diff -Nru kmail-19.04.3/src/tag/tagactionmanager.h kmail-19.12.3/src/tag/tagactionmanager.h
--- kmail-19.04.3/src/tag/tagactionmanager.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/tag/tagactionmanager.h	2020-03-02 07:34:49.000000000 +0000
@@ -24,7 +24,7 @@
 #include "kmail_export.h"
 #include "mailcommon/tag.h"
 #include <QMap>
-
+#include <QVector>
 class KJob;
 class KActionCollection;
 class KXMLGUIClient;
@@ -112,7 +112,7 @@
 
     void fillTagList();
     void createTagAction(const MailCommon::Tag::Ptr &tag, bool addToMenu);
-    void createTagActions(const QList<MailCommon::Tag::Ptr> &);
+    void createTagActions(const QVector<MailCommon::Tag::Ptr> &);
     void checkTags(const QList<qint64> &tags);
     QList<qint64> checkedTags() const;
 
@@ -132,7 +132,7 @@
     QList<QAction *> mToolbarActions;
 
     // A sorted list of all tags
-    QList<MailCommon::Tag::Ptr> mTags;
+    QVector<MailCommon::Tag::Ptr> mTags;
 
     // Uri of a newly created tag
     qint64 mNewTagId = -1;
diff -Nru kmail-19.04.3/src/tag/tagselectdialog.h kmail-19.12.3/src/tag/tagselectdialog.h
--- kmail-19.04.3/src/tag/tagselectdialog.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/tag/tagselectdialog.h	2020-03-02 07:34:49.000000000 +0000
@@ -21,6 +21,7 @@
 #define TAGSELECTDIALOG_H
 
 #include <QDialog>
+#include <QVector>
 #include <AkonadiCore/Item>
 #include <AkonadiCore/Tag>
 #include "MailCommon/Tag"
@@ -33,7 +34,7 @@
 public:
     explicit TagSelectDialog(QWidget *parent, int numberOfSelectedMessages, const Akonadi::Item &selectedItem);
     ~TagSelectDialog();
-    Akonadi::Tag::List selectedTag() const;
+    Q_REQUIRED_RESULT Akonadi::Tag::List selectedTag() const;
 
     void setActionCollection(const QList<KActionCollection *> &actionCollectionList);
 
@@ -50,7 +51,7 @@
     Akonadi::Item mSelectedItem;
 
     Akonadi::Tag::List mCurrentSelectedTags;
-    QList<MailCommon::Tag::Ptr> mTagList;
+    QVector<MailCommon::Tag::Ptr> mTagList;
     QList<KActionCollection *> mActionCollectionList;
     QListWidget *mListTag = nullptr;
 };
diff -Nru kmail-19.04.3/src/ui/miscpagemaintab.ui kmail-19.12.3/src/ui/miscpagemaintab.ui
--- kmail-19.04.3/src/ui/miscpagemaintab.ui	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/ui/miscpagemaintab.ui	2020-03-02 07:34:49.000000000 +0000
@@ -48,7 +48,7 @@
         </sizepolicy>
        </property>
        <property name="whatsThis">
-        <string comment="what's this help">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <string comment="what's this help">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;https://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
diff -Nru kmail-19.04.3/src/ui/searchwindow.ui kmail-19.12.3/src/ui/searchwindow.ui
--- kmail-19.04.3/src/ui/searchwindow.ui	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/ui/searchwindow.ui	2020-03-02 07:34:49.000000000 +0000
@@ -156,7 +156,7 @@
    <item row="8" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
-      <widget class="KPIM::ProgressIndicatorWidget" name="mProgressIndicator"/>
+      <widget class="KBusyIndicatorWidget" name="mProgressIndicator"/>
      </item>
      <item>
       <widget class="QLabel" name="mStatusLbl">
@@ -200,9 +200,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KPIM::ProgressIndicatorWidget</class>
-   <extends>QLabel</extends>
-   <header>Libkdepim/ProgressIndicatorWidget</header>
+   <class>KBusyIndicatorWidget</class>
+   <extends>QWidget</extends>
+   <header>KBusyIndicatorWidget</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff -Nru kmail-19.04.3/src/ui/securitypagegeneraltab.ui kmail-19.12.3/src/ui/securitypagegeneraltab.ui
--- kmail-19.04.3/src/ui/securitypagegeneraltab.ui	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/ui/securitypagegeneraltab.ui	2020-03-02 07:34:49.000000000 +0000
@@ -164,7 +164,7 @@
       <item>
        <widget class="QCheckBox" name="mCheckMailUrlTracking">
         <property name="text">
-         <string>Check Mail Url Tracking</string>
+         <string>Scan emails for tracking URLs</string>
         </property>
        </widget>
       </item>
diff -Nru kmail-19.04.3/src/undosend/autotests/CMakeLists.txt kmail-19.12.3/src/undosend/autotests/CMakeLists.txt
--- kmail-19.04.3/src/undosend/autotests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/autotests/CMakeLists.txt	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,10 @@
+macro(add_kmail_undosend_unittest _source)
+    get_filename_component(_name ${_source} NAME_WE)
+    ecm_add_test(${_source}
+        TEST_NAME ${_name}
+        LINK_LIBRARIES kmailprivate Qt5::Test Qt5::Widgets
+    )
+endmacro ()
+
+add_kmail_undosend_unittest(undosendcomboboxtest.cpp)
+add_kmail_undosend_unittest(undosendcreatejobtest.cpp)
diff -Nru kmail-19.04.3/src/undosend/autotests/undosendcomboboxtest.cpp kmail-19.12.3/src/undosend/autotests/undosendcomboboxtest.cpp
--- kmail-19.04.3/src/undosend/autotests/undosendcomboboxtest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/autotests/undosendcomboboxtest.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   Copyright (C) 2019 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 "undosendcomboboxtest.h"
+#include "undosend/undosendcombobox.h"
+#include <QTest>
+QTEST_MAIN(UndoSendComboboxTest)
+
+UndoSendComboboxTest::UndoSendComboboxTest(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void UndoSendComboboxTest::shouldHaveDefaultValues()
+{
+    UndoSendCombobox w;
+    QCOMPARE(w.count(), 5);
+}
diff -Nru kmail-19.04.3/src/undosend/autotests/undosendcomboboxtest.h kmail-19.12.3/src/undosend/autotests/undosendcomboboxtest.h
--- kmail-19.04.3/src/undosend/autotests/undosendcomboboxtest.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/autotests/undosendcomboboxtest.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   Copyright (C) 2019 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 UNDOSENDCOMBOBOXTEST_H
+#define UNDOSENDCOMBOBOXTEST_H
+
+#include <QObject>
+
+class UndoSendComboboxTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit UndoSendComboboxTest(QObject *parent = nullptr);
+    ~UndoSendComboboxTest() = default;
+private Q_SLOTS:
+    void shouldHaveDefaultValues();
+};
+
+#endif // UNDOSENDCOMBOBOXTEST_H
diff -Nru kmail-19.04.3/src/undosend/autotests/undosendcreatejobtest.cpp kmail-19.12.3/src/undosend/autotests/undosendcreatejobtest.cpp
--- kmail-19.04.3/src/undosend/autotests/undosendcreatejobtest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/autotests/undosendcreatejobtest.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   Copyright (C) 2019 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 "undosendcreatejobtest.h"
+#include "undosend/undosendcreatejob.h"
+#include <QTest>
+QTEST_MAIN(UndoSendCreateJobTest)
+
+UndoSendCreateJobTest::UndoSendCreateJobTest(QObject *parent)
+    : QObject(parent)
+{
+}
+
+void UndoSendCreateJobTest::shouldHaveDefaultValues()
+{
+    UndoSendCreateJob job;
+    QCOMPARE(job.akonadiIndex(), -1);
+    QCOMPARE(job.delay(), -1);
+    QVERIFY(job.subject().isEmpty());
+}
diff -Nru kmail-19.04.3/src/undosend/autotests/undosendcreatejobtest.h kmail-19.12.3/src/undosend/autotests/undosendcreatejobtest.h
--- kmail-19.04.3/src/undosend/autotests/undosendcreatejobtest.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/autotests/undosendcreatejobtest.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,35 @@
+/*
+   Copyright (C) 2019 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 UNDOSENDCREATEJOBTEST_H
+#define UNDOSENDCREATEJOBTEST_H
+
+#include <QObject>
+
+class UndoSendCreateJobTest : public QObject
+{
+    Q_OBJECT
+public:
+    explicit UndoSendCreateJobTest(QObject *parent = nullptr);
+    ~UndoSendCreateJobTest() = default;
+private Q_SLOTS:
+    void shouldHaveDefaultValues();
+};
+
+#endif // UNDOSENDCREATEJOBTEST_H
diff -Nru kmail-19.04.3/src/undosend/undosendcombobox.cpp kmail-19.12.3/src/undosend/undosendcombobox.cpp
--- kmail-19.04.3/src/undosend/undosendcombobox.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/undosendcombobox.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,50 @@
+/*
+   Copyright (C) 2019 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 "undosendcombobox.h"
+#include <KLocalizedString>
+
+UndoSendCombobox::UndoSendCombobox(QWidget *parent)
+    : QComboBox(parent)
+{
+    initialize();
+}
+
+UndoSendCombobox::~UndoSendCombobox()
+{
+}
+
+void UndoSendCombobox::initialize()
+{
+    for (int i = 1; i < 6; i++) {
+        const int numberOfSeconds = i * 10;
+        addItem(i18n("%1 seconds", numberOfSeconds), numberOfSeconds);
+    }
+}
+
+int UndoSendCombobox::delay() const
+{
+    return currentData().toInt();
+}
+
+void UndoSendCombobox::setDelay(int val)
+{
+    const int index = findData(val);
+    setCurrentIndex(index != -1 ? index : 0);
+}
diff -Nru kmail-19.04.3/src/undosend/undosendcombobox.h kmail-19.12.3/src/undosend/undosendcombobox.h
--- kmail-19.04.3/src/undosend/undosendcombobox.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/undosendcombobox.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   Copyright (C) 2019 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 UNDOSENDCOMBOBOX_H
+#define UNDOSENDCOMBOBOX_H
+
+#include <QComboBox>
+#include "kmail_private_export.h"
+
+class KMAILTESTS_TESTS_EXPORT UndoSendCombobox : public QComboBox
+{
+    Q_OBJECT
+public:
+    explicit UndoSendCombobox(QWidget *parent = nullptr);
+    ~UndoSendCombobox();
+
+    Q_REQUIRED_RESULT int delay() const;
+    void setDelay(int val);
+private:
+    void initialize();
+};
+
+#endif // UNDOSENDCOMBOBOX_H
diff -Nru kmail-19.04.3/src/undosend/undosendcreatejob.cpp kmail-19.12.3/src/undosend/undosendcreatejob.cpp
--- kmail-19.04.3/src/undosend/undosendcreatejob.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/undosendcreatejob.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,124 @@
+/*
+   Copyright (C) 2019 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 "undosendcreatejob.h"
+#include "kmail_debug.h"
+#include <SendLater/SendLaterUtil>
+#include <KNotification>
+#include <KLocalizedString>
+#include <QTimer>
+
+UndoSendCreateJob::UndoSendCreateJob(QObject *parent)
+    : QObject(parent)
+{
+}
+
+UndoSendCreateJob::~UndoSendCreateJob()
+{
+}
+
+bool UndoSendCreateJob::canStart() const
+{
+    if (mAkonadiIndex < 0 || mDelay <= 0) {
+        return false;
+    }
+    return true;
+}
+
+bool UndoSendCreateJob::start()
+{
+    if (!canStart()) {
+        qCWarning(KMAIL_LOG) << "Impossible to start undosendcreatejob";
+        deleteLater();
+        return false;
+    }
+    mTimer = new QTimer(this);
+    connect(mTimer, &QTimer::timeout, this, &UndoSendCreateJob::slotTimeOut);
+    mTimer->setSingleShot(true);
+    mTimer->start(mDelay * 1000);
+    mNotification = new KNotification(QStringLiteral("undosend"), nullptr,
+                                      KNotification::Persistent);
+    mNotification->setText(mSubject);
+    mNotification->setActions(QStringList() << i18n("Undo send"));
+
+    connect(mNotification, QOverload<unsigned int>::of(&KNotification::activated), this, &UndoSendCreateJob::slotActivateNotificationAction);
+    connect(mNotification, &KNotification::closed, this, &UndoSendCreateJob::slotNotificationClosed);
+    mNotification->sendEvent();
+
+    return true;
+}
+
+void UndoSendCreateJob::slotTimeOut()
+{
+    mNotification->close();
+    deleteLater();
+}
+
+void UndoSendCreateJob::slotNotificationClosed()
+{
+    mTimer->stop();
+    deleteLater();
+}
+
+void UndoSendCreateJob::slotActivateNotificationAction(unsigned int index)
+{
+    //Index == 0 => is the default action. We don't have it.
+    switch (index) {
+    case 1:
+        undoSendEmail();
+        return;
+    }
+    qCWarning(KMAIL_LOG) << " SpecialNotifierJob::slotActivateNotificationAction unknown index " << index;
+}
+
+void UndoSendCreateJob::undoSendEmail()
+{
+    mTimer->stop();
+    SendLater::SendLaterUtil::removeItem(mAkonadiIndex);
+}
+
+QString UndoSendCreateJob::subject() const
+{
+    return mSubject;
+}
+
+void UndoSendCreateJob::setSubject(const QString &subject)
+{
+    mSubject = subject;
+}
+
+int UndoSendCreateJob::delay() const
+{
+    return mDelay;
+}
+
+void UndoSendCreateJob::setDelay(int delay)
+{
+    mDelay = delay;
+}
+
+qint64 UndoSendCreateJob::akonadiIndex() const
+{
+    return mAkonadiIndex;
+}
+
+void UndoSendCreateJob::setAkonadiIndex(qint64 akonadiIndex)
+{
+    mAkonadiIndex = akonadiIndex;
+}
diff -Nru kmail-19.04.3/src/undosend/undosendcreatejob.h kmail-19.12.3/src/undosend/undosendcreatejob.h
--- kmail-19.04.3/src/undosend/undosendcreatejob.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/undosendcreatejob.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+   Copyright (C) 2019 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 UNDOSENDCREATEJOB_H
+#define UNDOSENDCREATEJOB_H
+
+#include <QObject>
+#include "kmail_private_export.h"
+class KNotification;
+class QTimer;
+class KMAILTESTS_TESTS_EXPORT UndoSendCreateJob : public QObject
+{
+    Q_OBJECT
+public:
+    explicit UndoSendCreateJob(QObject *parent = nullptr);
+    ~UndoSendCreateJob();
+    Q_REQUIRED_RESULT bool canStart() const;
+    Q_REQUIRED_RESULT bool start();
+
+    Q_REQUIRED_RESULT QString subject() const;
+    void setSubject(const QString &subject);
+
+    Q_REQUIRED_RESULT int delay() const;
+    void setDelay(int delay);
+
+    Q_REQUIRED_RESULT qint64 akonadiIndex() const;
+    void setAkonadiIndex(qint64 akonadiIndex);
+
+private:
+    void slotActivateNotificationAction(unsigned int index);
+    void slotNotificationClosed();
+    void undoSendEmail();
+    void slotTimeOut();
+    QString mSubject;
+    KNotification *mNotification = nullptr;
+    QTimer *mTimer = nullptr;
+    qint64 mAkonadiIndex = -1;
+    int mDelay = -1;
+};
+
+#endif // UNDOSENDCREATEJOB_H
diff -Nru kmail-19.04.3/src/undosend/undosendmanager.cpp kmail-19.12.3/src/undosend/undosendmanager.cpp
--- kmail-19.04.3/src/undosend/undosendmanager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/undosendmanager.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+   Copyright (C) 2019 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 "undosendmanager.h"
+#include "undosendcreatejob.h"
+#include "kmail_debug.h"
+
+UndoSendManager::UndoSendManager(QObject *parent)
+    : QObject(parent)
+{
+}
+
+UndoSendManager::~UndoSendManager()
+{
+}
+
+UndoSendManager *UndoSendManager::self()
+{
+    static UndoSendManager s_self;
+    return &s_self;
+}
+
+void UndoSendManager::addItem(qint64 index, const QString &subject, int delay)
+{
+    UndoSendCreateJob *job = new UndoSendCreateJob(this);
+    job->setAkonadiIndex(index);
+    job->setSubject(subject);
+    job->setDelay(delay);
+    if (!job->start()) {
+        qCWarning(KMAIL_LOG) << " Impossible to create job";
+    }
+}
diff -Nru kmail-19.04.3/src/undosend/undosendmanager.h kmail-19.12.3/src/undosend/undosendmanager.h
--- kmail-19.04.3/src/undosend/undosendmanager.h	1970-01-01 00:00:00.000000000 +0000
+++ kmail-19.12.3/src/undosend/undosendmanager.h	2020-03-02 07:34:49.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+   Copyright (C) 2019 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 UNDOSENDMANAGER_H
+#define UNDOSENDMANAGER_H
+
+#include <QObject>
+
+class UndoSendManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit UndoSendManager(QObject *parent = nullptr);
+    ~UndoSendManager();
+    static UndoSendManager *self();
+
+    void addItem(qint64 index, const QString &subject, int delay);
+};
+
+#endif // UNDOSENDMANAGER_H
diff -Nru kmail-19.04.3/src/undostack.h kmail-19.12.3/src/undostack.h
--- kmail-19.04.3/src/undostack.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/undostack.h	2020-03-02 07:34:49.000000000 +0000
@@ -53,16 +53,16 @@
     ~UndoStack();
 
     void clear();
-    int  size() const;
-    int  newUndoAction(const Akonadi::Collection &srcFolder, const Akonadi::Collection &destFolder);
+    Q_REQUIRED_RESULT int  size() const;
+    Q_REQUIRED_RESULT int  newUndoAction(const Akonadi::Collection &srcFolder, const Akonadi::Collection &destFolder);
     void addMsgToAction(int undoId, const Akonadi::Item &item);
-    bool isEmpty() const;
+    Q_REQUIRED_RESULT bool isEmpty() const;
     void undo();
 
     void pushSingleAction(const Akonadi::Item &item, const Akonadi::Collection &, const Akonadi::Collection &destFolder);
     void folderDestroyed(const Akonadi::Collection &folder);
 
-    QString undoInfo() const;
+    Q_REQUIRED_RESULT QString undoInfo() const;
 
 Q_SIGNALS:
     void undoStackChanged();
diff -Nru kmail-19.04.3/src/unityservicemanager.h kmail-19.12.3/src/unityservicemanager.h
--- kmail-19.04.3/src/unityservicemanager.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/unityservicemanager.h	2020-03-02 07:34:49.000000000 +0000
@@ -35,20 +35,20 @@
     ~UnityServiceManager();
 
     void updateSystemTray();
-    bool haveSystemTrayApplet() const;
+    Q_REQUIRED_RESULT bool haveSystemTrayApplet() const;
 
-    bool canQueryClose();
+    Q_REQUIRED_RESULT bool canQueryClose();
     void toggleSystemTray(QWidget *parent);
     void initListOfCollection();
-    bool excludeFolder(const Akonadi::Collection &collection) const;
-    bool ignoreNewMailInFolder(const Akonadi::Collection &collection);
+    Q_REQUIRED_RESULT bool excludeFolder(const Akonadi::Collection &collection) const;
+    Q_REQUIRED_RESULT bool ignoreNewMailInFolder(const Akonadi::Collection &collection);
     void updateCount();
 private:
     Q_DISABLE_COPY(UnityServiceManager)
     void unreadMail(const QAbstractItemModel *model, const QModelIndex &parentIndex = {});
     void slotCollectionStatisticsChanged(Akonadi::Collection::Id id, const Akonadi::CollectionStatistics &);
     void initUnity();
-    bool hasUnreadMail() const;
+    Q_REQUIRED_RESULT bool hasUnreadMail() const;
     QDBusServiceWatcher *mUnityServiceWatcher = nullptr;
     KMail::KMSystemTray *mSystemTray = nullptr;
     int mCount = 0;
diff -Nru kmail-19.04.3/src/util.cpp kmail-19.12.3/src/util.cpp
--- kmail-19.04.3/src/util.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/util.cpp	2020-03-02 07:34:49.000000000 +0000
@@ -182,7 +182,7 @@
 {
     if (action) {
         action->setText(isInTrashFolder ? i18nc("@action Hard delete, bypassing trash", "&Delete") : i18n("&Move to Trash"));
-        action->setIcon(isInTrashFolder ? QIcon::fromTheme(QStringLiteral("edit-delete")) : QIcon::fromTheme(QStringLiteral("edit-delete-shred")));
+        action->setIcon(isInTrashFolder ? QIcon::fromTheme(QStringLiteral("edit-delete-shred")) : QIcon::fromTheme(QStringLiteral("edit-delete")));
         //Use same text as in Text property. Change it in kf5
         action->setToolTip(isInTrashFolder ? i18nc("@action Hard delete, bypassing trash", "Delete") : i18n("Move to Trash"));
     }
diff -Nru kmail-19.04.3/src/util.h kmail-19.12.3/src/util.h
--- kmail-19.04.3/src/util.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/util.h	2020-03-02 07:34:49.000000000 +0000
@@ -64,15 +64,15 @@
      * Handles a clicked URL, but only in case the viewer didn't handle it.
      * Currently only support mailto.
      */
-bool handleClickedURL(const QUrl &url, const QSharedPointer<MailCommon::FolderSettings> &folder = QSharedPointer<MailCommon::FolderSettings>(), const Akonadi::Collection &collection = Akonadi::Collection());
+Q_REQUIRED_RESULT bool handleClickedURL(const QUrl &url, const QSharedPointer<MailCommon::FolderSettings> &folder = QSharedPointer<MailCommon::FolderSettings>(), const Akonadi::Collection &collection = Akonadi::Collection());
 
-bool mailingListsHandleURL(const QList<QUrl> &lst, const QSharedPointer<MailCommon::FolderSettings> &folder, const Akonadi::Collection &collection);
+Q_REQUIRED_RESULT bool mailingListsHandleURL(const QList<QUrl> &lst, const QSharedPointer<MailCommon::FolderSettings> &folder, const Akonadi::Collection &collection);
 
-bool mailingListPost(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
-bool mailingListSubscribe(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
-bool mailingListUnsubscribe(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
-bool mailingListArchives(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
-bool mailingListHelp(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
+Q_REQUIRED_RESULT bool mailingListPost(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
+Q_REQUIRED_RESULT bool mailingListSubscribe(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
+Q_REQUIRED_RESULT bool mailingListUnsubscribe(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
+Q_REQUIRED_RESULT bool mailingListArchives(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
+Q_REQUIRED_RESULT bool mailingListHelp(const QSharedPointer<MailCommon::FolderSettings> &fd, const Akonadi::Collection &col);
 
 void lastEncryptAndSignState(bool &lastEncrypt, bool &lastSign, const KMime::Message::Ptr &msg);
 
diff -Nru kmail-19.04.3/src/widgets/collectionpane.h kmail-19.12.3/src/widgets/collectionpane.h
--- kmail-19.04.3/src/widgets/collectionpane.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/widgets/collectionpane.h	2020-03-02 07:34:49.000000000 +0000
@@ -43,7 +43,7 @@
     */
     explicit CollectionStorageModel(QAbstractItemModel *model, QItemSelectionModel *selectionModel, QObject *parent = nullptr);
     ~CollectionStorageModel();
-    bool isOutBoundFolder(const Akonadi::Collection &c) const override;
+    Q_REQUIRED_RESULT bool isOutBoundFolder(const Akonadi::Collection &c) const override;
 };
 
 #endif /* COLLECTIONPANE_H */
diff -Nru kmail-19.04.3/src/widgets/displaymessageformatactionmenu.h kmail-19.12.3/src/widgets/displaymessageformatactionmenu.h
--- kmail-19.04.3/src/widgets/displaymessageformatactionmenu.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/widgets/displaymessageformatactionmenu.h	2020-03-02 07:34:49.000000000 +0000
@@ -30,7 +30,7 @@
     explicit DisplayMessageFormatActionMenu(QObject *parent = nullptr);
     ~DisplayMessageFormatActionMenu();
 
-    MessageViewer::Viewer::DisplayFormatMessage displayMessageFormat() const;
+    Q_REQUIRED_RESULT MessageViewer::Viewer::DisplayFormatMessage displayMessageFormat() const;
     void setDisplayMessageFormat(MessageViewer::Viewer::DisplayFormatMessage displayMessageFormat);
 
 Q_SIGNALS:
diff -Nru kmail-19.04.3/src/widgets/statusbarlabeltoggledstate.cpp kmail-19.12.3/src/widgets/statusbarlabeltoggledstate.cpp
--- kmail-19.04.3/src/widgets/statusbarlabeltoggledstate.cpp	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/widgets/statusbarlabeltoggledstate.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/*
-   Copyright (C) 2014-2019 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 "statusbarlabeltoggledstate.h"
-#include "kmail_debug.h"
-
-StatusBarLabelToggledState::StatusBarLabelToggledState(QWidget *parent)
-    : QLabel(parent)
-{
-    setTextFormat(Qt::PlainText);
-}
-
-StatusBarLabelToggledState::~StatusBarLabelToggledState()
-{
-}
-
-void StatusBarLabelToggledState::setStateString(const QString &toggled, const QString &untoggled)
-{
-    if (toggled.isEmpty() || untoggled.isEmpty()) {
-        qCWarning(KMAIL_LOG) << " State string is empty. Need to fix it";
-    }
-    mToggled = toggled;
-    mUnToggled = untoggled;
-    updateLabel();
-}
-
-void StatusBarLabelToggledState::setToggleMode(bool state)
-{
-    if (mToggleMode != state) {
-        mToggleMode = state;
-        Q_EMIT toggleModeChanged(mToggleMode);
-        updateLabel();
-    }
-}
-
-bool StatusBarLabelToggledState::toggleMode() const
-{
-    return mToggleMode;
-}
-
-void StatusBarLabelToggledState::updateLabel()
-{
-    if (mToggleMode) {
-        setText(mToggled);
-    } else {
-        setText(mUnToggled);
-    }
-}
-
-void StatusBarLabelToggledState::mousePressEvent(QMouseEvent *ev)
-{
-    Q_UNUSED(ev);
-    setToggleMode(!mToggleMode);
-}
diff -Nru kmail-19.04.3/src/widgets/statusbarlabeltoggledstate.h kmail-19.12.3/src/widgets/statusbarlabeltoggledstate.h
--- kmail-19.04.3/src/widgets/statusbarlabeltoggledstate.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/widgets/statusbarlabeltoggledstate.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/*
-   Copyright (C) 2014-2019 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 STATUSBARLABELTOGGLEDSTATE_H
-#define STATUSBARLABELTOGGLEDSTATE_H
-
-#include <QLabel>
-
-class StatusBarLabelToggledState : public QLabel
-{
-    Q_OBJECT
-public:
-    explicit StatusBarLabelToggledState(QWidget *parent = nullptr);
-    ~StatusBarLabelToggledState() override;
-
-    void setToggleMode(bool state);
-
-    bool toggleMode() const;
-
-    void setStateString(const QString &toggled, const QString &untoggled);
-Q_SIGNALS:
-    void toggleModeChanged(bool state);
-
-protected:
-    void mousePressEvent(QMouseEvent *ev) override;
-
-private:
-    void updateLabel();
-    QString mToggled;
-    QString mUnToggled;
-    bool mToggleMode = false;
-};
-
-#endif // STATUSBARLABELTOGGLEDSTATE_H
diff -Nru kmail-19.04.3/src/widgets/vacationscriptindicatorwidget.h kmail-19.12.3/src/widgets/vacationscriptindicatorwidget.h
--- kmail-19.04.3/src/widgets/vacationscriptindicatorwidget.h	2019-07-05 08:52:01.000000000 +0000
+++ kmail-19.12.3/src/widgets/vacationscriptindicatorwidget.h	2020-03-02 07:34:49.000000000 +0000
@@ -66,7 +66,7 @@
 
     void updateIndicator();
 
-    bool hasVacationScriptActive() const;
+    Q_REQUIRED_RESULT bool hasVacationScriptActive() const;
 
 Q_SIGNALS:
     void clicked(const QString &serverName);